Revert "combobox: Don't special-case RTL child positions anymore"

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

diff --git a/gtk/gtk-win32-base.css b/gtk/gtk-win32-base.css
index cf73cabd3e0b98f378a79a0bb859302593259c45..0c86bbb058e25c819eb3e51accc67d1053f6f314 100644 (file)
--- a/gtk/gtk-win32-base.css
+++ b/gtk/gtk-win32-base.css
@@ -22,6 +22,9 @@ GtkViewport {
     -GtkWidget-link-color: -gtk-win32-color(button, 26);
     -GtkWidget-visited-link-color: -gtk-win32-color(button, 26);
     border-color: shade (@bg_color, 0.6);
+
+    -GtkScrolledWindow-scrollbars-within-bevel: 1;
+    -GtkScrolledWindow-scrollbars-spacing: 0;
 }
 
 GtkFrame {
@@ -74,6 +77,16 @@ GtkFrame {
     color: #fff;
 }
 
+.notebook > GtkScrolledWindow.frame {
+    border-style: none;
+}
+
+GtkScrolledWindow.frame {
+  border-style: solid;
+  border-width: 2px;
+  border-image: -gtk-win32-theme-part(listview, 5 1) 2 2 2 2 stretch;
+}
+
 .view {
   border-width: 0;
   border-radius: 0;
@@ -149,7 +162,11 @@ GtkAssistant .sidebar .highlight {
     background-image: -gtk-win32-theme-part(button, 3 4);
 }
 
-.check:prelight {
+/* The GtkButton here is to avoid problems with checkboxes
+   in a listview where all checkboxes in a row gets prelighted
+   whenever the row is prelighted */
+
+GtkButton.check:prelight {
     background-image: -gtk-win32-theme-part(button, 3 2);
 }
 
@@ -161,7 +178,7 @@ GtkAssistant .sidebar .highlight {
     background-image: -gtk-win32-theme-part(button, 3 8);
 }
 
-.check:active:prelight {
+GtkButton.check:active:prelight {
     background-image: -gtk-win32-theme-part(button, 3 6);
 }
 
@@ -330,19 +347,28 @@ GtkAssistant .sidebar .highlight {
 
 /* Entry */
 
-/* TODO: For entries with set_has_frame FALSE we should use 'edit, 3 1', not 
-   sure how to select for this though */
+/* We apply the border as a border combined with the background so that
+   gtk_entry_set_has_frame works */
+
 .entry {
-    background-color: black;
-    border-width: 0;
-    background-image: -gtk-win32-theme-part(edit, 1 1);
-    padding: 3px;
+    border-width: 1px;
+    border-style: solid;
+    border-image: -gtk-win32-theme-part(edit, 6 1)  1 1 1 1 stretch;
+    background-image: -gtk-win32-theme-part(edit, 6 1, margins(-1 -1 -1 -1));
+    padding: 2px;
 }
 .entry:insensitive {
-    background-image: -gtk-win32-theme-part(edit, 1 4);
+    border-image: -gtk-win32-theme-part(edit, 6 4)  1 1 1 1 stretch;
+    background-image: -gtk-win32-theme-part(edit, 6 4, margins(-1 -1 -1 -1));
+    color: #a7aba7;
 }
 .entry:prelight {
-    background-image: -gtk-win32-theme-part(edit, 1 4);
+    border-image: -gtk-win32-theme-part(edit, 6 2)  1 1 1 1 stretch;
+    background-image: -gtk-win32-theme-part(edit, 6 2, margins(-1 -1 -1 -1));
+}
+.entry:focused {
+    border-image: -gtk-win32-theme-part(edit, 6 3)  1 1 1 1 stretch;
+    background-image: -gtk-win32-theme-part(edit, 6 3, margins(-1 -1 -1 -1));
 }
 
 /* Spinbuttons */
@@ -565,13 +591,15 @@ GtkProgressBar.trough {
 }
 
 GtkProgressBar.progressbar,
-GtkEntry.progressbar {
+GtkEntry.progressbar,
+GtkEntry.progressbar:focused {
     border-width: 0;
     background-image: -gtk-win32-theme-part(progress, 5 1);
 }
 
 GtkProgressBar.progressbar.pulse,
-GtkEntry.progressbar.pulse {
+GtkEntry.progressbar.pulse,
+GtkEntry.progressbar.pulse:focused {
     background-color: transparent;
     background-image: -gtk-win32-theme-part(progress, 8 1);
 }
@@ -590,7 +618,6 @@ GtkProgressBar.trough.vertical {
 
 /* Combobox */
 
-
 GtkComboBox.combobox-entry .button {
     background-color: transparent;
     border-width: 0;
@@ -613,6 +640,13 @@ GtkComboBox.combobox-entry .button:insensitive {
     background-image: -gtk-win32-theme-part(combobox, 1 4);
 }
 
+GtkComboBox .separator {
+    /* always disable separators */
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0;
+}
+
 /* Notebook */
 
 .notebook {
@@ -746,6 +780,57 @@ GtkSwitch.trough:active {
     color: -gtk-win32-color(button, 7);
 }
 
+.menubar .menuitem *:backdrop {
+    color: mix (-gtk-win32-color(button, 7), white, 0.5);
+}
+
 .menubar > .menuitem {
     padding: 3px 5px;
 }
+
+/* Assistant */
+
+GtkAssistant .sidebar .highlight {
+    background-color: blue;
+    font: bold;
+}
+
+GtkAssistant .sidebar {
+    padding: 12px;
+
+    background-color: white;
+
+    border-image: none;
+    border-width: 0 1px 0 0;
+    border-style: solid;
+}
+
+GtkColorSwatch {
+    border-style: solid;
+    border-width: 1px;
+}
+
+GtkColorSwatch:prelight {
+    border-color: shade (@bg_color, 0.2);
+}
+
+.separator,
+.separator:prelight {
+    color: shade (@bg_color, 0.6);
+}
+
+GtkStatusbar > GtkFrame {
+    border-width: 1px 1px 1px 1px;
+    border-style: solid;
+    border-image:  -gtk-win32-theme-part(status, 0 0, margins (-1 0 0 0))  2 1 1 1 stretch;
+    background-image: none;
+}
+
+/*
+ This doesn't quite look right with no background (i.e. when not on a statusbar
+
+.grip {
+    background-color: transparent;
+    background-image:  -gtk-win32-theme-part(status, 3 1);
+}
+*/