Fix some long-standing bugs.

 - vim now has proper tabs
 - (he)xchat now has proper entries
 - fix some style issues

2 files changed, 19 insertions, 7 deletions

diff --git a/themes/Adwaita/gtk-2.0/apps.rc b/themes/Adwaita/gtk-2.0/apps.rc
index 9398f667..514ef1b5 100644
--- a/themes/Adwaita/gtk-2.0/apps.rc
+++ b/themes/Adwaita/gtk-2.0/apps.rc
@@ -80,7 +80,7 @@ style "gimp_spin_scale" {
 
 }
 
-style "chrome-gtk-frame" {
+style "chrome_gtk_frame" {
 
   ChromeGtkFrame::frame-color          = shade (1.05, @bg_color)
   ChromeGtkFrame::frame-gradient-color = shade (1.05, @bg_color)
@@ -93,21 +93,31 @@ style "chrome-gtk-frame" {
 }
 
 style "chrome_entry" {
-  base[NORMAL] = @base_color
+  base[NORMAL]      = @base_color
   base[INSENSITIVE] = @base_color
 }
 
+style "vim_notebook" {
+  bg[NORMAL] = @base_color
+  bg[ACTIVE] = @insensitive_bg_color
+}
+
+# Vim puts an eventbox between the tab and the label and colours it,
+# we need to handle that
+widget "vim-main-window*GtkNotebook.GtkEventBox" style "vim_notebook"
+
+# (he)xchat input box
+class "SexySpellEntry" style:highest "normal_entry"
+
 # Disable spin button assets for GimpSpinScale
 class "GimpSpinScale" style "gimp_spin_scale"
 
 # Chromium lets us define some colours and settings for better integration
-class "ChromeGtkFrame" style "chrome-gtk-frame"
+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"
 
-# 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
+# Hack to be able to match widgets in LibreOffice
 class "GtkWindow" style "toplevel_hack"
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index 216cdd1e..5892bc05 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc
+++ b/themes/Adwaita/gtk-2.0/gtkrc
@@ -1,4 +1,4 @@
-# Bridge | ScionicSpectre
+# Based on Bridge by ScionicSpectre
 # vim:set ts=2 sw=2 sts=2 ai et:
 
 # Text/base colors
@@ -7,6 +7,8 @@ gtk-color-scheme = "text_color:black\nbase_color:white"
 gtk-color-scheme = "fg_color:#2e3436\nbg_color:#e8e8e7"
 # Selected foreground/background colors
 gtk-color-scheme = "selected_fg_color:#ffffff\nselected_bg_color:#4a90d9"
+# Insensitive foreground/background colors
+gtk-color-scheme = "insensitive_fg_color:#8b8e8f\ninsensitive_bg_color:#f1f1f1"
 # Tooltip colors
 gtk-color-scheme = "tooltip_fg_color:#ffffff\ntooltip_bg_color:#343434"