win32-theme: Add some margins on GtkScale trought to look like win32

[~andy/gtk] / gtk / gtk-win32.css

diff --git a/gtk/gtk-win32.css b/gtk/gtk-win32.css
index f72cd87a98d7af7112732bf7d652f0100a464e4d..7b60a6b061e932d13cc43b2e60d9b42b9c1ff6c2 100644 (file)
--- a/gtk/gtk-win32.css
+++ b/gtk/gtk-win32.css
@@ -3,6 +3,7 @@
 /* Buttons */
 
 .button {
+    background-color: none;
     background-image: -gtk-win32-theme-part(button, 1 1);
     border-width: 0;
     -GtkWidget-focus-line-width: 1;
@@ -30,6 +31,7 @@
 /* Check buttons */
 
 .check {
+    background-color: none;
     background-image: -gtk-win32-theme-part(button, 3 1);
     border-width: 0;
 }
@@ -47,7 +49,7 @@
 }
 
 .check:active:insensitive {
-    background-image: -gtk-win32-theme-part(button, 1 8);
+    background-image: -gtk-win32-theme-part(button, 3 8);
 }
 
 .check:active:prelight {
@@ -69,6 +71,7 @@
 /* Radio buttons */
 
 .radio {
+    background-color: none;
     background-image: -gtk-win32-theme-part(button, 2 1);
     border-width: 0;
 }
@@ -86,20 +89,23 @@
 }
 
 .radio:active:insensitive {
-    background-image: -gtk-win32-theme-part(button, 1 8);
+    background-image: -gtk-win32-theme-part(button, 2 8);
 }
 
 .radio:active:prelight {
     background-image: -gtk-win32-theme-part(button, 2 6);
 }
 
-
 .radio:inconsistent {
-    background-image: -gtk-win32-theme-part(button, 2 1, mix 2 5);
+    background-image: -gtk-win32-theme-part(button, 2 1, over (2 5, 0.3));
+}
+
+.radio:inconsistent:insensitive {
+    background-image: -gtk-win32-theme-part(button, 2 4, over (2 8, 0.3));
 }
 
 .radio:inconsistent:prelight {
-    background-image: -gtk-win32-theme-part(button, 2 4 , mix 2 6);
+    background-image: -gtk-win32-theme-part(button, 2 4, over(2 6, 0.3));
 }
 
 /* Scrollbars */
@@ -108,6 +114,7 @@
    don't use this atm */
 
 .scrollbar {
+    background-color: none;
     -GtkRange-trough-border: 0;
     -GtkRange-arrow-scaling: 0.0;
     -GtkRange-slider-width: -gtk-win32-size(scrollbar, 3);
@@ -187,29 +194,29 @@
 
 .scrollbar.trough {
     border-width: 0;
-    background-image: -gtk-win32-theme-part(scrollbar, 2 1, 4 1);
+    background-image: -gtk-win32-theme-part(scrollbar, 2 1, over (4 1));
 }
 
 .scrollbar.trough.vertical {
     border-width: 0;
-    background-image: -gtk-win32-theme-part(scrollbar, 2 1, 6 1);
+    background-image: -gtk-win32-theme-part(scrollbar, 2 1, over (6 1));
 }
 
 .scrollbar.slider {
     border-width: 0;
-    background-image: -gtk-win32-theme-part(scrollbar, 2 1, 8 1);
+    background-image: -gtk-win32-theme-part(scrollbar, 2 1, over (8 1));
 }
 
 .scrollbar.slider:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 2 2, 8 2);
+    background-image: -gtk-win32-theme-part(scrollbar, 2 2, over (8 2));
 }
 
 .scrollbar.slider.vertical {
-    background-image: -gtk-win32-theme-part(scrollbar, 3 1, 9 1);
+    background-image: -gtk-win32-theme-part(scrollbar, 3 1, over (9 1));
 }
 
 .scrollbar.slider.vertical:prelight {
-    background-image: -gtk-win32-theme-part(scrollbar, 3 2, 9 2);
+    background-image: -gtk-win32-theme-part(scrollbar, 3 2, over (9 2));
 }
 
 /* Entry */
@@ -217,6 +224,7 @@
 /* TODO: For entries with set_has_frame FALSE we should use 'edit, 3 1', not 
    sure how to select for this though */
 .entry {
+    background-color: black;
     border-width: 0;
     background-image: -gtk-win32-theme-part(edit, 1 1);
 }
@@ -231,6 +239,7 @@
 
 .spinbutton.button,
 .spinbutton.button:focused {
+    background-color: none;
     border-width: 1 1 0 0;
     border-style: none;
     background-image: -gtk-win32-theme-part(spin, 1 1);
@@ -285,6 +294,7 @@
    trough */
 
 .scale {
+    background-color: none;
     -GtkScale-value-spacing: 0;
     -GtkScale-slider-length: 9;
     -GtkRange-slider-width: 20;
@@ -294,10 +304,15 @@
 .scale.trough {
     border-style: none;
     border-width: 0;
-    background-image: -gtk-win32-theme-part(trackbar, 1 1);
+    background-image: -gtk-win32-theme-part(trackbar, 1 1, margins (2 0 2 0));
+}
+
+.scale.trough.vertical {
+    background-image: -gtk-win32-theme-part(trackbar, 1 1, margins (0 2 0 2));
 }
 
 .scale.slider {
+    background-color: none;
     border-width: 0;
     color: rgba(0,0,0,0);
     background-image: -gtk-win32-theme-part(trackbar, 3 1);
@@ -430,6 +445,7 @@
 /* Progress bars */
 
 GtkProgressBar {
+    background-color: none;
     padding: 0;
 }
 
@@ -464,27 +480,33 @@ GtkProgressBar.trough.vertical {
 /* Menus */
 
 .menubar {
+    background-color: none;
     border-width: 0;
     background-image: -gtk-win32-theme-part(menu, 7 1);
 }
 
 .menubar .menuitem {
+    background-color: none;
     border-width: 0;
     background-image: -gtk-win32-theme-part(menu, 8 1);
 }
 
 .menubar .menuitem:prelight {
+    background-color: none;
     border-width: 0;
     background-image: -gtk-win32-theme-part(menu, 8 3);
 }
 
 .menuitem:prelight {
+    background-color: none;
     background-image: -gtk-win32-theme-part(menu, 14 2);
 
 }
 
 .menuitem.radio,
-.menuitem.radio:prelight {
+.menuitem.radio:prelight,
+.menuitem.radio:insensitive {
+    background-color: none;
     background-image: none;
     border-width: 0;
 }
@@ -496,20 +518,23 @@ GtkProgressBar.trough.vertical {
 }
 
 .menuitem.radio:inconsistent,
-.menuitem.radio:inconsistent:prelight {
-    background-image: -gtk-win32-theme-part(menu, 11 3, mix 0 0);
+.menuitem.radio:inconsistent:insensitive,
+.menuitem.radio:inconsistent:prelight,
+.menuitem.radio:inconsistent:active,
+.menuitem.radio:inconsistent:active:prelight {
+    background-image: none; /* Fall back to default, this state is not in win32 */
     border-width: 0;
 }
 
-.menuitem.radio:insensitive,
-.menuitem.radio:insensitive:prelight{
+.menuitem.radio:insensitive:active,
+.menuitem.radio:insensitive:active:prelight {
     background-image: -gtk-win32-theme-part(menu, 11 4);
     border-width: 0;
 }
 
-
 .menuitem.check,
-.menuitem.check:prelight {
+.menuitem.check:prelight,
+.menuitem.check:insensitive {
     background-image: none;
     border-width: 0;
 }
@@ -521,13 +546,16 @@ GtkProgressBar.trough.vertical {
 }
 
 .menuitem.check:inconsistent,
-.menuitem.check:inconsistent:prelight {
-    background-image: -gtk-win32-theme-part(menu, 11 1, mix 0 0);
+.menuitem.check:inconsistent:insensitive,
+.menuitem.check:inconsistent:prelight,
+.menuitem.check:inconsistent:active,
+.menuitem.check:inconsistent:active:prelight {
+    background-image: none; /* Fall back to default, this state is not in win32 */
     border-width: 0;
 }
 
-.menuitem.check:insensitive,
-.menuitem.check:insensitive:prelight{
+.menuitem.check:insensitive:active,
+.menuitem.check:insensitive:active:prelight{
     background-image: -gtk-win32-theme-part(menu, 11 2);
     border-width: 0;
 }
@@ -536,6 +564,7 @@ GtkProgressBar.trough.vertical {
 
 
 GtkComboBox.combobox-entry .button {
+    background-color: none;
     border-width: 0;
     background-image: -gtk-win32-theme-part(combobox, 1 1);
     color: rgba(0, 0, 0, 0);
@@ -559,19 +588,22 @@ GtkComboBox.combobox-entry .button:insensitive {
 /* Notebook */
 
 .notebook {
+    background-color: none;
     border-width: 0;
     background-image: -gtk-win32-theme-part(tab, 9 1);
-    -GtkNotebook-tab-overlap: 0;
-    -GtkNotebook-tab-curvature: 20;
+    -GtkNotebook-tab-overlap: 1;
+    -GtkNotebook-tab-curvature: 1;
 }
 
 .notebook tab {
+    background-color: none;
     border-width: 0;
     background-image: -gtk-win32-theme-part(tab, 1 1);
 }
 
 .notebook tab:active {
     background-image: -gtk-win32-theme-part(tab, 1 3);
+    padding: 4;
 }
 
 .notebook {
@@ -581,12 +613,14 @@ GtkComboBox.combobox-entry .button:insensitive {
 /* Toolbar */
 
 .toolbar {
+    background-color: none;
     border-width: 0;
     background-image: -gtk-win32-theme-part(rebar, 6 1);
 }
 
 .toolbar .button,
 .toolbar .button:focused {
+    background-color: none;
     background-image: -gtk-win32-theme-part(toolbar, 1 1);
 }
 
@@ -606,3 +640,24 @@ GtkComboBox.combobox-entry .button:insensitive {
 .toolbar .button:insensitive {
     background-image: -gtk-win32-theme-part(toolbar, 1 4);
 }
+
+/* Column headers */
+
+column-header .button,
+column-header .button:focus {
+    background-color: none;
+    border-width: 0;
+    background-image: -gtk-win32-theme-part(header, 1 1);
+}
+
+column-header .button:prelight,
+column-header .button:prelight:focus {
+    background-image: -gtk-win32-theme-part(header, 1 2);
+}
+
+column-header .button:active,
+column-header .button:active:prelight,
+column-header .button:active:focus,
+column-header .button:active:prelight:focus {
+    background-image: -gtk-win32-theme-part(header, 1 3);
+}