[Libreoffice-commits] core.git: vcl/unx

[Jan-Marek Glogowski]

 vcl/unx/kde4/KDESalGraphics.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 04f50946dee164220af1c99cc03b2d7c0a98ea3f
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Sep 23 12:28:08 2016 +0200

    tdf#97721 KDE4 correct menu checkbox offset
    
    Qt paints checkboxes next to images, so they always start left
    oriented in menus.
    
    Change-Id: I33ab0cf443f6716f9f9adc3ec2c394337db5f923

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index cd02e38..b9f85f8 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -342,6 +342,9 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             QRect menuItemRect( region2QRect( menuVal->maItemRect ));
             QRect rect( menuItemRect.topLeft() - widgetRect.topLeft(),
                 widgetRect.size().expandedTo( menuItemRect.size()));
+            // checkboxes are always displayed next to images in menues, so are never centered
+            const int focus_size = QApplication::style()->pixelMetric( QStyle::PM_FocusFrameHMargin );
+            rect.moveTo( -focus_size, rect.y() );
             draw( QStyle::CE_MenuItem, &option, m_image.get(),
                   vclStateValue2StateFlag(nControlState & ~ControlState::PRESSED, value), rect );
         }