5c96e813be
The bounding rectangle calculated for an Editbox in QtGraphics_Controls::getNativeControlRegion was not always enough to accommodate content and the borders. The KDE Breeze does not draw any borders if the total height of the bounding rectangle is smaller than the minimum size needed for content + frame at top and bottom, s. Style::drawFrameLineEditPrimitive in the Breeze style [1]. Therefore, ensure a minimum height of that size. The Breeze style also considers the type of the passed widget when retrieving the frame width using QStyle::pixelMetric [2], so pass a dummy `QLineEdit` in order to get the actual frame width of 6 that the Breeze style uses for line edits, rather than the default value of 2 that is returned when not passing any widget. Just do that for the minimum size calculation for now and not everywhere, because the handling for edit boxes here in the qt VCL plugins and in the calling code currently does all kinds of "interesting" things like doing extra size adjustments or passing the content rect where the bounding rect would be expected,... Ideally this should be cleaned up in the callers and all platform integrations in a follow-up commit to adhere to what the doc in vcl/inc/WidgetDrawInterface.hxx says, but this here keeps it working with existing code for now. (s.a. discussion in the Gerrit change for more details) Tested using various scaling factors: 1, 1.25, 1.5, 1.75 and 2.0. [1]144ea45018/kstyle/breezestyle.cpp (L3527)[2]144ea45018/kstyle/breezestyle.cpp (L555)Co-authored-by: Michael Weghorn <m.weghorn@posteo.de> Change-Id: If8cb4794c7f3ce1be4d1ee421c9c27ad5adf5da2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146516 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
100 lines
4.4 KiB
C++
100 lines
4.4 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <vclpluginapi.h>
|
|
#include <WidgetDrawInterface.hxx>
|
|
|
|
#include <memory>
|
|
|
|
#include <QtGui/QImage>
|
|
#include <QtGui/QPainter>
|
|
#include <QtGui/QRegion>
|
|
#include <QtWidgets/QPushButton>
|
|
#include <QtWidgets/QStyle>
|
|
#include <QtWidgets/QStyleOption>
|
|
|
|
class QtGraphicsBase;
|
|
|
|
class QtGraphics_Controls final : public vcl::WidgetDrawInterface
|
|
{
|
|
std::unique_ptr<QImage> m_image;
|
|
QRect m_lastPopupRect;
|
|
QtGraphicsBase const& m_rGraphics;
|
|
|
|
public:
|
|
QtGraphics_Controls(const QtGraphicsBase& rGraphics);
|
|
|
|
QImage* getImage() { return m_image.get(); }
|
|
|
|
bool isNativeControlSupported(ControlType nType, ControlPart nPart) override;
|
|
bool hitTestNativeControl(ControlType nType, ControlPart nPart,
|
|
const tools::Rectangle& rControlRegion, const Point& aPos,
|
|
bool& rIsInside) override;
|
|
bool drawNativeControl(ControlType nType, ControlPart nPart,
|
|
const tools::Rectangle& rControlRegion, ControlState nState,
|
|
const ImplControlValue& aValue, const OUString& aCaption,
|
|
const Color& rBackgroundColor) override;
|
|
bool getNativeControlRegion(ControlType nType, ControlPart nPart,
|
|
const tools::Rectangle& rControlRegion, ControlState nState,
|
|
const ImplControlValue& aValue, const OUString& aCaption,
|
|
tools::Rectangle& rNativeBoundingRegion,
|
|
tools::Rectangle& rNativeContentRegion) override;
|
|
|
|
private:
|
|
static int pixelMetric(QStyle::PixelMetric metric, const QStyleOption* option = nullptr,
|
|
const QWidget* pWidget = nullptr);
|
|
static QSize sizeFromContents(QStyle::ContentsType type, const QStyleOption* option,
|
|
const QSize& contentsSize);
|
|
static QRect subControlRect(QStyle::ComplexControl control, const QStyleOptionComplex* option,
|
|
QStyle::SubControl subControl);
|
|
static QRect subElementRect(QStyle::SubElement element, const QStyleOption* option);
|
|
|
|
void draw(QStyle::ControlElement element, QStyleOption& rOption, QImage* image,
|
|
const Color& rBackgroundColor, QStyle::State const state = QStyle::State_None,
|
|
QRect rect = QRect());
|
|
void draw(QStyle::PrimitiveElement element, QStyleOption& rOption, QImage* image,
|
|
const Color& rBackgroundColor, QStyle::State const state = QStyle::State_None,
|
|
QRect rect = QRect());
|
|
void draw(QStyle::ComplexControl element, QStyleOptionComplex& rOption, QImage* image,
|
|
const Color& rBackgroundColor, QStyle::State const state = QStyle::State_None);
|
|
void drawFrame(QStyle::PrimitiveElement element, QImage* image, const Color& rBackGroundColor,
|
|
QStyle::State const& state, bool bClip = true,
|
|
QStyle::PixelMetric eLineMetric = QStyle::PM_DefaultFrameWidth);
|
|
|
|
static void fillQStyleOptionTab(const ImplControlValue& value, QStyleOptionTab& sot);
|
|
void fullQStyleOptionTabWidgetFrame(QStyleOptionTabWidgetFrame& option, bool bDownscale);
|
|
|
|
enum class Round
|
|
{
|
|
Floor,
|
|
Ceil,
|
|
};
|
|
|
|
int downscale(int value, Round eRound);
|
|
int upscale(int value, Round eRound);
|
|
QRect downscale(const QRect& rect);
|
|
QRect upscale(const QRect& rect);
|
|
QSize downscale(const QSize& size, Round eRound);
|
|
QSize upscale(const QSize& size, Round eRound);
|
|
QPoint upscale(const QPoint& point, Round eRound);
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|