Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2012-06-25 11:52:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2012-05-15 17:42:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2012-06-25 11:52:28.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jun 18 16:35:50 UTC 2012 - [email protected] + +- Update to version 1.2.5: + Bugfix release. Fixes include: + * Several rendering issues with libre-office. + * Icon positionning in text entries. + +------------------------------------------------------------------- Old: ---- oxygen-gtk2-1.2.4.tar.bz2 New: ---- oxygen-gtk2-1.2.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.Jpe75o/_old 2012-06-25 11:52:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Jpe75o/_new 2012-06-25 11:52:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: oxygen-gtk2 -Version: 1.2.4 +Version: 1.2.5 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ ++++++ oxygen-gtk2-1.2.4.tar.bz2 -> oxygen-gtk2-1.2.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.4/CMakeLists.txt new/oxygen-gtk2-1.2.5/CMakeLists.txt --- old/oxygen-gtk2-1.2.4/CMakeLists.txt 2012-05-14 08:39:08.000000000 +0200 +++ new/oxygen-gtk2-1.2.5/CMakeLists.txt 2012-06-15 08:41:43.000000000 +0200 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "[email protected]" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "2" ) -set( CPACK_PACKAGE_VERSION_PATCH "4" ) +set( CPACK_PACKAGE_VERSION_PATCH "5" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.4/src/oxygenstyle.cpp new/oxygen-gtk2-1.2.5/src/oxygenstyle.cpp --- old/oxygen-gtk2-1.2.4/src/oxygenstyle.cpp 2012-05-14 08:39:08.000000000 +0200 +++ new/oxygen-gtk2-1.2.5/src/oxygenstyle.cpp 2012-06-15 08:41:43.000000000 +0200 @@ -1505,7 +1505,9 @@ ColorUtils::Rgba base( ColorUtils::decoColor( background, color ) ); ColorUtils::Rgba contrast( ColorUtils::lightColor( background ) ); - if( options&Active ) + // We don't want to change color on active state for menu checkboxes (it's never passed by GTK) + // Also, if we ignore active state, we get correct render for LibreOffice + if( options&Active && !(options&Flat) ) { base = ColorUtils::alphaColor( base, 0.3 ); contrast = ColorUtils::alphaColor( contrast, 0.3 ); @@ -1671,7 +1673,9 @@ ColorUtils::Rgba base( ColorUtils::decoColor( background, color ) ); ColorUtils::Rgba contrast( ColorUtils::lightColor( background ) ); - if( options&Active ) + // We don't want to change color on active state for menu radiobuttons (it's never passed by GTK) + // Also, if we ignore active state, we get correct render for LibreOffice + if( options&Active && !(options&Menu ) ) { base = ColorUtils::alphaColor( base, 0.3 ); contrast = ColorUtils::alphaColor( contrast, 0.3 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.4/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.2.5/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.2.4/src/oxygenstylewrapper.cpp 2012-05-14 08:39:08.000000000 +0200 +++ new/oxygen-gtk2-1.2.5/src/oxygenstylewrapper.cpp 2012-06-15 08:41:43.000000000 +0200 @@ -248,7 +248,15 @@ } else if( d.isTrough() ) { if( GTK_IS_PROGRESS_BAR( widget ) ) - { return; } + { + if( Style::instance().settings().applicationName().isOpenOffice() ) + { + StyleOptions options; + if( Gtk::gtk_widget_is_vertical( widget ) ) options |= Vertical; + Style::instance().renderProgressBarHole( window, clipRect, x,y,w,h, options ); + } + return; + } } else if( d.isTooltip() && Style::instance().settings().tooltipDrawStyledFrames() ) { @@ -1037,43 +1045,46 @@ options |= Flat; options &= ~Focus; - // register to Hover engine and check state - Style::instance().animations().hoverEngine().registerWidget( widget ); - if( (options&Hover) ) Style::instance().animations().hoverEngine().setHovered( widget, true ); - else if( Style::instance().animations().hoverEngine().hovered( widget ) ) options |= Hover; - - // register to ToolBarState engine - ToolBarStateEngine& engine( Style::instance().animations().toolBarStateEngine() ); - GtkWidget* parent( 0L ); + if(!Style::instance().settings().applicationName().isOpenOffice()) + { + // register to Hover engine and check state + Style::instance().animations().hoverEngine().registerWidget( widget ); + if( (options&Hover) ) Style::instance().animations().hoverEngine().setHovered( widget, true ); + else if( Style::instance().animations().hoverEngine().hovered( widget ) ) options |= Hover; + + // register to ToolBarState engine + ToolBarStateEngine& engine( Style::instance().animations().toolBarStateEngine() ); + GtkWidget* parent( 0L ); + + bool toolPalette(false); + #if GTK_CHECK_VERSION(2,20,0) + toolPalette=Gtk::gtk_widget_find_parent( widget, GTK_TYPE_TOOL_PALETTE ); + #endif - bool toolPalette(false); - #if GTK_CHECK_VERSION(2,20,0) - toolPalette=Gtk::gtk_widget_find_parent( widget, GTK_TYPE_TOOL_PALETTE ); - #endif + if( !toolPalette && (parent = engine.findParent( widget ) ) ) + { - if( !toolPalette && (parent = engine.findParent( widget ) ) ) - { + // register child + engine.registerChild( parent, widget, options&Hover ); + useWidgetState = false; - // register child - engine.registerChild( parent, widget, options&Hover ); - useWidgetState = false; + if( engine.animatedRectangleIsValid( parent ) && !(options&Sunken) ) { - if( engine.animatedRectangleIsValid( parent ) && !(options&Sunken) ) { + return; - return; + } if( engine.widget( parent, AnimationCurrent ) == widget ) { - } if( engine.widget( parent, AnimationCurrent ) == widget ) { + data = engine.animationData( parent, AnimationCurrent ); - data = engine.animationData( parent, AnimationCurrent ); + if( engine.isLocked( parent ) ) options |= Hover; - if( engine.isLocked( parent ) ) options |= Hover; + } else if( (options & Sunken ) && engine.widget( parent, AnimationPrevious ) == widget ) { - } else if( (options & Sunken ) && engine.widget( parent, AnimationPrevious ) == widget ) { + data = engine.animationData( parent, AnimationPrevious ); - data = engine.animationData( parent, AnimationPrevious ); + } } - } } @@ -2164,7 +2175,13 @@ Style::instance().renderCheckBox( window, clipRect, x, y, w, h, shadow, options, data ); - } else if( d.isCheck() && GTK_IS_CHECK_MENU_ITEM( widget ) ) { + } else if( d.isCheck() && ( GTK_IS_CHECK_MENU_ITEM( widget ) || /* for LibreOffice */GTK_IS_MENU_ITEM( widget ) ) ) { + + // Fix cliprect for LibreOffice + if(GTK_IS_MENU_ITEM(widget)) + { + ++clipRect->width; + } StyleOptions options( widget, state, shadow ); options |= (Blend|Flat|NoFill); @@ -2944,7 +2961,10 @@ } - gap.setHeight( 8 ); + if(Style::instance().settings().applicationName().isOpenOffice()) + gap.setHeight( 0 ); + else + gap.setHeight( 8 ); Style::instance().renderTabBarFrame( window, clipRect, x-1, y-1, w+2, h+2, gap, options ); } @@ -3177,6 +3197,13 @@ Style::instance().renderTabBarBase( window, clipRect, xBase-1, yBase-1, wBase+2, hBase+2, position, gap, options, tabOptions ); } + else if(Style::instance().settings().applicationName().isOpenOffice()) + { + Gtk::Gap gap; + gap.setHeight( 0 ); + Style::instance().renderTabBarFrame( window, clipRect, x-5, y+h-4, w+11, h+2, gap, options ); + + } if( GTK_IS_NOTEBOOK( widget ) ) { Gtk::gtk_notebook_update_close_buttons(GTK_NOTEBOOK(widget)); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
