Merge branch 'win32-theme-flat-button-fix' into 'gtk-3-24'

GTK WIn32 theme - make buttons with .flat class appear flat and buttons in toolbar non-flat if they don't have said class

See merge request GNOME/gtk!4350

1 files changed, 8 insertions, 23 deletions

diff --git a/gtk/theme/win32/gtk-win32-base.css b/gtk/theme/win32/gtk-win32-base.css
index 3b38104f1e..c49b3ec51f 100644
--- a/gtk/theme/win32/gtk-win32-base.css
+++ b/gtk/theme/win32/gtk-win32-base.css
@@ -280,6 +280,10 @@ button.default {
     background-image: -gtk-win32-theme-part(button, 1, 5);
 }
 
+button.flat {
+	background-image: none;
+}
+
 button:hover {
     background-image: -gtk-win32-theme-part(button, 1, 2);
 }
@@ -293,6 +297,10 @@ button:disabled {
     background-image: -gtk-win32-theme-part(button, 1, 4);
 }
 
+button.flat:disabled {
+    background-image: none;
+}
+
 /* checkbuttons */
 
 /* This is the magic spacing that's hardcoded in Wine */
@@ -1132,29 +1140,6 @@ toolbar {
     background-image: -gtk-win32-theme-part(rebar, 6, 1);
 }
 
-toolbar button,
-toolbar button:focus {
-    background-color: transparent;
-    background-image: -gtk-win32-theme-part(toolbar, 1, 1);
-}
-
-toolbar button:hover,
-toolbar button:hover:focus {
-    background-image: -gtk-win32-theme-part(toolbar, 1, 2);
-}
-
-toolbar button:active {
-    background-image: -gtk-win32-theme-part(toolbar, 1, 3);
-}
-
-toolbar button:active:hover {
-    background-image: -gtk-win32-theme-part(toolbar, 1, 6);
-}
-
-toolbar button:disabled {
-    background-image: -gtk-win32-theme-part(toolbar, 1, 4);
-}
-
 /* Column headers */
 
 header button,