summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKeith Curtis <keithcu@gmail.com>2014-03-17 20:16:57 -0400
committerTor Lillqvist <tml@collabora.com>2014-04-02 14:30:23 +0300
commit4e10490172c0222086d4b6f1b60ab81e3833db6f (patch)
treeaa7ac0a1fc06772532e78af7db603dda46d8eca0 /vcl
parent6def5b85d8b74b0025b515ef60b3d69bd81cffc2 (diff)
Hopefully fix Windows HiDPI toolbar layout bug
On Windows HiDPI, toolbar buttons are cut off. This may fix the problem. Here is a screenshot: http://i.imgur.com/NADAvYi.png I can't prove this fixes anything on Windows because I can't see this on Linux and don't really understand the surrounding code. On the other hand, it is easy to prove this is reasonable code. Change-Id: I69c19ad46844bead942ce63883d163cb9d0690c9 Reviewed-on: https://gerrit.libreoffice.org/8637 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 509441038ab95dd3a60efd1b6c302bf22bfbc631) Reviewed-on: https://gerrit.libreoffice.org/8743 Reviewed-by: Keith Curtis <keithcu@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/toolbox.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0d7bf8a2c356..46138795e2b6 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1747,8 +1747,8 @@ sal_Bool ToolBox::ImplCalcItem()
long nDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
// set defaults if image or text is needed but empty
- nDefWidth = GetDefaultImageSize().Width();
- nDefHeight = GetDefaultImageSize().Height();
+ nDefWidth = GetDefaultImageSize().Width() * GetDPIScaleFactor();
+ nDefHeight = GetDefaultImageSize().Height() * GetDPIScaleFactor();
mnWinHeight = 0;
// determine minimum size necessary in NWF