gtk2: integrate improvements from atw1990@gmail.com

Improvements all around, especially in entries and spinbuttons.

https://bugzilla.gnome.org/show_bug.cgi?id=735825

themes/Adwaita/gtk-2.0/Makefile.am

@@ -82,6 +82,11 @@ asset_data = \
 	Entry/entry-border-notebook.png \
 	Entry/entry-border-active-notebook.png \
 	Entry/entry-border-disabled-notebook.png \
+	Entry/entry-border-bg-solid-spin.png \
+	Entry/entry-border-active-bg-solid-spin.png \
+	Entry/notebook-entry-border-active-bg.png \
+	Entry/notebook-entry-border-bg.png \
+	Entry/notebook-entry-border-disabled-bg.png \
 	Expanders/minus.png \
 	Expanders/plus.png \
 	Handles/handle-h.png \

themes/Adwaita/gtk-2.0/gtkrc

 # Bridge | ScionicSpectre
 
-gtk-color-scheme	= "base_color:#FFFFFF\nfg_color:#000000\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434"
+gtk-color-scheme	= "base_color:#FFFFFF\nfg_color:#2E3436\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434"
 
 gtk-auto-mnemonics              = 1
 gtk-primary-button-warps-slider = 1
@@ -47,7 +47,7 @@ style "default"
 	GtkVScale::slider_length 	= 16
 	GtkVScale::slider_width 	= 16
 	GtkHScale::slider_length 	= 16
-	GtkHScale::slider_width 	= 17
+	GtkHScale::slider_width 	= 16
 
 	GtkStatusbar::shadow_type	= GTK_SHADOW_NONE
 	GtkSpinButton::shadow_type 	= GTK_SHADOW_NONE
@@ -523,7 +523,9 @@ style "default"
             expander_style	        = SEMI_COLLAPSED
             file                        = "Expanders/plus.png"
 	}
-
+	
+	# Others
+	
 	image
 	{
 	    function                    = RESIZE_GRIP
@@ -584,7 +586,7 @@ style "scrollbar"
       orientation		= VERTICAL
     }
 
-# Sliders
+    # Sliders
 
     image 
     {
@@ -727,7 +729,7 @@ style "menu_framed_box"
 style "menu_item"
 {
 	xthickness	= 2
-	ythickness	= 4
+	ythickness	= 3
 
         # HACK: Gtk doesn't actually read this value
         # while rendering the menu items, but Libreoffice
@@ -928,7 +930,7 @@ style "menubar_item"
 
 style "button"
 {
-  xthickness	= 4
+  xthickness	= 3
   ythickness	= 3
 
   engine "pixmap"
@@ -970,8 +972,8 @@ style "button"
 
 style "button_nohilight"
 {
-  xthickness	= 4
-  ythickness	= 3
+  xthickness	= 3
+  ythickness	= 4
 
   engine "pixmap"
   {
@@ -1054,30 +1056,36 @@ style "entry"
 		file			= "Entry/entry-border-active-bg.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
-        }
-        image
-        {
-                function                = FLAT_BOX
-                detail                  = "entry_bg"
-                state                   = NORMAL
-                overlay_file		= "Entry/entry-border-fill.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.png"
-	        overlay_border		= { 0, 0, 0, 0 }
-                overlay_stretch         = TRUE
-        }
+	}
+	image
+	{
+	        function                = FLAT_BOX
+	        detail                  = "entry_bg"
+	        state                   = NORMAL
+		file			= "Others/null.png"
+		border			= { 0, 0, 0, 0 }
+		stretch			= TRUE
+	}
+	image
+	{
+	        function                = FLAT_BOX
+	        detail                  = "entry_bg"
+	        state                   = ACTIVE
+		file			= "Others/null.png"
+		border			= { 0, 0, 0, 0 }
+		stretch			= TRUE
+	}
     }
 }
 
 style "notebook_entry"
 {
+	xthickness	= 3
+	ythickness   	= 4
+
+        base[NORMAL] 		= @base_color
+        base[INSENSITIVE] 	= @insensitive_bg_color
+
 	engine "pixmap"
 	{
 	image
@@ -1086,7 +1094,7 @@ style "notebook_entry"
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/entry-border-notebook.png"
+		file			= "Entry/notebook-entry-border-bg.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1096,7 +1104,7 @@ style "notebook_entry"
 		detail			= "entry"
                 state                   = INSENSITIVE
 		shadow			= IN
-		file			= "Entry/entry-border-disabled-notebook.png"
+		file			= "Entry/notebook-entry-border-disabled-bg.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1104,12 +1112,30 @@ style "notebook_entry"
         {
 		function		= SHADOW
 		detail			= "entry"
-                state                   = ACTIVE
-		file			= "Entry/entry-border-active-notebook.png"
+	        state                   = ACTIVE
+		file			= "Entry/notebook-entry-border-active-bg.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
-        }
-        }
+	}
+	image
+	{
+	        function                = FLAT_BOX
+	        detail                  = "entry_bg"
+	        state                   = NORMAL
+		file			= "Others/null.png"
+		border			= { 0, 0, 0, 0 }
+		stretch			= TRUE
+	}
+	image
+	{
+	        function                = FLAT_BOX
+	        detail                  = "entry_bg"
+	        state                   = ACTIVE
+		file			= "Others/null.png"
+		border			= { 0, 0, 0, 0 }
+		stretch			= TRUE
+	}
+	}
 }
 
 style "notebook_tab_label"
@@ -1119,7 +1145,7 @@ style "notebook_tab_label"
 
 style "combobox_entry"
 {
-	xthickness	= 3
+	xthickness	= 2
 	ythickness   	= 4
 
 	engine "pixmap"
@@ -1132,7 +1158,7 @@ style "combobox_entry"
                 state                   = NORMAL
 		shadow			= IN
 		file			= "Entry/combo-entry-border-bg.png"
-		border			= { 4, 4, 5, 4 }
+		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
                 direction               = LTR
 	}
@@ -1194,39 +1220,45 @@ style "combobox_entry"
     }
 }
 
-style "notebook_combobox_entry"
+style "combobox_entry_button"
 {
+        fg[ACTIVE] = @text_color
+
 	engine "pixmap"
 	{
         # LTR version
 	image
 	{
-		function		= SHADOW
-		detail			= "entry"
+		function		= BOX
                 state                   = NORMAL
-		shadow			= IN
-		file			= "Entry/combo-entry-border-notebook.png"
+		file			= "Entry/combo-entry-button.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = LTR
 	}
 	image
 	{
-		function		= SHADOW
-		detail			= "entry"
+		function		= BOX
+                state                   = PRELIGHT
+		file			= "Entry/combo-entry-button.png"
+		border			= { 4, 4, 5, 4 }
+		stretch			= TRUE
+                direction               = LTR
+	}
+	image
+	{
+		function		= BOX
                 state                   = INSENSITIVE
-		shadow			= IN
-		file			= "Entry/combo-entry-border-disabled-notebook.png"
+		file			= "Entry/combo-entry-button-disabled.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = LTR
 	}
         image
         {
-		function		= SHADOW
-		detail			= "entry"
+		function		= BOX
                 state                   = ACTIVE
-		file			= "Entry/combo-entry-border-active-notebook.png"
+		file			= "Entry/combo-entry-button-active.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = LTR
@@ -1235,32 +1267,36 @@ style "notebook_combobox_entry"
         # RTL version
 	image
 	{
-		function		= SHADOW
-		detail			= "entry"
+		function		= BOX
                 state                   = NORMAL
-		shadow			= IN
-		file			= "Entry/combo-entry-border-rtl-notebook.png"
+		file			= "Entry/combo-entry-button-rtl.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = RTL
 	}
 	image
 	{
-		function		= SHADOW
-		detail			= "entry"
+		function		= BOX
+                state                   = PRELIGHT
+		file			= "Entry/combo-entry-button-rtl.png"
+		border			= { 4, 4, 5, 4 }
+		stretch			= TRUE
+                direction               = RTL
+	}
+	image
+	{
+		function		= BOX
                 state                   = INSENSITIVE
-		shadow			= IN
-		file			= "Entry/combo-entry-border-disabled-rtl-notebook.png"
+		file			= "Entry/combo-entry-button-disabled-rtl.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = RTL
 	}
         image
         {
-		function		= SHADOW
-		detail			= "entry"
+		function		= BOX
                 state                   = ACTIVE
-		file			= "Entry/combo-entry-border-active-rtl-notebook.png"
+		file			= "Entry/combo-entry-button-active-rtl.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = RTL
@@ -1268,205 +1304,119 @@ style "notebook_combobox_entry"
     }
 }
 
-style "combobox_entry_button"
+style "spinbutton"
 {
-        fg[ACTIVE] = @text_color
+	bg[NORMAL] = @bg_color
+
+	xthickness	= 4
+	ythickness	= 4
 
 	engine "pixmap"
 	{
+	image
+	{
+		function		= ARROW
+	}
 
-        # LTR version
+	# Spin-Up LTR
 	image
 	{
 		function		= BOX
-                state                   = NORMAL
-		file			= "Entry/combo-entry-button.png"
-		border			= { 4, 4, 5, 4 }
+		state 			= NORMAL
+		detail			= "spinbutton_up"
+		file			= "Spin/up-background.png"
+		border			= { 1, 4, 5, 0 }
 		stretch			= TRUE
-                direction               = LTR
+		overlay_file		= "Arrows/arrow-up-small.png"
+		overlay_stretch		= FALSE
+		direction               = LTR
 	}
 	image
 	{
 		function		= BOX
-                state                   = PRELIGHT
-		file			= "Entry/combo-entry-button.png"
-		border			= { 4, 4, 5, 4 }
+		state 			= PRELIGHT
+		detail			= "spinbutton_up"
+		file			= "Spin/up-background.png"
+		border			= { 1, 4, 5, 0 }
 		stretch			= TRUE
-                direction               = LTR
+		overlay_file		= "Arrows/arrow-up-small-prelight.png"
+		overlay_stretch		= FALSE
+		direction                = LTR
 	}
 	image
 	{
 		function		= BOX
-                state                   = INSENSITIVE
-		file			= "Entry/combo-entry-button-disabled.png"
-		border			= { 4, 4, 5, 4 }
+		state 			= INSENSITIVE
+		detail			= "spinbutton_up"
+		file			= "Spin/up-background-disable.png"
+		border			= { 1, 4, 5, 0 }
 		stretch			= TRUE
-                direction               = LTR
+		overlay_file		= "Arrows/arrow-up-small-insens.png"
+		overlay_stretch		= FALSE
+		direction               = LTR
 	}
-        image
-        {
+	image
+	{
 		function		= BOX
-                state                   = ACTIVE
-		file			= "Entry/combo-entry-button-active.png"
-		border			= { 4, 4, 5, 4 }
+		state 			= ACTIVE
+		detail			= "spinbutton_up"
+		file			= "Spin/up-background.png"
+		border			= { 1, 4, 5, 0 }
 		stretch			= TRUE
-                direction               = LTR
-        }
+		overlay_file		= "Arrows/arrow-up-small-prelight.png"
+		overlay_stretch		= FALSE
+		direction               = LTR
+	}
 
-        # RTL version
+	# Spin-Up RTL
 	image
 	{
 		function		= BOX
-                state                   = NORMAL
-		file			= "Entry/combo-entry-button-rtl.png"
-		border			= { 4, 4, 5, 4 }
+		state 			= NORMAL
+		detail			= "spinbutton_up"
+		file			= "Spin/up-background-rtl.png"
+		border			= { 4, 1, 5, 0 }
 		stretch			= TRUE
-                direction               = RTL
+		overlay_file		= "Arrows/arrow-up-small.png"
+		overlay_stretch		= FALSE
+		direction               = RTL
 	}
 	image
 	{
 		function		= BOX
-                state                   = PRELIGHT
-		file			= "Entry/combo-entry-button-rtl.png"
-		border			= { 4, 4, 5, 4 }
+		state 			= PRELIGHT
+		detail			= "spinbutton_up"
+		file			= "Spin/up-background-rtl.png"
+		border			= { 4, 1, 5, 0 }
 		stretch			= TRUE
-                direction               = RTL
+		overlay_file		= "Arrows/arrow-up-small-prelight.png"
+		overlay_stretch		= FALSE
+		direction               = RTL
 	}
 	image
 	{
 		function		= BOX
-                state                   = INSENSITIVE
-		file			= "Entry/combo-entry-button-disabled-rtl.png"
-		border			= { 4, 4, 5, 4 }
+		state 			= INSENSITIVE
+		detail			= "spinbutton_up"
+		file			= "Spin/up-background-disable-rtl.png"
+		border			= { 4, 1, 5, 0 }
 		stretch			= TRUE
-                direction               = RTL
+		overlay_file		= "Arrows/arrow-up-small-insens.png"
+		overlay_stretch		= FALSE