Hello community, here is the log from the commit of package oxygen-gtk3 for openSUSE:Factory checked in at 2013-01-31 10:27:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk3 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk3", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk3/oxygen-gtk3.changes 2012-10-06 18:40:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk3.new/oxygen-gtk3.changes 2013-01-31 10:27:53.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 30 16:23:56 UTC 2013 - [email protected] + +- Update to version 1.1.2 + * Bugfix release + * Fixes for running oxygen-gtk with gnome shell + +------------------------------------------------------------------- Old: ---- oxygen-gtk3-1.1.1.tar.bz2 New: ---- oxygen-gtk3-1.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk3.spec ++++++ --- /var/tmp/diff_new_pack.wGYSfz/_old 2013-01-31 10:27:54.000000000 +0100 +++ /var/tmp/diff_new_pack.wGYSfz/_new 2013-01-31 10:27:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package oxygen-gtk3 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: oxygen-gtk3 -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 3.x License: LGPL-2.1+ ++++++ oxygen-gtk3-1.1.1.tar.bz2 -> oxygen-gtk3-1.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.1/CMakeLists.txt new/oxygen-gtk3-1.1.2/CMakeLists.txt --- old/oxygen-gtk3-1.1.1/CMakeLists.txt 2012-10-04 10:12:10.000000000 +0200 +++ new/oxygen-gtk3-1.1.2/CMakeLists.txt 2013-01-29 13:55:41.000000000 +0100 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "[email protected]" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "1" ) -set( CPACK_PACKAGE_VERSION_PATCH "1" ) +set( CPACK_PACKAGE_VERSION_PATCH "2" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.1/rc/gtk.css new/oxygen-gtk3-1.1.2/rc/gtk.css --- old/oxygen-gtk3-1.1.1/rc/gtk.css 2012-10-04 10:12:10.000000000 +0200 +++ new/oxygen-gtk3-1.1.2/rc/gtk.css 2013-01-29 13:55:21.000000000 +0100 @@ -58,9 +58,6 @@ -GtkCalendar-horizontal-separation: 0px; -GtkComboBox-appears-as-list: 1px; - - -GtkMenu-horizontal-padding: 3px; - -GtkMenu-vertical-padding: 5px; -GtkMenu-horizontal-offset: -7px; -GtkMenuBar-internal-padding: 0px; @@ -111,8 +108,6 @@ } GtkMenuBar>GtkMenuItem { padding: 2px 5px; } -GtkMenu>GtkMenuItem { padding: 5px 1px; } -GtkMenu>GtkSeparatorMenuItem { padding: 1px 1px; } /* menu toolbutton */ GtkMenuToolButton, GtkMenuToolButton * { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.1/src/animations/oxygeninnershadowdata.cpp new/oxygen-gtk3-1.1.2/src/animations/oxygeninnershadowdata.cpp --- old/oxygen-gtk3-1.1.1/src/animations/oxygeninnershadowdata.cpp 2012-10-04 10:12:10.000000000 +0200 +++ new/oxygen-gtk3-1.1.2/src/animations/oxygeninnershadowdata.cpp 2013-01-29 13:55:21.000000000 +0100 @@ -179,7 +179,7 @@ } //_________________________________________________________________________________________ - gboolean InnerShadowData::targetExposeEvent( GtkWidget* widget, GdkEventExpose* event, gpointer ) + gboolean InnerShadowData::targetExposeEvent( GtkWidget* widget, cairo_t *context, gpointer ) { #if ENABLE_INNER_SHADOWS_HACK @@ -206,17 +206,14 @@ // make sure the child window doesn't contain garbage gdk_window_process_updates( childWindow, TRUE ); - // get window geometry - GtkAllocation allocation( Gtk::gdk_rectangle() ); - gdk_window_get_geometry( childWindow, &allocation.x, &allocation.y, &allocation.width, &allocation.height ); - - // properly map to parent window - Gtk::gdk_window_translate_origin( window, childWindow, &allocation.x, &allocation.y ); - - // create context with clipping - Cairo::Context context(gtk_widget_get_window(widget), &allocation ); + GtkAllocation allocation; + gtk_widget_translate_coordinates (child, widget, 0, 0, &allocation.x, &allocation.y); + allocation.width = gdk_window_get_width (childWindow); + allocation.height = gdk_window_get_height (childWindow); // draw child + gdk_cairo_rectangle( context, &allocation ); + cairo_clip(context); gdk_cairo_set_source_window( context, childWindow, allocation.x, allocation.y ); cairo_paint(context); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.1/src/animations/oxygeninnershadowdata.h new/oxygen-gtk3-1.1.2/src/animations/oxygeninnershadowdata.h --- old/oxygen-gtk3-1.1.1/src/animations/oxygeninnershadowdata.h 2012-10-04 10:12:10.000000000 +0200 +++ new/oxygen-gtk3-1.1.2/src/animations/oxygeninnershadowdata.h 2013-01-29 13:55:21.000000000 +0100 @@ -63,7 +63,7 @@ //!@ callbacks //@{ static gboolean childUnrealizeNotifyEvent( GtkWidget*, gpointer ); - static gboolean targetExposeEvent( GtkWidget*, GdkEventExpose*, gpointer ); + static gboolean targetExposeEvent( GtkWidget*, cairo_t*, gpointer ); //@} private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.1/src/oxygenqtsettings.cpp new/oxygen-gtk3-1.1.2/src/oxygenqtsettings.cpp --- old/oxygen-gtk3-1.1.1/src/oxygenqtsettings.cpp 2012-10-04 10:12:10.000000000 +0200 +++ new/oxygen-gtk3-1.1.2/src/oxygenqtsettings.cpp 2013-01-29 13:55:21.000000000 +0100 @@ -180,7 +180,7 @@ generateGtkColors(); } - // apply extra programatically set metrics metrics + // apply extra programatically set metrics loadExtraOptions(); // print generated Gtkrc and commit @@ -1136,6 +1136,36 @@ #endif + #if GTK_CHECK_VERSION( 3, 7, 0 ) + + // menu + // since gtk 3.7.0, GtkMenu-horizontal-padding and vertical-padding (from gtk.css) are ignored + // need to use css padding and border-width instead + _css.addSection( "GtkMenu" ); + _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_PADDING, "5px 3px" ) ); + _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_BORDER_WIDTH, "0px" ) ); + + _css.addSection( "GtkMenu>GtkMenuItem" ); + _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_PADDING, "5px 4px" ) ); + + _css.addSection( "GtkMenu>GtkSeparatorMenuItem" ); + _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_PADDING, "1px 4px" ) ); + + #else + + // menu padding + _css.setCurrentSection( Gtk::CSS::defaultSection() ); + _css.addToCurrentSection( " -GtkMenu-horizontal-padding: 3px;" ); + _css.addToCurrentSection( " -GtkMenu-vertical-padding: 5px;" ); + + _css.addSection( "GtkMenu>GtkMenuItem" ); + _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_PADDING, "5px 1px" ) ); + + _css.addSection( "GtkMenu>GtkSeparatorMenuItem" ); + _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_PADDING, "1px 1px" ) ); + + #endif + } //_________________________________________________________ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.1.1/src/oxygenthemingengine.cpp new/oxygen-gtk3-1.1.2/src/oxygenthemingengine.cpp --- old/oxygen-gtk3-1.1.1/src/oxygenthemingengine.cpp 2012-10-04 10:12:10.000000000 +0200 +++ new/oxygen-gtk3-1.1.2/src/oxygenthemingengine.cpp 2013-01-29 13:55:21.000000000 +0100 @@ -211,6 +211,19 @@ const GtkWidgetPath* path( gtk_theming_engine_get_path( engine ) ); GtkWidget* widget( Style::instance().widgetLookup().find( context, path ) ); + // if widget is invalid, use parent class + if( !( widget && GTK_IS_WIDGET( widget ) ) ) + { + + #if OXYGEN_DEBUG + std::cerr << "Oxygen::render_background - Calling parentClass()->render_background()\n"; + #endif + + ThemingEngine::parentClass()->render_background( engine, context, x, y, w, h ); + return; + + } + GtkWidget* toplevel=gtk_widget_get_toplevel(widget); if(GTK_IS_DIALOG(toplevel)) { Style::instance().animations().dialogEngine().registerWidget(toplevel); } @@ -260,7 +273,7 @@ { // if valid background image is found, fallback to parent style #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_background()\n"; + std::cerr << "Oxygen::render_background - Calling parentClass()->render_background()\n"; #endif ThemingEngine::parentClass()->render_background( engine, context, x, y, w, h ); return; @@ -521,7 +534,7 @@ } else { #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_background()\n"; + std::cerr << "Oxygen::render_background - Calling parentClass()->render_background()\n"; #endif ThemingEngine::parentClass()->render_background( engine, context, x, y, w, h ); @@ -1116,6 +1129,14 @@ } else if( gtk_widget_path_is_type( path, GTK_TYPE_MENU_ITEM ) ) { + #if GTK_CHECK_VERSION( 3, 7, 0 ) + // for gtk 3.7 and above, menu item rect is called even in not PRELIGHT mode + // we need to draw nothing for it + // bug: 312988 + GtkStateFlags state( gtk_theming_engine_get_state( engine ) ); + if( !( state & GTK_STATE_FLAG_PRELIGHT ) ) return; + #endif + if( GTK_IS_MENU_ITEM( widget ) ) { GtkWidget* child( gtk_bin_get_child( GTK_BIN( widget ) ) ); @@ -1553,7 +1574,7 @@ } else { #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_frame_gap()\n"; + std::cerr << "Oxygen::render_frame_gap - Calling parentClass()->render_frame_gap()\n"; #endif ThemingEngine::parentClass()->render_frame_gap( engine, context, x, y, w, h, position, xy0_gap, xy1_gap ); @@ -1769,7 +1790,7 @@ } else { #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_check()\n"; + std::cerr << "Oxygen::render_check - Calling parentClass()->render_check()\n"; #endif ThemingEngine::parentClass()->render_check( engine, context, x, y, w, h ); @@ -1856,7 +1877,7 @@ // parent #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_option()\n"; + std::cerr << "Oxygen::render_option - Calling parentClass()->render_option()\n"; #endif ThemingEngine::parentClass()->render_option( engine, context, x, y, w, h ); @@ -2191,7 +2212,7 @@ } else { #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_layout()\n"; + std::cerr << "Oxygen::render_layout - Calling parentClass()->render_layout()\n"; #endif ThemingEngine::parentClass()->render_layout( engine, context, x, y, layout ); @@ -2324,7 +2345,7 @@ } else { #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_slider()\n"; + std::cerr << "Oxygen::render_slider - Calling parentClass()->render_slider()\n"; #endif ThemingEngine::parentClass()->render_slider( engine, context, x, y, w, h, orientation ); @@ -2385,7 +2406,7 @@ } else { #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_handle()\n"; + std::cerr << "Oxygen::render_handle - Calling parentClass()->render_handle()\n"; #endif ThemingEngine::parentClass()->render_handle( engine, context, x, y, w, h ); @@ -2440,7 +2461,7 @@ } else { #if OXYGEN_DEBUG - std::cerr << "Calling parentClass()->render_activity()\n"; + std::cerr << "Oxygen::render_activity - Calling parentClass()->render_activity()\n"; #endif ThemingEngine::parentClass()->render_activity( engine, context, x, y, w, h ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
