From 4bad99624bd7231ab6724161a603e6944ff0dd20 Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Thu, 15 Feb 2018 11:09:29 +0200 Subject: [PATCH] Revert "reserve space for checkable widgets in menu items" Summary: This reverts commit 8989f8fd9c2c98adec5d73755a869beeb3ced600. Reviewers: #breeze, hpereiradacosta Reviewed By: hpereiradacosta Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D10530 --- kstyle/breezestyle.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index 07f0be7d..51092586 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -2728,7 +2728,8 @@ namespace Breeze leftColumnWidth += Metrics::MenuItem_ItemSpacing; // add checkbox indicator width - leftColumnWidth += Metrics::CheckBox_Size + Metrics::MenuItem_ItemSpacing; + if( menuItemOption->menuHasCheckableItems ) + { leftColumnWidth += Metrics::CheckBox_Size + Metrics::MenuItem_ItemSpacing; } // add spacing for accelerator /* @@ -4697,8 +4698,11 @@ namespace Breeze // define relevant rectangles // checkbox QRect checkBoxRect; - checkBoxRect = QRect( contentsRect.left(), contentsRect.top() + (contentsRect.height()-Metrics::CheckBox_Size)/2, Metrics::CheckBox_Size, Metrics::CheckBox_Size ); - contentsRect.setLeft( checkBoxRect.right() + Metrics::MenuItem_ItemSpacing + 1 ); + if( menuItemOption->menuHasCheckableItems ) + { + checkBoxRect = QRect( contentsRect.left(), contentsRect.top() + (contentsRect.height()-Metrics::CheckBox_Size)/2, Metrics::CheckBox_Size, Metrics::CheckBox_Size ); + contentsRect.setLeft( checkBoxRect.right() + Metrics::MenuItem_ItemSpacing + 1 ); + } // render checkbox indicator if( menuItemOption->checkType == QStyleOptionMenuItem::NonExclusive )