BlackMATE GTK3: use builtin icons for csd window controls

16 files changed, 215 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index 72d12956..b54e84c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ desktop-themes/BlackMATE/gtk-2.0/assets/Makefile
 desktop-themes/BlackMATE/gtk-2.0/Styles/Makefile
 desktop-themes/BlackMATE/gtk-3.0/Makefile
 desktop-themes/BlackMATE/gtk-3.0/assets/Makefile
+desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile
 desktop-themes/BlackMATE/metacity-1/Makefile
 desktop-themes/BlackMATE/cinnamon/Makefile
 desktop-themes/BlackMATE/unity/Makefile
diff --git a/desktop-themes/BlackMATE/gtk-3.0/Makefile.am b/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
index 1c4d3636..c3daad42 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
+++ b/desktop-themes/BlackMATE/gtk-3.0/Makefile.am
@@ -11,8 +11,10 @@ theme_DATA = \
 	gtk-widgets-assets-dark.css \
 	mate-applications.css \
 	settings.ini \
-	unity.css
+	unity.css \
+	window-controls.css
 
 EXTRA_DIST = $(theme_DATA)
 
-SUBDIRS = assets
+SUBDIRS = assets \
+	window-controls
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css
index 53d6cda1..8371f183 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css
@@ -162,3 +162,4 @@
 @import url("gtk-widgets-assets-dark.css");
 @import url("unity.css");
 @import url("mate-applications.css");
+@import url("window-controls.css");
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 5702afd7..3ea5ee20 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -40,7 +40,7 @@
 	outline-style: dashed;
 	outline-offset: 2px;
 	outline-width: 0px; /* disable ugly focus-line */
-	-gtk-icon-style: regular; /* no symbolic icons */
+	/*-gtk-icon-style: regular; *//* no symbolic icons */
 	text-shadow: none;
 }
 
@@ -149,6 +149,18 @@
 	border-radius: 2px;
 }
 
+GtkExpander {
+    -gtk-icon-style: regular;
+}
+
+/***********
+ * Sidebar *
+ ***********/
+.sidebar,
+GtkPlacesSidebar.sidebar .view {
+    -gtk-icon-style: regular;
+}
+
 /****************
  * Floating Bar *
  ****************/
@@ -540,6 +552,7 @@ GtkCalendar {
 
 GtkScrolledWindow.frame {
 	background-color: transparent;
+	-gtk-icon-style: regular;
 }
 
 /* no double frames */
@@ -1176,6 +1189,7 @@ GtkComboBox .menu {
  * Buttons *
  ***********/
 .button {
+    -gtk-icon-style: regular;
     -GtkWidget-focus-line-width: 0;
     /* Due to a bug somewhere in gtk or cairo,
        a padding of zero (or even one) doesn't work always!!! */
@@ -2266,7 +2280,7 @@ GtkPopover .separator {
     background-image: none;
     background-color: #747473;
 }
- 
+
 .titlebar .titlebutton,
 .header-bar.frame.titlebar .button.image-button.titlebutton,
 .button.text-button.titlebutton {
@@ -2284,6 +2298,17 @@ GtkPopover .separator {
 	                                  @button_hover_gradient_color_a,
 	                                  @button_hover_gradient_color_b);
 }
+
+.titlebar .titlebutton {
+    /* fake request for hardcoded icons,
+     to avoid usage of regular window-close button*/
+    -gtk-icon-style: requested;
+    border-width: 0px;
+    border-style: none;
+    border-image-source: none;
+    background-image: none;
+    padding: 4px 0px 4px 0px;
+}
  
 .titlebar .titlebutton:hover,
 .header-bar.frame.titlebar .button.image-button.titlebutton:hover,
@@ -2299,7 +2324,12 @@ GtkPopover .separator {
 					color-stop (0.43, @theme_bg_color),
 					to (shade(@button_gradient_color_b, 0.7)));
 }
- 
+
+.titlebar .titlebutton:hover {
+    background-image: none;
+    background-color: transparent;
+}
+
 .titlebar .titlebutton:active,
 .titlebar .titlebutton:active:hover,
 .header-bar.frame.titlebar:active,
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
new file mode 100644
index 00000000..bc97295e
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
@@ -0,0 +1,159 @@
+.titlebar .right .titlebutton:nth-last-child(3),
+.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
+.titlebar .left .titlebutton:nth-child(3),
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3),
+.titlebar .right .titlebutton:nth-last-child(2),
+.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
+.titlebar .left .titlebutton:nth-child(2),
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2),
+.titlebar .right .titlebutton:last-child,
+.titlebar .right:dir(rtl) .titlebutton:first-child,
+.titlebar .left .titlebutton:first-child,
+.titlebar .left:dir(rtl) .titlebutton:last-child {
+	color: transparent;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: 19px 19px;
+}
+
+/* Set correct layout with 
+	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
+ 	buttons on the right or
+	gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
+	for buttons on the left */
+
+/* minimize */
+
+.titlebar .right .titlebutton:nth-last-child(3),
+.titlebar .right:dir(rtl) .titlebutton:nth-child(3),
+.titlebar .left .titlebutton:nth-child(3),
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) {
+	background-image: url('window-controls/neutral.png');
+}
+
+.titlebar .right .titlebutton:nth-last-child(3):hover,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover,
+.titlebar .left .titlebutton:nth-child(3):hover,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover {
+	background-image: url('window-controls/button-min-focus.png');
+}
+
+.titlebar .right .titlebutton:nth-last-child(3):active,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active,
+.titlebar .left .titlebutton:nth-child(3):active,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active,
+.titlebar .right .titlebutton:nth-last-child(3):checked,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(3):checked,
+.titlebar .left .titlebutton:nth-child(3):checked,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):checked {
+	background-image: url('window-controls/neutral.png');
+}
+
+.titlebar .right .titlebutton:nth-last-child(3):backdrop,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop,
+.titlebar .left .titlebutton:nth-child(3):backdrop,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop {
+	background-image: url('window-controls/unfocused.png');
+}
+/*
+.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover,
+.titlebar .left .titlebutton:nth-child(3):backdrop:hover,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover {
+	background-image: url('window-controls/minimize_unfocused_prelight.png');
+}
+*/
+/* maximize */
+.titlebar .right .titlebutton:nth-last-child(2),
+.titlebar .right:dir(rtl) .titlebutton:nth-child(2),
+.titlebar .left .titlebutton:nth-child(2),
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) {
+	background-image: url('window-controls/neutral.png');
+}
+
+.titlebar .right .titlebutton:nth-last-child(2):hover,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover,
+.titlebar .left .titlebutton:nth-child(2):hover,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover {
+	background-image: url('window-controls/button-max-focus.png');
+}
+
+.titlebar .right .titlebutton:nth-last-child(2):active,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active,
+.titlebar .left .titlebutton:nth-child(2):active,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active,
+.titlebar .right .titlebutton:nth-last-child(2):checked,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(2):checked,
+.titlebar .left .titlebutton:nth-child(2):checked,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):checked {
+	background-image: url('window-controls/neutral.png');
+}
+
+.titlebar .right .titlebutton:nth-last-child(2):backdrop,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop,
+.titlebar .left .titlebutton:nth-child(2):backdrop,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop {
+	background-image: url('window-controls/unfocus.png');
+}
+/*
+.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover,
+.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover,
+.titlebar .left .titlebutton:nth-child(2):backdrop:hover,
+.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover {
+	background-image: url('window-controls/maximize_unfocused_prelight.png');
+}
+*/
+/* close */
+.titlebar .right .titlebutton:last-child,
+.titlebar .right:dir(rtl) .titlebutton:first-child,
+.titlebar .left .titlebutton:first-child,
+.titlebar .left:dir(rtl) .titlebutton:last-child {
+	background-image: url('window-controls/neutral.png');
+	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
+}
+
+.titlebar .right .titlebutton:last-child:hover,
+.titlebar .right:dir(rtl) .titlebutton:first-child:hover,
+.titlebar .left .titlebutton:first-child:hover,
+.titlebar .left:dir(rtl) .titlebutton:last-child:hover {
+	background-image: url('window-controls/button-close-focus.png');
+}
+
+.titlebar .right .titlebutton:last-child:active,
+.titlebar .right:dir(rtl) .titlebutton:first-child:active,
+.titlebar .left .titlebutton:first-child:active,
+.titlebar .left:dir(rtl) .titlebutton:last-child:active,
+.titlebar .right .titlebutton:last-child:checked,
+.titlebar .right:dir(rtl) .titlebutton:first-child:checked,
+.titlebar .left .titlebutton:first-child:checked,
+.titlebar .left:dir(rtl) .titlebutton:last-child:checked {
+	background-image: url('window-controls/neutral.png');
+}
+
+.titlebar .right .titlebutton:last-child:backdrop,
+.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop,
+.titlebar .left .titlebutton:first-child:backdrop,
+.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop {
+	background-image: url('window-controls/unfocus.png');
+}
+/*
+.titlebar .right .titlebutton:last-child:backdrop:hover,
+.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover,
+.titlebar .left .titlebutton:first-child:backdrop:hover,
+.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover {
+	background-image: url('window-controls/close_unfocused_prelight.png');
+}
+*/
+/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
+
+.titlebar .button.menu-button.titlebutton {
+	background-image: url('window-controls/neutral.png');
+}
+
+.titlebar .button.menu-button.titlebutton:hover {
+	background-image: url('window-controls/yellow.png');
+}
+
+.titlebar .button.menu-button.titlebutton:active {
+	background-image: url('window-controls/menu-button-pressed.png');
+}
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile.am b/desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile.am
new file mode 100644
index 00000000..80a64070
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/Makefile.am
@@ -0,0 +1,17 @@
+THEME_NAME=BlackMATE
+
+themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0/window-controls
+
+theme_DATA = \
+	button-close-focus.png \
+	button-max-focus1.png \
+	button-max-focus.png \
+	button-min-focus.png \
+	menu-button-pressed.png \
+	neutral.png \
+	unabove-button.png \
+	unabove-button-unfocus.png \
+	unfocus.png \
+	yellow.png
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-close-focus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-close-focus.png
new file mode 100644
index 00000000..fda5ca77
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-close-focus.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus.png
new file mode 100644
index 00000000..1a1dad93
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus1.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus1.png
new file mode 100644
index 00000000..1a1dad93
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-max-focus1.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-min-focus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-min-focus.png
new file mode 100644
index 00000000..0173bb1f
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/button-min-focus.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/menu-button-pressed.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/menu-button-pressed.png
new file mode 100644
index 00000000..5c1f3495
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/menu-button-pressed.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/neutral.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/neutral.png
new file mode 100644
index 00000000..da98bd1e
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/neutral.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button-unfocus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button-unfocus.png
new file mode 100644
index 00000000..0173bb1f
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button-unfocus.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button.png
new file mode 100644
index 00000000..0173bb1f
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unabove-button.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/unfocus.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unfocus.png
new file mode 100644
index 00000000..f2757481
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/unfocus.png
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls/yellow.png b/desktop-themes/BlackMATE/gtk-3.0/window-controls/yellow.png
new file mode 100644
index 00000000..5c1f3495
--- /dev/null
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls/yellow.png