[gnome-themes-standard/wip/jimmac/updated-gtk2: 33/106] Fixed focus styling and tweaked TreeView headers.

[Jakub Steiner <jimmac src gnome org>]

commit b98d6b8b84ebed15ad13e06a7db8ded1338b6608
Author: Juraj Fiala <doctorjellyface riseup net>
Date:   Thu Jan 7 11:17:11 2016 +0100

    Fixed focus styling and tweaked TreeView headers.

 themes/Adwaita/gtk-2.0/gtkrc   |    2 +-
 themes/Adwaita/gtk-2.0/main.rc |   54 +++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 21 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index 86bf8d3..61b06e8 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"
+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-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 b17a38f..8b23752 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -10,7 +10,7 @@ style "default" {
   ####################
 
   GtkWidget::focus-line-width = 1
-
+  GtkWidget::focus-line-pattern = "\2\1"
 
   GtkMenuBar::window-dragging  = 1
   GtkToolbar::window-dragging  = 1
@@ -484,17 +484,6 @@ style "default" {
       stretch  = TRUE
     }
 
-    ##############
-    # Focuslines #
-    ##############
-
-    image {
-      function = FOCUS
-      file     = "Others/focus.png"
-      border   = { 1, 1, 1, 1 }
-      stretch  = TRUE
-    }
-
     ###########
     # Handles #
     ###########
@@ -963,6 +952,10 @@ style "button" {
   xthickness = 3
   ythickness = 3
 
+  fg[NORMAL] = @focus_color
+  fg[PRELIGHT] = @focus_color
+  fg[ACTIVE] = @focus_color
+
   engine "pixmap" {
 
     image {
@@ -1172,7 +1165,7 @@ style "notebook_entry" {
 }
 
 style "notebook_tab_label" {
-  fg[ACTIVE] = @text_color
+  #fg[ACTIVE] = @text_color
 }
 
 style "combobox_entry" {
@@ -1623,6 +1616,10 @@ style "notebook" {
   xthickness = 5
   ythickness = 2
 
+  fg[NORMAL]   = @focus_color
+  fg[PRELIGHT] = @focus_color
+  fg[ACTIVE]   = @focus_color
+
   engine "pixmap" {
 
     image {
@@ -1849,6 +1846,10 @@ style "combobox_arrows" {
 
 style "range" {
 
+  fg[NORMAL]   = @focus_color
+  fg[PRELIGHT] = @focus_color
+  fg[ACTIVE]   = @focus_color
+
   engine "pixmap" {
 
     image {
@@ -2016,16 +2017,18 @@ style "separator_menu_item" {
 }
 
 style "treeview" {
-  #base[ACTIVE] = @bg_color
+  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}
 
-  ythickness = 1
-
-  fg[NORMAL]   = mix(0.5, @fg_color, @base_color)
-  fg[PRELIGHT] = mix(0.5, mix(0.5, @fg_color, @base_color), @fg_color)
-  font_name    = "Bold"
+  fg[NORMAL]   = lighter(@focus_color)
+  fg[PRELIGHT] = lighter(@focus_color)
+  fg[ACTIVE]   = lighter(@focus_color)
 
   engine "pixmap" {
     image {
@@ -2037,6 +2040,16 @@ style "treeview_header" {
   }
 
 }
+style "treeview_header_label" {
+
+  xthickness = 1
+  ythickness = 1
+
+  fg[NORMAL]   = mix(0.5, @fg_color, @base_color)
+  fg[PRELIGHT] = mix(0.5, mix(0.5, @fg_color, @base_color), @fg_color)
+  font_name    = "Bold"
+
+}
 
 style "scrolled_window" {
 
@@ -2226,7 +2239,8 @@ widget_class "*<GtkComboBox>*<GtkButton>"                        style "combobox
 widget_class "*<GtkButton>*<GtkSeparator>"                       style "button_separator"
 widget_class "*HandleBox"                                        style "handlebox"
 widget_class "*<GtkTreeView>"                                    style "treeview"
-widget_class "*<GtkTreeView>*<GtkButton>*"                       style "treeview_header"
+widget_class "*<GtkTreeView>*<GtkButton>*"                       style "treeview_header_label"
+widget_class "*<GtkTreeView>*<GtkButton>"                        style "treeview_header"
 widget_class "*<GtkFileChooserDefault>*<GtkToolbar>"             style "inline_toolbar"
 widget_class "*<GtkFileChooserDefault>*<GtkToolbar>*<GtkButton>" style "button_nohilight"
 widget_class "*<GtkComboBoxEntry>*<GtkEntry>"                    style "combobox_entry"