Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/oxygenstyle.cpp b/src/oxygenstyle.cpp
- index e5d40d3..acc83d3 100644
- --- a/src/oxygenstyle.cpp
- +++ b/src/oxygenstyle.cpp
- @@ -505,7 +505,7 @@ namespace Oxygen
- bool Style::renderMenuBackground( GdkWindow* window, Cairo::Context& context, gint x, gint y, gint w, gint h, const StyleOptions& options ) const
- {
- // define colors
- - ColorUtils::Rgba base(settings().palette().color( Palette::Window ) );
- + ColorUtils::Rgba base( color( Palette::Window, options ) );
- ColorUtils::Rgba top( ColorUtils::backgroundTopColor( base ) );
- ColorUtils::Rgba bottom( ColorUtils::backgroundBottomColor( base ) );
- diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp
- index c06d35a..f6bf52c 100644
- --- a/src/oxygenstylewrapper.cpp
- +++ b/src/oxygenstylewrapper.cpp
- @@ -736,6 +736,7 @@ namespace Oxygen
- // Don't draw anything for OpenOffice or steppers will look like slabs.
- if( d.isStepper() && Style::instance().settings().applicationName().isOpenOffice( widget ))
- { return; }
- +
- // Don't render window bg here because it's redundant and leads to problems with bg gradient behind buttons
- if( GTK_IS_WINDOW(widget) && Style::instance().settings().applicationName().isOpenOffice( widget ))
- { return; }
- @@ -1131,8 +1132,13 @@ namespace Oxygen
- !Gtk::gtk_widget_is_applet( widget ) )
- {
- + StyleOptions options;
- +
- + if( style )
- + { options._customColors.insert( Palette::Window, Gtk::gdk_get_color( style->bg[state] ) ); }
- +
- // window background
- - Style::instance().renderWindowBackground( window, clipRect, x, y, w, h );
- + Style::instance().renderWindowBackground( window, clipRect, x, y, w, h, options );
- // possible groupbox background
- if( Gtk::gtk_parent_groupbox( widget ) )
- @@ -1235,6 +1241,9 @@ namespace Oxygen
- options |= Round;
- if( Gtk::gtk_widget_has_rgba( widget ) ) options |= Alpha;
- + if( style )
- + { options._customColors.insert( Palette::Window, Gtk::gdk_get_color( style->bg[state] ) ); }
- +
- // add mask if needed
- if( GTK_IS_MENU(widget) )
- {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement