KDE4: Report correct check and radio item sizes

Use the correct sizs from the current style. Change-Id: I7e163bdc8d467baf2d6e3d0d2bc3e1da7558cf42

KDE4: Report correct check and radio item sizes
Use the correct sizs from the current style. Change-Id: I7e163bdc8d467baf2d6e3d0d2bc3e1da7558cf42
ab1f5eab · Jan-Marek Glogowski · 380f3b4b · ab1f5eab
Kaydet (Commit) ab1f5eab authored Şub 27, 2014 tarafından Jan-Marek Glogowski
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 3 deletions

KDESalGraphics.cxx vcl/unx/kde4/KDESalGraphics.cxx +17 -3

No files found.
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -837,12 +837,26 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
            break;
        }
        case CTRL_MENU_POPUP:
-            if (part == PART_MENU_ITEM_CHECK_MARK || part == PART_MENU_ITEM_RADIO_MARK)
+        {
-            { // core uses this to detect radio/checkbox sizes, so just set a square
+            int h, w;
-                contentRect.setWidth(contentRect.height());
+            switch ( part ) {
+            case PART_MENU_ITEM_CHECK_MARK:
+                h = kapp->style()->pixelMetric(QStyle::PM_IndicatorHeight);
+                w = kapp->style()->pixelMetric(QStyle::PM_IndicatorWidth);
+                retVal = true;
+                break;
+            case PART_MENU_ITEM_RADIO_MARK:
+                h = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight);
+                w = kapp->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth);
                retVal = true;
+                break;
+            }
+            if (retVal) {
+                contentRect = QRect(0, 0, w, h);
+                boundingRect = contentRect;
            }
            break;
+        }
        case CTRL_FRAME:
        {
            if( part == PART_BORDER )