[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sfx2/source

[heiko tietze]

 sfx2/source/dialog/infobar.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9d7b4b0114fdbd784ab87ab532140af9e1bbc06d
Author: heiko tietze <tietze.heiko at gmail.com>
Date:   Mon Aug 21 21:13:22 2017 +0200

    tdf#111844 infobar icons on high dpi
    
    scaling factor added
    
    Change-Id: Iccfc76832ccfaaffb9950d4b591b379dfb0d9eca
    Reviewed-on: https://gerrit.libreoffice.org/41401
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>
    (cherry picked from commit 4438849e400ecef3cdf2f267dc75a76d4b11aba1)
    
    tdf#111844 infobar icons/text on high dpi
    
    scaling factor added to text position
    
    Change-Id: Iaeb48fd4ac0439680fa3b6ca43f23a617efe1457
    Reviewed-on: https://gerrit.libreoffice.org/41417
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>
    (cherry picked from commit 4d60d96a22ef2f67db7c7e99981447bd81f776c4)
    Reviewed-on: https://gerrit.libreoffice.org/41461
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index b093718f4e86..2d03bf01e20b 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -289,9 +289,9 @@ void SfxInfoBarWindow::Resize()
         nX -= nButtonGap;
     }
 
-    m_pImage->SetPosSizePixel(Point(4,4), Size(32, 32));
+    m_pImage->SetPosSizePixel(Point(4,4), Size(32* fScaleFactor, 32* fScaleFactor));
 
-    Point aMessagePosition(32 + 10 * fScaleFactor, 10 * fScaleFactor);
+    Point aMessagePosition(32 * fScaleFactor + 10 * fScaleFactor, 10 * fScaleFactor);
     Size aMessageSize(nX - 20 * fScaleFactor, 20 * fScaleFactor);
 
     m_pMessage->SetPosSizePixel(aMessagePosition, aMessageSize);