Bug fixes for #11

Alexhuszagh · Jul 17, 2021 · d620f22 · d620f22
1 parent 735d648
commit d620f22
Show file tree

Hide file tree

Showing 12 changed files with 4,095 additions and 3,985 deletions.
diff --git a/README.md b/README.md
@@ -144,6 +144,8 @@ Here is a sample theme, with the color descriptions annotated. Please note that
     "slider:foreground": "#3daee9",
     // Background color for the handle of a QSlider.
     "slider:handle:background": "#1d2023",
+    // Color for a disabled menubar/menu item.
+    "menu:disabled": "#76797c",
     // Color for a checked/hovered QCheckBox or QRadioButton.
     "checkbox:light": "#58d3ff",
     // Color for a disabled or unchecked/unhovered QCheckBox or QRadioButton.

diff --git a/breeze_resources.py b/breeze_resources.py
diff --git a/dark/stylesheet.qss b/dark/stylesheet.qss
@@ -62,6 +62,11 @@ QWidget:disabled
     background-color: #31363b;
 }
 
+QWidget:disabled:hover
+{
+    background-color: #31363b;
+}
+
 QCheckBox
 {
     spacing: 0.23em;
@@ -269,6 +274,11 @@ QMenuBar::item:selected
     background: transparent;
 }
 
+QMenuBar::item:disabled
+{
+    color: #76797c;
+}
+
 QMenuBar::item:pressed
 {
     background-color: #3daee9;
@@ -302,10 +312,14 @@ QMenu::item:selected
     background-color: #3daee9;
 }
 
-QMenu::item:hover
+QMenu::item:selected:disabled
 {
-    color: #eff0f1;
-    background-color: #3daee9;
+    background-color: #31363b;
+}
+
+QMenu::item:disabled
+{
+    color: #76797c;
 }
 
 QMenu::indicator
@@ -362,6 +376,11 @@ QMenu::right-arrow
     height: 0.8em;
 }
 
+QMenu::right-arrow:disabled
+{
+    border-image: url(:/dark/right_arrow_disabled.svg);
+}
+
 QAbstractItemView
 {
     alternate-background-color: #31363b;
@@ -370,7 +389,7 @@ QAbstractItemView
     border-radius: 0.09em;
 }
 
-QMenuBar:focus
+QMenuBar::item:focus:!disabled
 {
     border: 0.04em solid #3daee9;
 }

diff --git a/light/stylesheet.qss b/light/stylesheet.qss
@@ -62,6 +62,11 @@ QWidget:disabled
     background-color: #eff0f1;
 }
 
+QWidget:disabled:hover
+{
+    background-color: #eff0f1;
+}
+
 QCheckBox
 {
     spacing: 0.23em;
@@ -269,6 +274,11 @@ QMenuBar::item:selected
     background: transparent;
 }
 
+QMenuBar::item:disabled
+{
+    color: #bab9b8;
+}
+
 QMenuBar::item:pressed
 {
     background-color: rgba(51, 164, 223, 0.5);
@@ -302,10 +312,14 @@ QMenu::item:selected
     background-color: rgba(51, 164, 223, 0.5);
 }
 
-QMenu::item:hover
+QMenu::item:selected:disabled
 {
-    color: #31363b;
-    background-color: rgba(51, 164, 223, 0.5);
+    background-color: #eff0f1;
+}
+
+QMenu::item:disabled
+{
+    color: #bab9b8;
 }
 
 QMenu::indicator
@@ -362,6 +376,11 @@ QMenu::right-arrow
     height: 0.8em;
 }
 
+QMenu::right-arrow:disabled
+{
+    border-image: url(:/light/right_arrow_disabled.svg);
+}
+
 QAbstractItemView
 {
     alternate-background-color: #eff0f1;
@@ -370,7 +389,7 @@ QAbstractItemView
     border-radius: 0.09em;
 }
 
-QMenuBar:focus
+QMenuBar::item:focus:!disabled
 {
     border: 0.04em solid rgba(51, 164, 223, 0.5);
 }

diff --git a/template/stylesheet.qss.in b/template/stylesheet.qss.in
@@ -62,6 +62,11 @@ QWidget:disabled
     background-color: ^background^;
 }
 
+QWidget:disabled:hover
+{
+    background-color: ^background^;
+}
+
 QCheckBox
 {
     spacing: 0.23em;
@@ -269,6 +274,11 @@ QMenuBar::item:selected
     background: transparent;
 }
 
+QMenuBar::item:disabled
+{
+    color: ^menu:disabled^;
+}
+
 QMenuBar::item:pressed
 {
     background-color: ^highlight^;
@@ -302,10 +312,14 @@ QMenu::item:selected
     background-color: ^highlight^;
 }
 
-QMenu::item:hover
+QMenu::item:selected:disabled
 {
-    color: ^foreground^;
-    background-color: ^highlight^;
+    background-color: ^background^;
+}
+
+QMenu::item:disabled
+{
+    color: ^menu:disabled^;
 }
 
 QMenu::indicator
@@ -362,6 +376,11 @@ QMenu::right-arrow
     height: 0.8em;
 }
 
+QMenu::right-arrow:disabled
+{
+    border-image: url(:/^style^/right_arrow_disabled.svg);
+}
+
 QAbstractItemView
 {
     alternate-background-color: ^background^;
@@ -370,7 +389,7 @@ QAbstractItemView
     border-radius: 0.09em;
 }
 
-QMenuBar:focus
+QMenuBar::item:focus:!disabled
 {
     border: 0.04em solid ^highlight^;
 }

diff --git a/test.py b/test.py
@@ -727,6 +727,47 @@ def test_multiple_buttons(widget, *_):
 
     return child
 
+def test_disabled_menu(widget, window, font, width, *_):
+    child = QtWidgets.QMenuBar(window)
+    child.setGeometry(QtCore.QRect(0, 0, width, int(1.5 * font.pointSize())))
+    menu = QtWidgets.QMenu('Main Menu', child)
+    menu.addAction(QtWidgets.QAction('&Action 1', window))
+    menu.addAction(QtWidgets.QAction('&Action 2', window))
+    submenu = QtWidgets.QMenu('Sub Menu', menu)
+    submenu.addAction(QtWidgets.QAction('&Action 3', window))
+    action1 = QtWidgets.QAction('&Action 4', window)
+    action1.setCheckable(True)
+    action1.setEnabled(False)
+    submenu.addAction(action1)
+    menu.addAction(submenu.menuAction())
+    action2 = QtWidgets.QAction('&Action 5', window)
+    action2.setCheckable(True)
+    action2.setChecked(True)
+    menu.addSeparator()
+    menu.addAction(action2)
+    action3 = QtWidgets.QAction('&Action 6', window)
+    action3.setCheckable(True)
+    menu.addAction(action3)
+    icon = QtGui.QIcon(':/dark/close.svg')
+    menu.addAction(QtWidgets.QAction(icon, '&Action 7', window))
+    menu.addAction(QtWidgets.QAction(icon, '&Action 8', window))
+    menu.actions()[2].setEnabled(False)
+    submenu.addAction(QtWidgets.QAction(icon, '&Action 9', window))
+    child.addAction(menu.menuAction())
+    window.setMenuBar(child)
+
+    return child
+
+def test_disabled_menubar(widget, window, font, width, *_):
+    child = QtWidgets.QMenuBar(window)
+    child.setGeometry(QtCore.QRect(0, 0, width, int(1.5 * font.pointSize())))
+    menu = QtWidgets.QMenu('Main Menu', child)
+    child.addAction(menu.menuAction())
+    window.setMenuBar(child)
+    menu.setEnabled(False)
+
+    return child
+
 def test(args, qtargv, test_widget):
     '''Test a single widget.'''
 

diff --git a/theme/dark-green.json b/theme/dark-green.json
@@ -27,6 +27,7 @@
     "tree": "#afafaf",
     "slider:foreground": "#33b833",
     "slider:handle:background": "#1d2023",
+    "menu:disabled": "#76797c",
     "checkbox:light": "#40e640",
     "checkbox:disabled": "#c8c9ca",
     "scrollbar:hover": "#33b833",

diff --git a/theme/dark-purple.json b/theme/dark-purple.json
@@ -27,6 +27,7 @@
     "tree": "#afafaf",
     "slider:foreground": "#a74bb8",
     "slider:handle:background": "#1d2023",
+    "menu:disabled": "#76797c",
     "checkbox:light": "#ca3fe6",
     "checkbox:disabled": "#c8c9ca",
     "scrollbar:hover": "#a74bb8",

diff --git a/theme/dark.json b/theme/dark.json
@@ -27,6 +27,7 @@
     "tree": "#afafaf",
     "slider:foreground": "#3daee9",
     "slider:handle:background": "#1d2023",
+    "menu:disabled": "#76797c",
     "checkbox:light": "#58d3ff",
     "checkbox:disabled": "#c8c9ca",
     "scrollbar:hover": "#3daee9",

diff --git a/theme/light-green.json b/theme/light-green.json
@@ -27,6 +27,7 @@
     "tree": "#4b4b4b",
     "slider:foreground": "#32df33",
     "slider:handle:background": "#eff0f1",
+    "menu:disabled": "#bab9b8",
     "checkbox:light": "#272b2f",
     "checkbox:disabled": "#6a6e71",
     "scrollbar:hover": "rgba(50, 223, 50, 0.8)",

diff --git a/theme/light-purple.json b/theme/light-purple.json
@@ -27,6 +27,7 @@
     "tree": "#4b4b4b",
     "slider:foreground": "#c233df",
     "slider:handle:background": "#eff0f1",
+    "menu:disabled": "#bab9b8",
     "checkbox:light": "#272b2f",
     "checkbox:disabled": "#6a6e71",
     "scrollbar:hover": "rgba(194, 51, 223, 0.8)",

diff --git a/theme/light.json b/theme/light.json
@@ -27,6 +27,7 @@
     "tree": "#4b4b4b",
     "slider:foreground": "#3daef3",
     "slider:handle:background": "#eff0f1",
+    "menu:disabled": "#bab9b8",
     "checkbox:light": "#272b2f",
     "checkbox:disabled": "#6a6e71",
     "scrollbar:hover": "rgba(51, 164, 223, 0.8)",