From 08cd680b78a05e542aecc867b5c7ebea44067e78 Mon Sep 17 00:00:00 2001
From: Juraj Fiala <doctorjellyface@riseup.net>
Date: Sat, 28 Jan 2017 18:45:56 +0100
Subject: gtk2: Respect application frame shadow preference
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until now we forced a shadow on all frames, regardless of the shadow
value. Now we don’t render a shadow if GTK_SHADOW_NONE is passed. This
makes some work-arounds obselete (e.g. Gimp’s Wilbert frame) and fixes
issues where the shadow is toggleable (e.g. XFCE’s system tray).

Also remove rule disabling shadows in all statusbars, it should be now
up to the developer.

https://bugzilla.gnome.org/show_bug.cgi?id=770359
---
 themes/Adwaita-dark/gtk-2.0/main.rc | 21 +++++----------------
 themes/Adwaita/gtk-2.0/main.rc      | 21 +++++----------------
 2 files changed, 10 insertions(+), 32 deletions(-)

(limited to 'themes')

diff --git a/themes/Adwaita-dark/gtk-2.0/main.rc b/themes/Adwaita-dark/gtk-2.0/main.rc
index af967f74..062796d0 100644
--- a/themes/Adwaita-dark/gtk-2.0/main.rc
+++ b/themes/Adwaita-dark/gtk-2.0/main.rc
@@ -2385,6 +2385,11 @@ style "frame" {
 
   engine "pixmap" {
 
+    image {
+      function = SHADOW
+      shadow   = NONE
+    }
+
     image {
       function = SHADOW
       file     = "assets/frame.png"
@@ -2455,17 +2460,6 @@ style "tooltip" {
 
 }
 
-
-style "disable_shadow" {
-
-  engine "pixmap" {
-    image {
-      function = SHADOW
-    }
-  }
-
-}
-
 style "disable_separator" {
 
   xthickness = 0
@@ -2506,11 +2500,6 @@ widget_class "*<GtkMenuItem>*"                                     style "menu_i
 widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                        style "menubar_item"
 widget_class "*<GtkSeparatorMenuItem>*"                            style "separator_menu_item"
 
-# Frames in statusbars look ugly, let's disable them
-widget_class "*<GtkStatusbar>*<GtkFrame>"                          style "disable_shadow"
-# Disable the frame around poor Wilbert too
-widget_class "*<GimpToolbox>*<GtkFrame>"                           style "disable_shadow"
-
 # Treeview buttons
 widget_class "*<GtkTreeView>*<GtkButton>*"                         style "treeview_header"
 
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index af967f74..062796d0 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -2385,6 +2385,11 @@ style "frame" {
 
   engine "pixmap" {
 
+    image {
+      function = SHADOW
+      shadow   = NONE
+    }
+
     image {
       function = SHADOW
       file     = "assets/frame.png"
@@ -2455,17 +2460,6 @@ style "tooltip" {
 
 }
 
-
-style "disable_shadow" {
-
-  engine "pixmap" {
-    image {
-      function = SHADOW
-    }
-  }
-
-}
-
 style "disable_separator" {
 
   xthickness = 0
@@ -2506,11 +2500,6 @@ widget_class "*<GtkMenuItem>*"                                     style "menu_i
 widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                        style "menubar_item"
 widget_class "*<GtkSeparatorMenuItem>*"                            style "separator_menu_item"
 
-# Frames in statusbars look ugly, let's disable them
-widget_class "*<GtkStatusbar>*<GtkFrame>"                          style "disable_shadow"
-# Disable the frame around poor Wilbert too
-widget_class "*<GimpToolbox>*<GtkFrame>"                           style "disable_shadow"
-
 # Treeview buttons
 widget_class "*<GtkTreeView>*<GtkButton>*"                         style "treeview_header"
 
-- 
cgit v1.2.1