[gnome-themes-standard/wip/jimmac/updated-gtk2: 86/106] Hack clean.



commit 8e79202cd1d73f75e1ce135656bb7db4d97260e3
Author: Juraj Fiala <doctorjellyface riseup net>
Date:   Fri Feb 26 16:11:30 2016 +0100

    Hack clean.
    
     - removed or fixed most of the hacks
     - removed the last of the old assets
     - made Chromium and Gimp a bit nicer

 .../Adwaita/gtk-2.0/Arrows/arrow-down-insens.png   |  Bin 285 -> 0 bytes
 .../Adwaita/gtk-2.0/Arrows/arrow-down-prelight.png |  Bin 302 -> 0 bytes
 .../gtk-2.0/Arrows/arrow-down-small-insens.png     |  Bin 285 -> 0 bytes
 .../gtk-2.0/Arrows/arrow-down-small-prelight.png   |  Bin 275 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/arrow-down-small.png |  Bin 277 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/arrow-down.png       |  Bin 304 -> 0 bytes
 .../Adwaita/gtk-2.0/Arrows/arrow-left-insens.png   |  Bin 265 -> 0 bytes
 .../Adwaita/gtk-2.0/Arrows/arrow-left-prelight.png |  Bin 282 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/arrow-left.png       |  Bin 290 -> 0 bytes
 .../Adwaita/gtk-2.0/Arrows/arrow-right-insens.png  |  Bin 265 -> 0 bytes
 .../gtk-2.0/Arrows/arrow-right-prelight.png        |  Bin 290 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/arrow-right.png      |  Bin 292 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/arrow-up-insens.png  |  Bin 265 -> 0 bytes
 .../Adwaita/gtk-2.0/Arrows/arrow-up-prelight.png   |  Bin 292 -> 0 bytes
 .../gtk-2.0/Arrows/arrow-up-small-insens.png       |  Bin 249 -> 0 bytes
 .../gtk-2.0/Arrows/arrow-up-small-prelight.png     |  Bin 258 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/arrow-up-small.png   |  Bin 257 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/arrow-up.png         |  Bin 295 -> 0 bytes
 .../Adwaita/gtk-2.0/Arrows/menu-arrow-prelight.png |  Bin 254 -> 0 bytes
 themes/Adwaita/gtk-2.0/Arrows/menu-arrow.png       |  Bin 276 -> 0 bytes
 .../gtk-2.0/Entry/combo-entry-border-active-bg.png |  Bin 224 -> 0 bytes
 .../Entry/combo-entry-border-active-notebook.png   |  Bin 274 -> 0 bytes
 .../Entry/combo-entry-border-active-rtl-bg.png     |  Bin 221 -> 0 bytes
 .../combo-entry-border-active-rtl-notebook.png     |  Bin 286 -> 0 bytes
 .../gtk-2.0/Entry/combo-entry-border-bg.png        |  Bin 360 -> 0 bytes
 .../Entry/combo-entry-border-disabled-bg.png       |  Bin 263 -> 0 bytes
 .../Entry/combo-entry-border-disabled-notebook.png |  Bin 263 -> 0 bytes
 .../Entry/combo-entry-border-disabled-rtl-bg.png   |  Bin 257 -> 0 bytes
 .../combo-entry-border-disabled-rtl-notebook.png   |  Bin 280 -> 0 bytes
 .../gtk-2.0/Entry/combo-entry-border-notebook.png  |  Bin 304 -> 0 bytes
 .../gtk-2.0/Entry/combo-entry-border-rtl-bg.png    |  Bin 375 -> 0 bytes
 .../Entry/combo-entry-border-rtl-notebook.png      |  Bin 322 -> 0 bytes
 .../Entry/combo-entry-button-active-rtl.png        |  Bin 345 -> 0 bytes
 .../gtk-2.0/Entry/combo-entry-button-active.png    |  Bin 360 -> 0 bytes
 .../Entry/combo-entry-button-disabled-rtl.png      |  Bin 309 -> 0 bytes
 .../gtk-2.0/Entry/combo-entry-button-disabled.png  |  Bin 328 -> 0 bytes
 .../gtk-2.0/Entry/combo-entry-button-rtl.png       |  Bin 349 -> 0 bytes
 .../Adwaita/gtk-2.0/Entry/combo-entry-button.png   |  Bin 364 -> 0 bytes
 .../Entry/entry-border-active-bg-solid-spin.png    |  Bin 305 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-active-bg-solid.png |  Bin 371 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-active-bg.png       |  Bin 299 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-active-notebook.png |  Bin 296 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-bg-solid-spin.png   |  Bin 303 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-bg-solid.png        |  Bin 392 -> 0 bytes
 themes/Adwaita/gtk-2.0/Entry/entry-border-bg.png   |  Bin 360 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-disabled-bg.png     |  Bin 322 -> 0 bytes
 .../Entry/entry-border-disabled-notebook.png       |  Bin 319 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-fill-plain.png      |  Bin 139 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-fill-solid.png      |  Bin 203 -> 0 bytes
 themes/Adwaita/gtk-2.0/Entry/entry-border-fill.png |  Bin 179 -> 0 bytes
 .../gtk-2.0/Entry/entry-border-notebook.png        |  Bin 360 -> 0 bytes
 .../Entry/notebook-entry-border-active-bg.png      |  Bin 304 -> 0 bytes
 .../gtk-2.0/Entry/notebook-entry-border-bg.png     |  Bin 402 -> 0 bytes
 .../Entry/notebook-entry-border-disabled-bg.png    |  Bin 314 -> 0 bytes
 .../gtk-2.0/Spin/down-background-disable-rtl.png   |  Bin 259 -> 0 bytes
 .../gtk-2.0/Spin/down-background-disable.png       |  Bin 258 -> 0 bytes
 .../Adwaita/gtk-2.0/Spin/down-background-rtl.png   |  Bin 273 -> 0 bytes
 themes/Adwaita/gtk-2.0/Spin/down-background.png    |  Bin 265 -> 0 bytes
 .../gtk-2.0/Spin/up-background-disable-rtl.png     |  Bin 236 -> 0 bytes
 .../Adwaita/gtk-2.0/Spin/up-background-disable.png |  Bin 260 -> 0 bytes
 themes/Adwaita/gtk-2.0/Spin/up-background-rtl.png  |  Bin 263 -> 0 bytes
 themes/Adwaita/gtk-2.0/Spin/up-background.png      |  Bin 286 -> 0 bytes
 themes/Adwaita/gtk-2.0/apps.rc                     |  255 +++-----------------
 themes/Adwaita/gtk-2.0/assets.svg                  |   22 +--
 themes/Adwaita/gtk-2.0/assets.txt                  |    1 -
 themes/Adwaita/gtk-2.0/assets/null.png             |  Bin 142 -> 0 bytes
 themes/Adwaita/gtk-2.0/gtkrc                       |    2 +-
 themes/Adwaita/gtk-2.0/main.rc                     |   47 +---
 68 files changed, 46 insertions(+), 281 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/apps.rc b/themes/Adwaita/gtk-2.0/apps.rc
index d349500..1adf624 100644
--- a/themes/Adwaita/gtk-2.0/apps.rc
+++ b/themes/Adwaita/gtk-2.0/apps.rc
@@ -1,39 +1,22 @@
 # vim:set ft=gtkrc ts=2 sw=2 sts=2 ai et:
 
-style "ooo_stepper_hack" {
-  GtkScrollbar::stepper-size         = 13
-  GtkScrollbar::has-backward-stepper = 1
-  GtkScrollbar::has-forward-stepper  = 1
-}
-
-style "libreoffice_menubar_button" {
-  xthickness = 0
-  ythickness = 0
+style "toplevel_hack" {
+  engine "adwaita" {}
 }
 
+# TODO: This could really look nicer
 style "gimp_spin_scale" {
 
+  # Spin background
   bg[NORMAL] = @base_color
 
   engine "pixmap" {
 
     image {
-      function = FLAT_BOX
-      detail   = "entry_bg"
-      state    = NORMAL
-    }
-
-    image {
-      function = FLAT_BOX
-      detail   = "entry_bg"
-      state    = ACTIVE
-    }
-
-    image {
       function        = BOX
       state           = NORMAL
       detail          = "spinbutton_up"
-      overlay_file    = "Arrows/arrow-up-small.png"
+      overlay_file    = "assets/spin-up.png"
       overlay_stretch = FALSE
     }
 
@@ -41,7 +24,7 @@ style "gimp_spin_scale" {
       function        = BOX
       state           = PRELIGHT
       detail          = "spinbutton_up"
-      overlay_file    = "Arrows/arrow-up-small-prelight.png"
+      overlay_file    = "assets/spin-up.png"
       overlay_stretch = FALSE
     }
 
@@ -49,7 +32,7 @@ style "gimp_spin_scale" {
       function        = BOX
       state           = ACTIVE
       detail          = "spinbutton_up"
-      overlay_file    = "Arrows/arrow-up-small-prelight.png"
+      overlay_file    = "assets/spin-up.png"
       overlay_stretch = FALSE
     }
 
@@ -57,7 +40,7 @@ style "gimp_spin_scale" {
       function        = BOX
       state           = INSENSITIVE
       detail          = "spinbutton_up"
-      overlay_file    = "Arrows/arrow-up-small-insens.png"
+      overlay_file    = "assets/spin-up-insensitive.png"
       overlay_stretch = FALSE
     }
 
@@ -65,7 +48,7 @@ style "gimp_spin_scale" {
       function        = BOX
       state           = NORMAL
       detail          = "spinbutton_down"
-      overlay_file    = "Arrows/arrow-down-small.png"
+      overlay_file    = "assets/spin-down.png"
       overlay_stretch = FALSE
     }
 
@@ -73,7 +56,7 @@ style "gimp_spin_scale" {
       function        = BOX
       state           = PRELIGHT
       detail          = "spinbutton_down"
-      overlay_file    = "Arrows/arrow-down-small-prelight.png"
+      overlay_file    = "assets/spin-down.png"
       overlay_stretch = FALSE
     }
 
@@ -81,7 +64,7 @@ style "gimp_spin_scale" {
       function        = BOX
       state           = ACTIVE
       detail          = "spinbutton_down"
-      overlay_file    = "Arrows/arrow-down-small-prelight.png"
+      overlay_file    = "assets/spin-down.png"
       overlay_stretch = FALSE
     }
 
@@ -89,7 +72,7 @@ style "gimp_spin_scale" {
       function        = BOX
       state           = INSENSITIVE
       detail          = "spinbutton_down"
-      overlay_file    = "Arrows/arrow-down-small-insens.png"
+      overlay_file    = "assets/spin-down-insensitive.png"
       overlay_stretch = FALSE
     }
 
@@ -97,212 +80,34 @@ style "gimp_spin_scale" {
 
 }
 
-style "libreoffice_entry" {
-
-  engine "pixmap" {
-
-    image {
-      function        = FLAT_BOX
-      detail          = "entry_bg"
-      state           = NORMAL
-      overlay_file    = "Entry/entry-border-fill-solid.png"
-      overlay_border  = {0, 0, 0, 0}
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function        = FLAT_BOX
-      detail          = "entry_bg"
-      state           = ACTIVE
-      overlay_file    = "Entry/entry-border-fill-solid.png"
-      overlay_border  = {0, 0, 0, 0}
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail   = "entry"
-      state    = NORMAL
-      shadow   = IN
-      file     = "Entry/entry-border-bg-solid.png"
-      border   = {4, 4, 4, 4}
-      stretch  = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail   = "entry"
-      state    = ACTIVE
-      file     = "Entry/entry-border-active-bg-solid.png"
-      border   = {4, 4, 4, 4}
-      stretch  = TRUE
-    }
-
-  }
-
-}
-
-style "libreoffice_spinbutton_entry" {
-
-  engine "pixmap" {
-
-    image {
-      function = SHADOW
-      detail   = "entry"
-      state    = NORMAL
-      shadow   = IN
-      file     = "Entry/entry-border-bg-solid-spin.png"
-      border   = {4, 4, 4, 4}
-      stretch  = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail   = "entry"
-      state    = ACTIVE
-      file     = "Entry/entry-border-active-bg-solid-spin.png"
-      border   = {4, 4, 4, 4}
-      stretch  = TRUE
-    }
-
-    image {
-      function        = FLAT_BOX
-      detail          = "entry_bg"
-      state           = NORMAL
-      overlay_file    = "Entry/entry-border-fill-solid.png"
-      overlay_border  = {0, 0, 0, 0}
-      overlay_stretch = TRUE
-    }
-
-    image {
-      function        = FLAT_BOX
-      detail          = "entry_bg"
-      state           = ACTIVE
-      overlay_file    = "Entry/entry-border-fill-solid.png"
-      overlay_border  = {0, 0, 0, 0}
-      overlay_stretch = TRUE
-    }
-
-  }
-
-}
-
-style "gimp_toolbox_frame" {
-
-  engine "pixmap" {
-    image {
-      function = SHADOW
-    }
-  }
-
-}
-
-style "eclipse-tooltips" {
-
-  xthickness = 8
-  ythickness = 4
-
-  bg[NORMAL]   = shade(1.05, @bg_color)
-  fg[NORMAL]   = @text_color
-  bg[SELECTED] = shade(1.05, @bg_color)
-
-}
-
-# Chromium
 style "chrome-gtk-frame" {
 
-  ChromeGtkFrame::frame-color          = @bg_color
+  ChromeGtkFrame::frame-color          = shade (1.05, @bg_color)
+  ChromeGtkFrame::frame-gradient-color = shade (1.05, @bg_color)
   ChromeGtkFrame::inactive-frame-color = @bg_color
 
-  ChromeGtkFrame::frame-gradient-size  = 16
-  ChromeGtkFrame::frame-gradient-color = shade(1.07, @bg_color)
-
   ChromeGtkFrame::incognito-frame-color          = shade(0.85, @bg_color)
-  ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
-
   ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
+  ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
 
-  ChromeGtkFrame::scrollbar-trough-color          = shade(0.912, @bg_color)
-  ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color)
-  ChromeGtkFrame::scrollbar-slider-normal-color   = @bg_color
-
-}
-
-style "chrome_menu_item" {
-  bg[SELECTED] = @selected_bg_color
 }
 
-style "standalone_entry" {
-
-  engine "pixmap" {
-
-    image {
-      function = FLAT_BOX
-      detail   = "entry_bg"
-      state    = ACTIVE
-      file     = "Entry/entry-border-fill-plain.png"
-      stretch  = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail   = "entry"
-      state    = NORMAL
-      shadow   = IN
-      file     = "Entry/entry-border-bg-solid.png"
-      border   = {4, 4, 4, 4}
-      stretch  = TRUE
-    }
-
-    image {
-      function = SHADOW
-      detail   = "entry"
-      state    = ACTIVE
-      file     = "Entry/entry-border-active-bg-solid.png"
-      border   = {4, 4, 4, 4}
-      stretch  = TRUE
-    }
-
-    image {
-      function = FLAT_BOX
-      detail   = "entry_bg"
-      state    = NORMAL
-      file     = "Entry/entry-border-fill-plain.png"
-      stretch  = TRUE
-    }
-
-  }
-
+style "chrome_entry" {
+  base[NORMAL] = @base_color
+  base[INSENSITIVE] = @base_color
 }
 
-# Xchat special cases
-widget "*xchat-inputbox"                                     style "entry"
-
-# GIMP
-# Disable gradients completely for GimpSpinScale
-class "GimpSpinScale"                   style "gimp_spin_scale"
-# Remove borders from "Wilbert frame" in Gimp
-widget_class "*<GimpToolbox>*<GtkFrame>" style "gimp_toolbox_frame"
-
-# Chrome/Chromium
-class "ChromeGtkFrame"                               style "chrome-gtk-frame"
-widget_class "*Chrom*Button*"                        style "button"
-widget_class "*<GtkCustomMenu>*<GtkCustomMenuItem>*" style "chrome_menu_item"
-
-# We use this weird selector to target an offscreen entry as created
-# by Chrome/Chromium to derive the style for its toolbar
-widget_class "<GtkEntry>"                            style "standalone_entry"
+# Disable spin button assets for GimpSpinScale
+class "GimpSpinScale" style "gimp_spin_scale"
 
-# Eclipse/SWT
-widget "gtk-tooltips*"                  style "eclipse-tooltips"
-widget "*swt-toolbar-flat"              style "null"
+# Chromium lets us define some colours and settings for better integration
+class "ChromeGtkFrame" style "chrome-gtk-frame"
+# Chromium uses base as the fill colour of its own entries
+# This would be fine but Gtk+ uses it to fill the surrounding space, so its set to bg
+# That results in Chromium using it for the fill, so we need to handle that
+widget_class "*Chrom*<GtkEntry>" style "chrome_entry"
 
-# Openoffice, Libreoffice
-class "GtkWindow"                             style "toplevel_hack"
-widget "*openoffice-toplevel*"                style "ooo_stepper_hack"
-widget "*openoffice-toplevel*GtkEntry"        style "libreoffice_entry"
-widget "*openoffice-toplevel*GtkSpinButton"   style "libreoffice_spinbutton_entry"
-widget "*openoffice-toplevel*GtkMenuBar*"    style "libreoffice_menubar_button"
-widget "*libreoffice-toplevel*GtkEntry"       style "libreoffice_entry"
-widget "*libreoffice-toplevel*GtkSpinButton"  style "libreoffice_spinbutton_entry"
-widget "*libreoffice-toplevel*GtkMenuBar*"    style "libreoffice_menubar_button"
+# TODO: find out what does does exactly
+# This uses the Adwaita engine for something, I'm not sure for what
+# However disabling it glitches out some separators in Libreoffice
+class "GtkWindow" style "toplevel_hack"
diff --git a/themes/Adwaita/gtk-2.0/assets.svg b/themes/Adwaita/gtk-2.0/assets.svg
index b85a4d9..147ca3b 100644
--- a/themes/Adwaita/gtk-2.0/assets.svg
+++ b/themes/Adwaita/gtk-2.0/assets.svg
@@ -604,12 +604,12 @@
      borderopacity="1"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.828427"
-     inkscape:cx="401.03597"
-     inkscape:cy="370.88361"
+     inkscape:zoom="15.999999"
+     inkscape:cx="208.14671"
+     inkscape:cy="462.49072"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
-     showgrid="true"
+     showgrid="false"
      inkscape:snap-bbox="true"
      inkscape:snap-global="true"
      inkscape:snap-nodes="false"
@@ -2368,7 +2368,7 @@
     <g
        id="tab-vert-active"
        inkscape:label="#g5146"
-       transform="translate(190,-209.00006)">
+       transform="translate(194,-221.00006)">
       <rect
          y="232.00006"
          x="10"
@@ -2398,17 +2398,9 @@
          
style="opacity:1;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
     </g>
     <rect
-       
style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="null"
-       width="1"
-       height="1"
-       x="213"
-       y="17"
-       inkscape:label="#rect4938" />
-    <rect
        inkscape:label="#rect5015"
-       y="26"
-       x="204"
+       y="14"
+       x="208"
        height="1"
        width="1"
        id="tab-gap"
diff --git a/themes/Adwaita/gtk-2.0/assets.txt b/themes/Adwaita/gtk-2.0/assets.txt
index 4e4fc52..6a03528 100644
--- a/themes/Adwaita/gtk-2.0/assets.txt
+++ b/themes/Adwaita/gtk-2.0/assets.txt
@@ -61,7 +61,6 @@ handle-horz
 handle-vert
 menu-border
 menubar-item-active
-null
 pan-left
 pan-left-semi
 pan-left-insensitive
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index 61b06e8..86bf8d3 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc
+++ b/themes/Adwaita/gtk-2.0/gtkrc
@@ -1,7 +1,7 @@
 # Bridge | ScionicSpectre
 # vim:set ts=2 sw=2 sts=2 ai et:
 
-gtk-color-scheme = 
"base_color:white\ntext_color:black\nbg_color:#e8e8e7\nfg_color:#2e3436\nselected_fg_color:#ffffff\nselected_bg_color:#4a90d9\ntooltip_fg_color:#ffffff\ntooltip_bg_color:#343434\ninsensitive_bg_color:#f4f4f2\nfocus_color:darkgrey"
+gtk-color-scheme = 
"base_color:white\ntext_color:black\nbg_color:#e8e8e7\nfg_color:#2e3436\nselected_fg_color:#ffffff\nselected_bg_color:#4a90d9\ntooltip_fg_color:#ffffff\ntooltip_bg_color:#343434\ninsensitive_bg_color:#f4f4f2"
 
 gtk-auto-mnemonics              = 1
 gtk-primary-button-warps-slider = 1
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index d92d63b..f182751 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -659,8 +659,6 @@ style "default" {
 
     image {
       function = SHADOW_GAP
-      file     = "assets/null.png"
-      stretch  = TRUE
     }
 
   }
@@ -809,10 +807,6 @@ style "scrollbar" {
 
 }
 
-style "toplevel_hack" {
-  engine "adwaita" {}
-}
-
 style "menubar" {
 
   # Needed to fix Firefox's menubar text
@@ -858,6 +852,7 @@ style "menu" {
   bg[NORMAL]      = @base_color
   bg[INSENSITIVE] = @base_color
   bg[PRELIGHT]    = @base_color
+  bg[SELECTED] = @selected_bg_color
 
   # For menus that use horizontal lines rather than gtkseparator
   engine "pixmap" {
@@ -868,6 +863,8 @@ style "menu" {
     }
   }
 
+  # TODO: find out why/where this is needed
+  # This is used for some compatibilty issues
   engine "adwaita" {}
 
 }
@@ -877,18 +874,13 @@ style "menu_item" {
   xthickness = 3
   ythickness = 4
 
-  # HACK: Gtk doesn't actually read this value
-  # while rendering the menu items, but Libreoffice
-  # does; setting this value equal to the one in
-  # fg[PRELIGHT] ensures a code path in the LO theming code
-  # that falls back to a dark text color for menu item text
-  # highlight. The price to pay is black text on menus as well,
-  # but at least it's readable.
-  # See https://bugs.freedesktop.org/show_bug.cgi?id = 38038
-  bg[SELECTED] = @selected_fg_color
-
   bg[PRELIGHT]   = @selected_bg_color
+  # Chromium uses this setting
+  bg[SELECTED]   = @selected_bg_color
+
   fg[PRELIGHT]   = @selected_fg_color
+  # Some widgets use text, we need to handle that
+  text[NORMAL]   = @fg_color
   text[PRELIGHT] = @selected_fg_color
 
   engine "pixmap" {
@@ -2059,20 +2051,10 @@ style "progressbar" {
 
 }
 
-style "treeview" {
-  fg[NORMAL]   = lighter(@focus_color)
-  fg[PRELIGHT] = lighter(@focus_color)
-  fg[ACTIVE]   = lighter(@focus_color)
-}
-
 style "treeview_header" {
 
   GtkButton::inner-border = {3, 3, 0, 0}
 
-  fg[NORMAL]   = lighter(@focus_color)
-  fg[PRELIGHT] = lighter(@focus_color)
-  fg[ACTIVE]   = lighter(@focus_color)
-
   engine "pixmap" {
 
     image {
@@ -2316,18 +2298,6 @@ style "tooltips" {
 
 }
 
-style "null" {
-
-  engine "pixmap" {
-    image {
-      function = BOX
-      file     = "assets/null.png"
-      stretch  = TRUE
-    }
-  }
-
-}
-
 class "GtkWidget"         style "default"
 class "GtkScrollbar"      style "scrollbar"
 class "GtkButton"         style "button"
@@ -2355,7 +2325,6 @@ widget_class "*<GtkCheckButton>*"                               style "checkbutt
 widget_class "*<GtkButton>*<GtkSeparator>"                      style "button_separator"
 widget_class "*<GtkToolbar>*GtkSeparator*"                      style "toolbar_separator"
 widget_class "*HandleBox"                                       style "handlebox"
-widget_class "*<GtkTreeView>"                                   style "treeview"
 widget_class "*<GtkTreeView>*<GtkButton>*"                      style "treeview_header_label"
 widget_class "*<GtkTreeView>*<GtkButton>"                       style "treeview_header"
 widget_class "*<GtkTreeView>*<GtkArrow>"                        style "treeview_header_arrow"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]