Better workaround for LibreOffice menu check/radio buttons

LibreOffice only uses Qt4 plugin (and is its only use) but that's done for Qt5 too. Also made KvCommunitheme's menu text darker and gave the same weight to its bold texts.
tsujan · Apr 9, 2018 · 0ca57e6 · 0ca57e6
1 parent 97c89fd
commit 0ca57e6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/Kvantum/NEWS b/Kvantum/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	9 Apr 2018, V0.10.6
+	10 Apr 2018, V0.10.6
 
 See "ChangeLog" for changes.
diff --git a/Kvantum/style/Kvantum.cpp b/Kvantum/style/Kvantum.cpp
@@ -4547,7 +4547,7 @@ void Style::drawPrimitive(PrimitiveElement element,
           suffix.append("-inactive");
         if (isLibreoffice_ && suffix == "-checked-focused"
             && qstyleoption_cast<const QStyleOptionMenuItem*>(option))
-          painter->fillRect(option->rect, option->palette.brush(QPalette::Window));
+          painter->fillRect(option->rect, option->palette.brush(QPalette::Highlight));
         QObject *styleObject = option->styleObject;
         QString animationStartState;
         if (styleObject)
@@ -4680,7 +4680,7 @@ void Style::drawPrimitive(PrimitiveElement element,
           suffix.append("-inactive");
         if (isLibreoffice_ && suffix == "-checked-focused"
             && qstyleoption_cast<const QStyleOptionMenuItem*>(option))
-          painter->fillRect(option->rect, option->palette.brush(QPalette::Window));
+          painter->fillRect(option->rect, option->palette.brush(QPalette::Highlight));
         QObject *styleObject = option->styleObject;
         QString animationStartState;
         if (styleObject)
@@ -6935,7 +6935,7 @@ void Style::drawControl(ControlElement element,
                                  Qt::AlignLeft | Qt::AlignVCenter,
                                  QSize(iw,ih),
                                  isLibreoffice_ ?
-                                   opt->rect.adjusted(2,-2,0,0) // FIXME why?
+                                   opt->rect.adjusted(qMax(-opt->rect.x(),0),-2,0,0) // FIXME why?
                                    : interiorRect(opt->rect,fspec).adjusted(rtl ? 0 : lspec.left,
                                                                             0,
                                                                             rtl ? -lspec.right : 0,

diff --git a/Kvantum/style/qt4/Kvantum4.cpp b/Kvantum/style/qt4/Kvantum4.cpp
@@ -3643,7 +3643,7 @@ void Style::drawPrimitive(PrimitiveElement element,
           suffix.append("-inactive");
         if (isLibreoffice_ && suffix == "-checked-focused"
             && qstyleoption_cast<const QStyleOptionMenuItem*>(option))
-          painter->fillRect(option->rect, option->palette.brush(QPalette::Window));
+          painter->fillRect(option->rect, option->palette.brush(QPalette::Highlight));
         renderElement(painter, prefix+ispec.element+suffix, option->rect);
       }
       else
@@ -3704,7 +3704,7 @@ void Style::drawPrimitive(PrimitiveElement element,
           suffix.append("-inactive");
         if (isLibreoffice_ && suffix == "-checked-focused"
             && qstyleoption_cast<const QStyleOptionMenuItem*>(option))
-          painter->fillRect(option->rect, option->palette.brush(QPalette::Window));
+          painter->fillRect(option->rect, option->palette.brush(QPalette::Highlight));
         renderElement(painter, prefix+ispec.element+suffix, option->rect);
       }
       else
@@ -5604,7 +5604,7 @@ void Style::drawControl(ControlElement element,
                                  Qt::AlignLeft | Qt::AlignVCenter,
                                  QSize(iw,ih),
                                  isLibreoffice_ ?
-                                   opt->rect.adjusted(2,-2,0,0) // FIXME why?
+                                   opt->rect.adjusted(qMax(-opt->rect.x(),0),-2,0,0) // FIXME why?
                                    : interiorRect(opt->rect,fspec).adjusted(rtl ? 0 : lspec.left,
                                                                             0,
                                                                             rtl ? -lspec.right : 0,

diff --git a/Kvantum/themes/kvthemes/KvCommunitheme/KvCommunitheme.kvconfig b/Kvantum/themes/kvthemes/KvCommunitheme/KvCommunitheme.kvconfig
@@ -143,6 +143,7 @@ text.margin.right=3
 frame.expansion=14
 min_height=+0.2font
 min_width=+0.2font
+text.boldness=2
 
 [PanelButtonTool]
 inherits=PanelButtonCommand
@@ -179,6 +180,7 @@ interior=false
 text.normal.color=#3D3D3D
 text.focus.color=#141414
 text.bold=true
+text.boldness=2
 text.shadow=false
 text.margin.top=2
 text.margin.bottom=2
@@ -253,6 +255,7 @@ text.normal.color=#3D3D3D
 text.press.color=#3D3D3D
 text.focus.color=#141414
 text.shadow=false
+text.boldness=2
 
 [Tab]
 inherits=PanelButtonCommand
@@ -417,8 +420,8 @@ frame=true
 frame.element=menuitem
 interior.element=menuitem
 indicator.element=menuitem
-text.normal.color=#646464
-text.focus.color=#5a5a5a
+text.normal.color=#3D3D3D
+text.focus.color=#3D3D3D
 text.margin.top=2
 text.margin.bottom=2
 text.margin.left=12
@@ -465,6 +468,7 @@ indicator.element=mdi
 text.normal.color=#d2d2d2
 text.focus.color=#fcfcfc
 text.bold=true
+text.boldness=2
 text.italic=true
 
 [ComboBox]
@@ -495,6 +499,7 @@ frame.bottom=4
 frame.left=4
 frame.right=4
 text.bold=true
+text.boldness=2
 
 [TabBarFrame]
 inherits=PanelButtonCommand