Merge lp:~unity-team/ubuntu-themes/x-sru1 into lp:ubuntu-themes/xenial

[Marco Trevisan (Treviño)]

gtk2: Ambiance, Radiance: use dark menus as we do in gtk3

=== added file 'Ambiance/gtk-2.0/apps/caja.rc'
--- Ambiance/gtk-2.0/apps/caja.rc	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-2.0/apps/caja.rc	2017-11-16 21:10:49 +0000
@@ -0,0 +1,11 @@
+# ==============================================================================
+# CAJA SPECIFIC SETTINGS
+# ==============================================================================
+
+style "caja_info_pane" {
+	bg[NORMAL] = @bg_color
+}
+
+widget_class "*Caja*<GtkNotebook>*<GtkEventBox>" style "caja_info_pane"
+widget_class "*Caja*<GtkButton>" style "notebook_button"
+widget_class "*Caja*<GtkButton>*<GtkLabel>" style "notebook_button"

=== added file 'Ambiance/gtk-2.0/apps/mate-panel.rc'
--- Ambiance/gtk-2.0/apps/mate-panel.rc	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-2.0/apps/mate-panel.rc	2017-11-16 21:10:49 +0000
@@ -0,0 +1,29 @@
+# Panel specific settings for correct theming on MATE
+
+style "panel" = "dark"
+{
+	xthickness = 0
+	ythickness = 0
+
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+style "panel_default" = "dark"
+{
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+widget "*Panel"                   style "panel"
+widget "*PanelWidget*"            style "panel"
+widget "*PanelApplet*"            style "panel"		# workaround for right click menu corrupted bg
+widget "*fast-user-switch*"       style "panel" 	# workaround for Fast User Switch applet
+widget "*CPUFreqApplet*"          style "panel" 	# workaround for CpuFreq Applet
+class "PanelApp*"                 style "panel"
+class "PanelToplevel*"            style "panel"
+widget_class "*notif*"            style "panel"
+widget_class "*PanelApplet*"      style "panel_default"	# workaround for right click menu corrupted bg
+widget_class "*Tray*"             style "panel"		# workaround for StarDict, gnubiff... tray icon bg

=== modified file 'Ambiance/gtk-2.0/gtkrc'
--- Ambiance/gtk-2.0/gtkrc	2014-03-04 17:08:48 +0000
+++ Ambiance/gtk-2.0/gtkrc	2017-11-16 21:10:49 +0000
@@ -35,6 +35,9 @@
 	GtkScrollbar::slider-width = 13
 	GtkScrollbar::min-slider-length = 31
 
+        GtkScrolledWindow::scrollbar-spacing   = 0
+        GtkScrolledWindow::scrollbars-within-bevel = 0
+
 	GtkMenuBar::internal-padding = 0
 	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
 	GtkExpander::expander-size = 11
@@ -340,7 +343,7 @@
 	}
 }
 
-style "menu" {
+style "menu" = "dark" {
 	xthickness = 0
 	ythickness = 0
 
@@ -528,6 +531,10 @@
 	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
 }
 
+style "caja_location" {
+        bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
 style "calendar" {
 	xthickness = 0
 	ythickness = 0
@@ -693,6 +700,10 @@
 # ToDo: A more generic approach for all applications that have a widget like this.
 widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
 
+# Special case the caja-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.caja-extra-view-widget" style : highest "caja_location"
+
 # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
 # Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
 widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
@@ -704,7 +715,7 @@
 widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
 # GtkCList also uses the fg color to draw text on top of the base colors.
 widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
+# Nautilus/Caja when renaming files, and maybe other places.
 widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
 # Work around for ubuntu's lucid sound indicator
 widget "ido-offscreen-scale" style "soundfix"
@@ -714,9 +725,26 @@
 # See the documentation of the style.
 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
 
+# Various performance fixes if murrine textstyle is on by default in the theme.
+style "performance-fix" {
+ engine "murrine" {
+   textstyle = 0
+   contrast = 0.5
+ }
+}
+
+widget_class "*gtkmm__GtkWindow*"  style "performance-fix" # Inkscape
+widget_class "*GimpDisplayShell*"  style "performance-fix" # Gimp
+widget_class "*GimpToolbox*"   style "performance-fix"
+widget_class "*GimpMenuDock*"    style "performance-fix"
+widget "*OOoFixed*"          style "performance-fix" # Openoffice/Libreoffice
+widget_class "*MozContainer*"    style "performance-fix" # Firefox (Not sure if this one does anything though.)
+
 # Includes
 #include "apps/banshee.rc"
 include "apps/chromium.rc"
 include "apps/ff.rc"
 include "apps/gnome-terminal.rc"
 include "apps/nautilus.rc"
+include "apps/caja.rc"
+include "apps/mate-panel.rc"

=== added file 'Radiance/gtk-2.0/apps/caja.rc'
--- Radiance/gtk-2.0/apps/caja.rc	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-2.0/apps/caja.rc	2017-11-16 21:10:49 +0000
@@ -0,0 +1,11 @@
+# ==============================================================================
+# CAJA SPECIFIC SETTINGS
+# ==============================================================================
+
+style "caja_info_pane" {
+	bg[NORMAL] = @bg_color
+}
+
+widget_class "*Caja*<GtkNotebook>*<GtkEventBox>" style "caja_info_pane"
+widget_class "*Caja*<GtkButton>" style "notebook_button"
+widget_class "*Caja*<GtkButton>*<GtkLabel>" style "notebook_button"

=== added file 'Radiance/gtk-2.0/apps/mate-panel.rc'
--- Radiance/gtk-2.0/apps/mate-panel.rc	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-2.0/apps/mate-panel.rc	2017-11-16 21:10:49 +0000
@@ -0,0 +1,29 @@
+# Panel specific settings for correct theming on MATE
+
+style "panel" = "dark"
+{
+	xthickness = 0
+	ythickness = 0
+
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+style "panel_default" = "dark"
+{
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+widget "*Panel"                   style "panel"
+widget "*PanelWidget*"            style "panel"
+widget "*PanelApplet*"            style "panel"		# workaround for right click menu corrupted bg
+widget "*fast-user-switch*"       style "panel" 	# workaround for Fast User Switch applet
+widget "*CPUFreqApplet*"          style "panel" 	# workaround for CpuFreq Applet
+class "PanelApp*"                 style "panel"
+class "PanelToplevel*"            style "panel"
+widget_class "*notif*"            style "panel"
+widget_class "*PanelApplet*"      style "panel_default"	# workaround for right click menu corrupted bg
+widget_class "*Tray*"             style "panel"		# workaround for StarDict, gnubiff... tray icon bg

=== modified file 'Radiance/gtk-2.0/gtkrc'
--- Radiance/gtk-2.0/gtkrc	2014-03-04 17:08:48 +0000
+++ Radiance/gtk-2.0/gtkrc	2017-11-16 21:10:49 +0000
@@ -35,6 +35,9 @@
 	GtkScrollbar::slider-width = 13
 	GtkScrollbar::min-slider-length = 31
 
+        GtkScrolledWindow::scrollbar-spacing   = 0
+        GtkScrolledWindow::scrollbars-within-bevel = 0
+
 	GtkMenuBar::internal-padding = 0
 	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
 	GtkExpander::expander-size = 11
@@ -488,6 +491,10 @@
 	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
 }
 
+style "caja_location" {
+        bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
 style "calendar" {
 	xthickness = 0
 	ythickness = 0
@@ -642,6 +649,10 @@
 # ToDo: A more generic approach for all applications that have a widget like this.
 widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
 
+# Special case the caja-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.caja-extra-view-widget" style : highest "caja_location"
+
 # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
 # Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
 widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
@@ -653,7 +664,7 @@
 widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
 # GtkCList also uses the fg color to draw text on top of the base colors.
 widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
+# Nautilus/Caja when renaming files, and maybe other places.
 widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
 # Work around for ubuntu's lucid sound indicator
 widget "ido-offscreen-scale" style "soundfix"
@@ -663,9 +674,26 @@
 # See the documentation of the style.
 widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround"
 
+# Various performance fixes if murrine textstyle is on by default in the theme.
+style "performance-fix" {
+ engine "murrine" {
+   textstyle = 0
+   contrast = 0.5
+ }
+}
+
+widget_class "*gtkmm__GtkWindow*"  style "performance-fix" # Inkscape
+widget_class "*GimpDisplayShell*"  style "performance-fix" # Gimp
+widget_class "*GimpToolbox*"   style "performance-fix"
+widget_class "*GimpMenuDock*"    style "performance-fix"
+widget "*OOoFixed*"          style "performance-fix" # Openoffice/Libreoffice
+widget_class "*MozContainer*"    style "performance-fix" # Firefox (Not sure if this one does anything though.)
+
 # Includes
 #include "apps/banshee.rc"
 include "apps/chromium.rc"
 include "apps/ff.rc"
 include "apps/gnome-terminal.rc"
 include "apps/nautilus.rc"
+include "apps/caja.rc"
+include "apps/mate-panel.rc"

=== modified file 'debian/changelog'
--- debian/changelog	2016-10-24 16:25:22 +0000
+++ debian/changelog	2017-11-16 21:10:49 +0000
@@ -1,3 +1,10 @@
+ubuntu-themes (14.04+16.04.20161024-0ubuntu2) UNRELEASED; urgency=medium
+
+  * gtk2: Ambiance, Radiance: inherit style fixes from MATE themes (LP:
+    #961679)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 16 Nov 2017 16:06:39 -0500
+
 ubuntu-themes (14.04+16.04.20161024-0ubuntu1) xenial; urgency=medium
 
   [ Iain Lane ]