[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [oxygen-gtk/gtk3] src: make sure child is registered to innershadow engine, when ScrolledWindow has
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2013-12-10 15:20:55
Message-ID: E1VqP7H-0006Da-EK () scm ! kde ! org
[Download RAW message or body]

Git commit ec2946f092ab0c2a1eae4d134bd5f77914f7da4c by Hugo Pereira Da Costa.
Committed on 10/12/2013 at 10:57.
Pushed by hpereiradacosta into branch 'gtk3'.

make sure child is registered to innershadow engine, when ScrolledWindow has the \
right properties

M  +6    -6    src/oxygenthemingengine.cpp

http://commits.kde.org/oxygen-gtk/ec2946f092ab0c2a1eae4d134bd5f77914f7da4c

diff --git a/src/oxygenthemingengine.cpp b/src/oxygenthemingengine.cpp
index d2287ba..bfbe8c3 100644
--- a/src/oxygenthemingengine.cpp
+++ b/src/oxygenthemingengine.cpp
@@ -715,25 +715,25 @@ namespace Oxygen
         // adjust shadow type for some known widgets
         if( gtk_widget_path_is_type( path, GTK_TYPE_SCROLLED_WINDOW ) && \
GTK_IS_SCROLLED_WINDOW( widget ) )  {
+
             if( borderStyle !=  GTK_BORDER_STYLE_INSET && \
Gtk::gtk_scrolled_window_force_sunken( widget ) )  {
 
                 // make sure that scrolled windows containing a treeView have sunken \
frame  borderStyle = GTK_BORDER_STYLE_INSET;
                 gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( widget ), \
                GTK_SHADOW_IN );
-                Style::instance().animations().innerShadowEngine().registerChild( \
widget, gtk_bin_get_child( GTK_BIN( widget ) ) );  
             } else if( borderStyle ==  GTK_BORDER_STYLE_INSET && \
gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) != GTK_SHADOW_IN \
) {  
-                /*
-                change scrolled window shadow type based on borderStyle,
-                and make sure it's child is registered to inner shadow engine
-                */
+                // change scrolled window shadow type based on borderStyle,
                 gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( widget ), \
                GTK_SHADOW_IN );
-                Style::instance().animations().innerShadowEngine().registerChild( \
widget, gtk_bin_get_child( GTK_BIN( widget ) ) );  
             }
 
+            // make sure child is registered
+            if( borderStyle ==  GTK_BORDER_STYLE_INSET && \
gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN \
) +            { Style::instance().animations().innerShadowEngine().registerChild( \
widget, gtk_bin_get_child( GTK_BIN( widget ) ) ); } +
         } else if(
             gtk_widget_path_is_type( path, GTK_TYPE_FRAME ) &&
             borderStyle == GTK_BORDER_STYLE_SOLID &&


[prev in list] [next in list] [prev in thread] [next in thread]