strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#134054 Qt5 really scale the toolbox button

Browse source 
I missed that code in the HiDPI patch. Instead of some fixed 25px
size, use the real content size and ask the QStyle for the real
size.

Change-Id: I227190baab2c1716aa40ef6d16d55dbded0830cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97538
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2020-06-30 17:03:53 +02:00
parent 1eba1c4597
commit 4bb8bb043f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vcl/qt5/Qt5Graphics_Controls.cxx
View file

@ -935,8 +935,12 @@ bool Qt5Graphics_Controls::getNativeControlRegion(ControlType type, ControlPart
}
else if (part == ControlPart::Button)
{
contentRect = QRect(boundingRect.left(), boundingRect.top(),
upscale(25, Round::Ceil), upscale(25, Round::Ceil));
QStyleOptionToolButton option;
option.arrowType = Qt::NoArrow;
option.features = QStyleOptionToolButton::None;
option.rect = downscale(QRect({ 0, 0 }, contentRect.size()));
contentRect = upscale(
subControlRect(QStyle::CC_ToolButton, &option, QStyle::SC_ToolButton));
boundingRect = contentRect;
retVal = true;
}