Attachment 4564 Details for Bug 11531 – proposed patch

[patch] proposed patch

emacs.patch (text/plain), 2.08 KB, created by Hugo Pereira Da Costa on 2013-12-02 10:48:17 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Hugo Pereira Da Costa

Created: 2013-12-02 10:48:17 CET

Size: 2.08 KB

patch

obsolete

>diff --git a/src/oxygenshadowhelper.h b/src/oxygenshadowhelper.h
>index 76b5410..d0ecd67 100644
>--- a/src/oxygenshadowhelper.h
>+++ b/src/oxygenshadowhelper.h
>@@ -64,14 +64,14 @@ namespace Oxygen
>         //! unregister widget
>         void unregisterWidget( GtkWidget* );
> 
>-        protected:
>-
>         //! true if widget is menu
>         bool isMenu( GtkWidget* ) const;
> 
>         //! true if widget is menu
>         bool isToolTip( GtkWidget* ) const;
> 
>+        protected:
>+
>         //! true if shadow should be installed on widget
>         bool acceptWidget( GtkWidget* ) const;
> 
>diff --git a/src/oxygenthemingengine.cpp b/src/oxygenthemingengine.cpp
>index c5f4b2c..7891d55 100644
>--- a/src/oxygenthemingengine.cpp
>+++ b/src/oxygenthemingengine.cpp
>@@ -228,10 +228,6 @@ namespace Oxygen
>         if(GTK_IS_DIALOG(toplevel))
>         { Style::instance().animations().dialogEngine().registerWidget(toplevel); }
> 
>-//         // since version 3.8.2, a background is rendered for FRAME, which we do not want.
>-//         if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_FRAME ) )
>-//         { return; }
>-
>         if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_TOOLTIP ) )
>         {
> 
>@@ -239,7 +235,7 @@ namespace Oxygen
>             if( Gtk::gtk_widget_has_rgba( widget ) ) options |= Alpha;
> 
>             GdkWindow* window( gtk_widget_get_window( widget ) );
>-            if( GDK_IS_WINDOW( window ) )
>+            if( GDK_IS_WINDOW( window ) && Style::instance().shadowHelper().isToolTip( widget ) )
>             {
>                 Style::instance().animations().widgetSizeEngine().registerWidget( widget );
>                 static bool wasAlpha(Style::instance().animations().widgetSizeEngine().wasAlpha(widget));
>@@ -1101,6 +1097,8 @@ namespace Oxygen
>                 if( GTK_IS_MENU(widget) )
>                 {
> 
>+                    std::cerr << "Oxygen::render_frame - rendering menu background" << std::endl;
>+
>                     Style::instance().animations().menuItemEngine().registerMenu( widget );
> 
>                     GdkWindow* window( gtk_widget_get_parent_window(widget) );

diff --git a/src/oxygenshadowhelper.h b/src/oxygenshadowhelper.h
index 76b5410..d0ecd67 100644
--- a/src/oxygenshadowhelper.h
+++ b/src/oxygenshadowhelper.h
@@ -64,14 +64,14 @@ namespace Oxygen
         //! unregister widget
         void unregisterWidget( GtkWidget* );
 
-        protected:
-
         //! true if widget is menu
         bool isMenu( GtkWidget* ) const;
 
         //! true if widget is menu
         bool isToolTip( GtkWidget* ) const;
 
+        protected:
+
         //! true if shadow should be installed on widget
         bool acceptWidget( GtkWidget* ) const;
 
diff --git a/src/oxygenthemingengine.cpp b/src/oxygenthemingengine.cpp
index c5f4b2c..7891d55 100644
--- a/src/oxygenthemingengine.cpp
+++ b/src/oxygenthemingengine.cpp
@@ -228,10 +228,6 @@ namespace Oxygen
         if(GTK_IS_DIALOG(toplevel))
         { Style::instance().animations().dialogEngine().registerWidget(toplevel); }
 
-//         // since version 3.8.2, a background is rendered for FRAME, which we do not want.
-//         if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_FRAME ) )
-//         { return; }
-
         if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_TOOLTIP ) )
         {
 
@@ -239,7 +235,7 @@ namespace Oxygen
             if( Gtk::gtk_widget_has_rgba( widget ) ) options |= Alpha;
 
             GdkWindow* window( gtk_widget_get_window( widget ) );
-            if( GDK_IS_WINDOW( window ) )
+            if( GDK_IS_WINDOW( window ) && Style::instance().shadowHelper().isToolTip( widget ) )
             {
                 Style::instance().animations().widgetSizeEngine().registerWidget( widget );
                 static bool wasAlpha(Style::instance().animations().widgetSizeEngine().wasAlpha(widget));
@@ -1101,6 +1097,8 @@ namespace Oxygen
                 if( GTK_IS_MENU(widget) )
                 {
 
+                    std::cerr << "Oxygen::render_frame - rendering menu background" << std::endl;
+
                     Style::instance().animations().menuItemEngine().registerMenu( widget );
 
                     GdkWindow* window( gtk_widget_get_parent_window(widget) );

Actions: View | Diff

Attachments on bug 11531: 4554 | 4555 | 4556 | 4557 | 4558 | 4559 | 4564