qtplasmac: fix button_normal "pressed" color

LinuxCNC · Apr 14, 2024 · 6ebe7ef · 6ebe7ef
1 parent 96dfb9b
commit 6ebe7ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
@@ -1,4 +1,4 @@
-VERSION = '238.312'
+VERSION = '238.313'
 LCNCVER = '2.9'
 DOCSVER = LCNCVER
 
@@ -4587,10 +4587,10 @@ def button_normal(self, button):
                          .format(self.foreColor, self.backColor, self.disabledColor))
         else:
             self.w[button].setStyleSheet( \
-                        'QPushButton {{ color: {0}; background: {1} }} \
-                         QPushButton:pressed {{ color: {0}; background: {1} }} \
-                         QPushButton:disabled {{ color: {2} }}' \
-                         .format(self.foreColor, self.backColor, self.disabledColor))
+                        'QPushButton {{ color: {0}; background: {2} }} \
+                         QPushButton:pressed {{ color: {2}; background: {1} }} \
+                         QPushButton:disabled {{ color: {3} }}' \
+                         .format(self.foreColor, self.fore1Color, self.backColor, self.disabledColor))
 
 
 #########################################################################################################################

diff --git a/share/qtvcp/screens/qtplasmac/versions.html b/share/qtvcp/screens/qtplasmac/versions.html
@@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.9</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>238.313 2024 Apr 14</u></b>
+<ul style="margin:0;">
+  <li>fix button_normal "pressed" color</li>
+</ul>
+
 <br><b><u>238.312 2024 Apr 9</u></b>
 <ul style="margin:0;">
   <li>fix button interlock when bounds error is present</li>