From 1315b5f5e1571b6e27ebf14c6029412af21bd363 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Fri, 10 Jun 2016 13:45:17 +0400
Subject: [PATCH] Basic MATE Gtk3 support (#473)
* * Match Metacity theme color
* [Gtk3] Add MATE support
---
gtk-3.0/assets/pane-handle.png | Bin 0 -> 139 bytes
gtk-3.0/gtk.gresource.xml | 1 +
gtk-3.0/scss/apps/_mate-applications.scss | 81 ++++++++++++++++++++
gtk-3.20/gtk.gresource.xml | 1 +
gtk-3.20/scss/_widgets.scss | 1 +
gtk-3.20/scss/apps/_mate-applications.scss | 85 +++++++++++++++++++++
metacity-1/metacity-theme-2.xml | 2 +-
metacity-1/metacity-theme-3.xml | 2 +-
8 files changed, 171 insertions(+), 2 deletions(-)
create mode 100644 gtk-3.0/assets/pane-handle.png
create mode 100644 gtk-3.0/scss/apps/_mate-applications.scss
create mode 100644 gtk-3.20/scss/apps/_mate-applications.scss
diff --git a/gtk-3.0/assets/pane-handle.png b/gtk-3.0/assets/pane-handle.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fb3b6a799ee57b4fd3acd99982dc3c3a8c1a8f7
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&4!3HD^x83^;q}Y<Y-CY>|gW!U_%O?XxI14-?
zi-9_>gD|6$#_S59AbW|YuPgflHdZkiZf=J6%Yi}?o-U3d5|@(`6eJCd3=AZU1K8NQ
cB_$XbqF*q~E&N{}4phV7>FVdQ&MBb@0FsI!;Q#;t
literal 0
HcmV?d00001
diff --git a/gtk-3.0/gtk.gresource.xml b/gtk-3.0/gtk.gresource.xml
index 7bba375..ea2a8e2 100644
--- a/gtk-3.0/gtk.gresource.xml
+++ b/gtk-3.0/gtk.gresource.xml
@@ -26,6 +26,7 @@
<file preprocess='to-pixdata'>assets/menuitem-radio-checked-hover.png</file>
<file preprocess='to-pixdata'>assets/menuitem-radio-checked-insensitive.png</file>
<file preprocess='to-pixdata'>assets/menuitem-radio-checked.png</file>
+ <file preprocess='to-pixdata'>assets/pane-handle.png</file>
<file preprocess='to-pixdata'>assets/radio-checked-dark.png</file>
<file preprocess='to-pixdata'>assets/radio-checked-insensitive-dark.png</file>
<file preprocess='to-pixdata'>assets/radio-checked-insensitive.png</file>
diff --git a/gtk-3.0/scss/apps/_mate-applications.scss b/gtk-3.0/scss/apps/_mate-applications.scss
new file mode 100644
index 0000000..b070204
--- /dev/null
+++ b/gtk-3.0/scss/apps/_mate-applications.scss
@@ -0,0 +1,81 @@
+@import "panel";
+
+/****************
+ ! MATE styles *
+*****************/
+
+@include exports("mate-applications") {
+ .mate-panel-menu-bar {
+ @extend %panel;
+
+ border: 0;
+ padding: 0;
+ text-shadow: none;
+ }
+
+ MatePanelApplet .label,
+ PanelMenuBar.menubar > .menuitem {
+ color: $panel_fg_color;
+ }
+
+ PanelSeparator, MatePanelAppletFrameDBus {
+ border-width: 0;
+ color: transparent;
+ background-image: -gtk-scaled(url("../assets/pane-handle.png"));
+ background-color: transparent;
+ background-repeat: no-repeat;
+ background-position: left;
+ }
+
+ MatePanelApplet .button,
+ MatePanelApplet .button.flat,
+ MatePanelApplet .button.toggle
+ MatePanelApplet .button.flat.toggle {
+ background-image: none;
+ background-color: transparent;
+ border-color: transparent;
+ border-style: solid;
+ border-radius: 0;
+ border-width: 1px;
+ color: $panel_fg_color;
+ text-shadow: none;
+ box-shadow: none;
+ padding: 2px;
+ }
+
+ MatePanelApplet .button:hover:active,
+ MatePanelApplet .button:checked,
+ MatePanelApplet .button:checked:hover,
+ MatePanelApplet .button.flat:hover:active,
+ MatePanelApplet .button.flat:checked,
+ MatePanelApplet .button.flat:checked:hover,
+ MatePanelApplet .button.toggle:hover:active,
+ MatePanelApplet .button.toggle:checked,
+ MatePanelApplet .button.toggle:checked:hover,
+ MatePanelApplet .button.flat.toggle:hover:active,
+ MatePanelApplet .button.flat.toggle:checked,
+ MatePanelApplet .button.flat.toggle:checked:hover {
+ background-image: none;
+ background-color: darker($panel_bg_color);
+ border-color: transparent;
+ border-radius: 0;
+ border-width: 1px;
+ color: lighter($panel_fg_color);
+ text-shadow: none;
+ padding: 2px;
+ }
+
+ MatePanelApplet .button:hover,
+ MatePanelApplet .button.flat:hover,
+ MatePanelApplet .button.toggle:hover,
+ MatePanelApplet .button.flat.toggle:hover {
+ background-image: none;
+ background-color: shade($panel_bg_color, 1.3);
+ border-color: transparent;
+ border-radius: 0;
+ border-width: 1px;
+ color: $selected_fg_color;
+ text-shadow: none;
+ padding: 2px;
+ }
+}
diff --git a/gtk-3.20/gtk.gresource.xml b/gtk-3.20/gtk.gresource.xml
index bd53b53..ed98bcc 100644
--- a/gtk-3.20/gtk.gresource.xml
+++ b/gtk-3.20/gtk.gresource.xml
@@ -26,6 +26,7 @@
<file preprocess='to-pixdata'>assets/menuitem-radio-checked-hover.png</file>
<file preprocess='to-pixdata'>assets/menuitem-radio-checked-insensitive.png</file>
<file preprocess='to-pixdata'>assets/menuitem-radio-checked.png</file>
+ <file preprocess='to-pixdata'>assets/pane-handle.png</file>
<file preprocess='to-pixdata'>assets/radio-checked-dark.png</file>
<file preprocess='to-pixdata'>assets/radio-checked-insensitive-dark.png</file>
<file preprocess='to-pixdata'>assets/radio-checked-insensitive.png</file>
diff --git a/gtk-3.20/scss/_widgets.scss b/gtk-3.20/scss/_widgets.scss
index e43327d..0a4b5a8 100755
--- a/gtk-3.20/scss/_widgets.scss
+++ b/gtk-3.20/scss/_widgets.scss
@@ -25,6 +25,7 @@
@import "widgets/view";
@import "widgets/window";
+@import "apps/mate-applications";
@import "apps/cinnamon-applications";
@import "apps/unity-greeter";
@import "apps/gedit";
diff --git a/gtk-3.20/scss/apps/_mate-applications.scss b/gtk-3.20/scss/apps/_mate-applications.scss
new file mode 100644
index 0000000..3970858
--- /dev/null
+++ b/gtk-3.20/scss/apps/_mate-applications.scss
@@ -0,0 +1,85 @@
+@import "panel";
+
+/****************
+ ! MATE styles *
+*****************/
+
+@include exports("mate-applications") {
+ .mate-panel-menu-bar {
+ @extend %panel;
+
+ border: 0;
+ padding: 0;
+ text-shadow: none;
+ }
+
+ #PanelApplet label,
+ .mate-panel-menu-bar menubar > menuitem {
+ color: $panel_fg_color;
+ }
+
+ PanelSeparator, MatePanelAppletFrameDBus {
+ border-width: 0;
+ color: transparent;
+ background-image: -gtk-scaled(url("../assets/pane-handle.png"));
+ background-color: transparent;
+ background-repeat: no-repeat;
+ background-position: left;
+ }
+
+ #PanelApplet button,
+ #PanelApplet button.flat,
+ #PanelApplet button.toggle
+ #PanelApplet button.flat.toggle {
+ background-image: none;
+ background-color: transparent;
+ border-color: transparent;
+ border-style: solid;
+ border-radius: 0;
+ border-width: 1px;
+ color: $panel_fg_color;
+ text-shadow: none;
+ box-shadow: none;
+ padding: 2px;
+ }
+
+ #PanelApplet button:hover:active,
+ #PanelApplet button:checked,
+ #PanelApplet button:checked:hover,
+ #PanelApplet button.flat:hover:active,
+ #PanelApplet button.flat:checked,
+ #PanelApplet button.flat:checked:hover,
+ #PanelApplet button.toggle:hover:active,
+ #PanelApplet button.toggle:checked,
+ #PanelApplet button.toggle:checked:hover,
+ #PanelApplet button.flat.toggle:hover:active,
+ #PanelApplet button.flat.toggle:checked,
+ #PanelApplet button.flat.toggle:checked:hover {
+ background-image: none;
+ background-color: darker($panel_bg_color);
+ border-color: transparent;
+ border-radius: 0;
+ border-width: 1px;
+ color: lighter($panel_fg_color);
+ text-shadow: none;
+ padding: 2px;
+ }
+
+ #PanelApplet button:hover,
+ #PanelApplet button.flat:hover,
+ #PanelApplet button.toggle:hover,
+ #PanelApplet button.flat.toggle:hover {
+ background-image: none;
+ background-color: shade($panel_bg_color, 1.3);
+ border-color: transparent;
+ border-radius: 0;
+ border-width: 1px;
+ color: $selected_fg_color;
+ text-shadow: none;
+ padding: 2px;
+ }
+
+ .mate-panel-menu-bar menubar > menuitem {
+ padding: 3px 7px;
+ }
+}
diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml
index 93b3861..b3410ba 100755
--- a/metacity-1/metacity-theme-2.xml
+++ b/metacity-1/metacity-theme-2.xml
@@ -9,7 +9,7 @@
</info>
<!-- ::: CONSTANTS ::: -->
-<constant name="C_titlebar" value="#333333" />
+<constant name="C_titlebar" value="#444444" />
<constant name="C_border_focused" value="#484848" />
<constant name="C_border_unfocused" value="#393939" />
<constant name="C_title_focused" value="#eeeeee" />
diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml
index a5fbae8..c8a6952 100755
--- a/metacity-1/metacity-theme-3.xml
+++ b/metacity-1/metacity-theme-3.xml
@@ -9,7 +9,7 @@
</info>
<!-- ::: CONSTANTS ::: -->
-<constant name="C_titlebar" value="gtk:custom(wm_bg,#333333)" />
+<constant name="C_titlebar" value="gtk:custom(wm_bg,#444444)" />
<constant name="C_border_focused" value="gtk:custom(wm_border_focused,#484848)" />
<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,#393939)" />
<constant name="C_title_focused" value="gtk:custom(wm_title_focused,#eeeeee)" />