[numix-gtk-theme] 01/01: Use improved 0001-Fix-Xfce-shadow.patch

[Jeremy Bicha]

This is an automated email from the git hooks/post-receive script.

jbicha-guest pushed a commit to branch master
in repository numix-gtk-theme.

commit 208fe560941f856ccc4b9ce108e09acceabd8a66
Author: Jeremy Bicha <jbicha at ubuntu.com>
Date:   Wed Jul 27 10:47:50 2016 -0400

    Use improved 0001-Fix-Xfce-shadow.patch
---
 debian/patches/0001-Fix-GTK2-shadow.patch | 30 -------------------
 debian/patches/0001-Fix-Xfce-shadow.patch | 49 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  2 +-
 3 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/debian/patches/0001-Fix-GTK2-shadow.patch b/debian/patches/0001-Fix-GTK2-shadow.patch
deleted file mode 100644
index fb56ab7..0000000
--- a/debian/patches/0001-Fix-GTK2-shadow.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 76321bb4f7ee9c6edd1fe4a4dafe3b7abf0fa4d7 Mon Sep 17 00:00:00 2001
-From: Alexey Donoga <adonoga at determine.com>
-Date: Fri, 15 Jul 2016 08:59:15 +0300
-Subject: [PATCH] Fix for issue #492 (#496)
-
-Murrine engine update causes misalignment of icon text and shadow. Fix by @makitso
-
-Bug: https://github.com/numixproject/numix-gtk-theme/issues/492
-Bug-Ubuntu: https://launchpad.net/bugs/1598316
-Origin: https://github.com/numixproject/numix-gtk-theme/commit/76321bb4f
----
- gtk-2.0/gtkrc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
-index 7157c41..9ca4e8d 100755
---- a/gtk-2.0/gtkrc
-+++ b/gtk-2.0/gtkrc
-@@ -528,7 +528,7 @@ style "xfdesktop-icon-view" {
- 	fg[ACTIVE] = @selected_fg_color
- 
- 	engine "murrine" {
--		textstyle = 5
-+		textstyle = 0
- 		text_shade = 0.05
- 	}
- }
--- 
-2.8.1
-
diff --git a/debian/patches/0001-Fix-Xfce-shadow.patch b/debian/patches/0001-Fix-Xfce-shadow.patch
new file mode 100644
index 0000000..a69136a
--- /dev/null
+++ b/debian/patches/0001-Fix-Xfce-shadow.patch
@@ -0,0 +1,49 @@
+From 7c04082da53af7317745340dfe2aed3d9e14930e Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Date: Wed, 27 Jul 2016 10:39:30 -0400
+Subject: [PATCH] Restore and fix Xfce desktop icon shadows. Fix #492
+
+Thanks to Arc and Greybird themes
+
+Bug: https://github.com/numixproject/numix-gtk-theme/issues/492
+Bug-Ubuntu: https://launchpad.net/bugs/1598316
+Forwarded: https://github.com/numixproject/numix-gtk-theme/pull/505
+---
+ gtk-2.0/gtkrc | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
+index 7157c41..8cda1e1 100755
+--- a/gtk-2.0/gtkrc
++++ b/gtk-2.0/gtkrc
+@@ -517,20 +517,20 @@ style "xfdesktop-windowlist" {
+ style "xfdesktop-icon-view" {
+ 	XfdesktopIconView::label-alpha = 0
+ 	XfdesktopIconView::selected-label-alpha = 60
+-	XfdesktopIconVIew::ellipsize-icon-labels = 1
+-
+-	base[NORMAL] = @selected_bg_color
+-	base[SELECTED] = @selected_bg_color
+-	base[ACTIVE] = @selected_bg_color
++	XfdesktopIconView::shadow-x-offset = 0
++	XfdesktopIconView::shadow-y-offset = 1
++	XfdesktopIconView::selected-shadow-x-offset = 0
++	XfdesktopIconView::selected-shadow-y-offset = 1
++	XfdesktopIconView::shadow-color = "#000000"
++	XfdesktopIconView::selected-shadow-color = "#000000"
++	XfdesktopIconView::shadow-blur-radius = 2
++	XfdesktopIconView::cell-spacing = 2
++	XfdesktopIconView::cell-padding = 6
++	XfdesktopIconView::cell-text-width-proportion = 1.9
+ 
+ 	fg[NORMAL] = @selected_fg_color
+-	fg[SELECTED] = @selected_fg_color
+ 	fg[ACTIVE] = @selected_fg_color
+ 
+-	engine "murrine" {
+-		textstyle = 5
+-		text_shade = 0.05
+-	}
+ }
+ 
+ style "xfwm-tabwin" {
diff --git a/debian/patches/series b/debian/patches/series
index 6d42f73..672c8e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0001-Fix-GTK2-shadow.patch
+0001-Fix-Xfce-shadow.patch
 1002-Set-Adwaita-as-default-icon-theme.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/numix-gtk-theme.git