Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2012-04-17 22:00:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-26 11:04:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2012-04-17 22:00:32.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 16 04:10:52 UTC 2012 - m...@suse.com + +- Update to version 1.2.3 + * Bugfix release. + +------------------------------------------------------------------- Old: ---- oxygen-gtk2-1.2.2-1.tar.bz2 New: ---- oxygen-gtk2-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.y0VEiU/_old 2012-04-17 22:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.y0VEiU/_new 2012-04-17 22:00:34.000000000 +0200 @@ -17,13 +17,13 @@ Name: oxygen-gtk2 -Version: 1.2.2.1 +Version: 1.2.3 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ Group: System/GUI/KDE Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk/ -Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk2/1.2.2-1/src/%{name}-1.2.2-1.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk2/1.2.3/src/%{name}-1.2.3.tar.bz2 Source100: baselibs.conf BuildRequires: cmake BuildRequires: gcc-c++ @@ -90,7 +90,7 @@ This package contains the Oxygen gtk 2.x theme. %prep -%setup -q -n %{name}-1.2.2-1 +%setup -q -n %{name}-1.2.3 %build mkdir -p build ++++++ oxygen-gtk2-1.2.2-1.tar.bz2 -> oxygen-gtk2-1.2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.2-1/CMakeLists.txt new/oxygen-gtk2-1.2.3/CMakeLists.txt --- old/oxygen-gtk2-1.2.2-1/CMakeLists.txt 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/CMakeLists.txt 2012-04-13 14:55:44.000000000 +0200 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "h...@oxygen-icons.org" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "2" ) -set( CPACK_PACKAGE_VERSION_PATCH "2-1" ) +set( CPACK_PACKAGE_VERSION_PATCH "3" ) 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.2-1/rc/gtk.sv.css new/oxygen-gtk2-1.2.3/rc/gtk.sv.css --- old/oxygen-gtk2-1.2.2-1/rc/gtk.sv.css 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/rc/gtk.sv.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -/* -* this file is part of the oxygen gtk engine -* Copyright (c) 2010 Hugo Pereira Da Costa <h...@oxygen-icons.org> -* Copyright (c) 2010 Ruslan Kabatsayev <b7.10110...@gmail.com> -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or( at your option ) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -* MA 02110-1301, USA. -*/ - -/* -INFO: css border and padding ordering is either: - - all-sides; - - top/bottom left/right; - - top left/right bottom; - - top right bottom left; -*/ - -* { - -GtkPaned-handle-size: 3px; - -GtkButton-child_displacement_x: 0px; - -GtkButton-child_displacement_y: 0px; - - -GtkButton-default_border: 0px; - -GtkButton-default_outside_border: 0px; - -GtkButton-inner-border: 1px 2px 0px; - - -GtkCalendar-inner-border: 0px; - -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; - - -GtkScrolledWindow-scrollbar-spacing: 1px; - - -GtkCheckButton-indicator-size: 18px; - -GtkCheckMenuItem-indicator-size: 16px; - -GtkExpander-expander-size: 15px; - -GtkTreeView-expander-size: 15px; - - -GtkTreeView-allow-rules: 1px; - - -GtkStatusbar-shadow-type: GTK_SHADOW_NONE; - - -GtkWindow-resize-grip-height: 0px; - -GtkWindow-resize-grip-width: 0px; - - /* - Apparently the following have become obsolete - -GtkTreeView-row-ending-details: 1px; - -GtkStatusbar-has-resize-grip: false; - -GtkEntry-honors-transparent-bg-hint: 1px; - */ - - engine: oxygen-gtk; -} - -GtkScrolledWindow { border-width: 1px; } - -/* customize border styles */ -.toolbar { border-style: none; } -.menubar { border-style: none; } -GtkStatusBar { border-style: none; } - -/* - TODO: - look at default values from GtkCssProvider for better style definitions - (class based, rather than widget based) -*/ - -/* specialization of default widgets style properties */ -GtkToggleButton { -GtkButton-inner-border: 1px 0px 0px; } - -GtkScale { - -GtkRange-slider-width: 23px; - -GtkScale-slider-length: 21px; -} - -GtkScrollbar { - -GtkRange-stepper-size: 12px; - -GtkRange-trough-border: 0px; -} - -/* entries */ -/* do not change unless also changing Entry_SideMargin in OxygenStyle.h */ -GtkEntry { - padding: 2px 5px; -} - -/* menuitems padding */ -GtkMenuBar { - padding: 1px; - border-width: 0px; -} -GtkMenuBar>GtkMenuItem { padding: 2px 5px; } -GtkMenu>GtkMenuItem { padding: 5px 1px; } -GtkMenu>GtkSeparatorMenuItem { padding: 1px 1px; } - -/* menu toolbutton */ -GtkMenuToolButton, GtkMenuToolButton * { - border-width: 0px; - -GtkButton-focus-padding: 0px; - -GtkWidget-focus-line-width: 0px; -} - -/* notebooks */ -GtkNotebook { padding: 4px 6px 0px 6px; } - -/* option menu */ -GtkOptionMenu { padding: 0px 4px; } - -/* separators */ -GtkSeparator { border-width: 3px; } - -/* frames */ -GtkFrame { padding: 1px; } -GtkScrolledWindow { padding: 1px; } -GtkViewport { padding: 1px; } -GtkProgressBar { padding: 0px; } - -/* combo boxes */ -GtkComboBox { padding: 0px 0px; } -GtkComboBox>GtkFrame { padding: 0px 0px 0px 4px; } -GtkComboBox>GtkEntry { - padding: 2px 5px; -} -/* headers */ -GtkTreeView>GtkButton { border-width: 0px 2px; } -GtkList>GtkButton { border-width: 0px 2px; } - -NautilusPathBar>GtkToggleButton{ padding: 0px 10px 0px 0px; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.2-1/src/animations/oxygentoolbarstatedata.cpp new/oxygen-gtk2-1.2.3/src/animations/oxygentoolbarstatedata.cpp --- old/oxygen-gtk2-1.2.2-1/src/animations/oxygentoolbarstatedata.cpp 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/src/animations/oxygentoolbarstatedata.cpp 2012-04-13 14:55:44.000000000 +0200 @@ -325,9 +325,10 @@ if( data._target ) { - data.setDirty( true ); const GdkRectangle rect( data.dirtyRect() ); Gtk::gtk_widget_queue_draw( data._target, &rect ); + if( data._previous._widget ) Gtk::gtk_widget_queue_draw( data._previous._widget ); + if( data._current._widget ) Gtk::gtk_widget_queue_draw( data._current._widget ); } return FALSE; @@ -345,9 +346,10 @@ data.updateAnimatedRect(); - data.setDirty( true ); GdkRectangle rect( data.dirtyRect() ); Gtk::gtk_widget_queue_draw( data._target, &rect ); + if( data._previous._widget ) Gtk::gtk_widget_queue_draw( data._previous._widget ); + if( data._current._widget ) Gtk::gtk_widget_queue_draw( data._current._widget ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.2-1/src/animations/oxygentoolbarstatedata.h new/oxygen-gtk2-1.2.3/src/animations/oxygentoolbarstatedata.h --- old/oxygen-gtk2-1.2.2-1/src/animations/oxygentoolbarstatedata.h 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/src/animations/oxygentoolbarstatedata.h 2012-04-13 14:55:44.000000000 +0200 @@ -41,8 +41,7 @@ //! constructor ToolBarStateData( void ): _target( 0L ), - _dirtyRect( Gtk::gdk_rectangle() ), - _dirty( false ) + _dirtyRect( Gtk::gdk_rectangle() ) {} //! destructor @@ -84,10 +83,6 @@ _previous._timeLine.setDuration( value ); } - //! dirty state - void setDirty( bool value ) - { _dirty = value; } - //@} //!@name accessors @@ -122,10 +117,6 @@ bool isLocked( void ) const { return _timer.isRunning(); } - //! dirty state - bool isDirty( void ) const - { return _dirty; } - //@} protected: @@ -250,9 +241,6 @@ //! additional dirty rect GdkRectangle _dirtyRect; - //! dirty state - bool _dirty; - //! previous button animation data Data _previous; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.2-1/src/animations/oxygentoolbarstateengine.h new/oxygen-gtk2-1.2.3/src/animations/oxygentoolbarstateengine.h --- old/oxygen-gtk2-1.2.2-1/src/animations/oxygentoolbarstateengine.h 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/src/animations/oxygentoolbarstateengine.h 2012-04-13 14:55:44.000000000 +0200 @@ -123,10 +123,6 @@ return true; } - //! dirty state - void setDirty( GtkWidget* widget, bool value ) - { data().value( widget ).setDirty( value ); } - //@} //!@name accessors @@ -173,10 +169,6 @@ bool isLocked( GtkWidget* widget ) { return data().value( widget ).isLocked(); } - //! dirty state - bool isDirty( GtkWidget* widget ) - { return data().value( widget ).isDirty(); } - //@} private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.2-1/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.2.3/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.2.2-1/src/oxygenstylewrapper.cpp 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/src/oxygenstylewrapper.cpp 2012-04-13 14:55:44.000000000 +0200 @@ -67,7 +67,6 @@ ToolBarStateEngine& engine( Style::instance().animations().toolBarStateEngine() ); engine.registerWidget(widget); - engine.setDirty( widget, false ); if( engine.animatedRectangleIsValid( widget ) ) { @@ -117,7 +116,7 @@ #endif const Gtk::Detail d( detail ); - if( d.isBase() || d.isEventBox() ) + if( d.isBase() || d.isEventBox() || (d.isNull() && Gtk::g_object_is_a( G_OBJECT( widget ), "ShellWindow" ) ) ) { // if background pixmap is provided, fallback to default painting @@ -204,7 +203,8 @@ } // also draw possible animated tool button - draw_animated_button( window, clipRect, widget ); + if( !d.isNull() ) + { draw_animated_button( window, clipRect, widget ); } return; @@ -1051,7 +1051,7 @@ toolPalette=Gtk::gtk_widget_find_parent( widget, GTK_TYPE_TOOL_PALETTE ); #endif - if( !toolPalette && (parent = engine.findParent( widget ) ) && !engine.isDirty( parent ) ) + if( !toolPalette && (parent = engine.findParent( widget ) ) ) { // register child diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.2-1/src/oxygenwindecobutton.cpp new/oxygen-gtk2-1.2.3/src/oxygenwindecobutton.cpp --- old/oxygen-gtk2-1.2.2-1/src/oxygenwindecobutton.cpp 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/src/oxygenwindecobutton.cpp 2012-04-13 14:55:44.000000000 +0200 @@ -114,6 +114,7 @@ cairo_stroke(context); cairo_arc_qt( context, 9,8,4, 135*M_PI/180, M_PI/4 ); + cairo_stroke( context ); cairo_move_to( context, 9,12 ); cairo_close_path( context ); cairo_stroke( context ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.2-1/src/oxygenwindowmanager.cpp new/oxygen-gtk2-1.2.3/src/oxygenwindowmanager.cpp --- old/oxygen-gtk2-1.2.2-1/src/oxygenwindowmanager.cpp 2012-03-23 17:01:38.000000000 +0100 +++ new/oxygen-gtk2-1.2.3/src/oxygenwindowmanager.cpp 2012-04-13 14:55:44.000000000 +0200 @@ -436,30 +436,27 @@ wy += ny; // get widget size. - // for notebooks, only consider the tabbar rect - GtkAllocation allocation; + GtkAllocation allocation( Gtk::gtk_widget_get_allocation( widget ) ); + + // translate event position in 'local' coordinates with respect to widget's window + const int xLocal = int(event->x_root) - wx + allocation.x; + const int yLocal = int(event->y_root) - wy + allocation.y; + if( GTK_IS_NOTEBOOK( widget ) ) { - const GtkAllocation local( Gtk::gtk_widget_get_allocation( widget ) ); - Gtk::gtk_notebook_get_tabbar_rect( GTK_NOTEBOOK( widget ), &allocation ); + GtkAllocation tabbarRect; + Gtk::gtk_notebook_get_tabbar_rect( GTK_NOTEBOOK( widget ), &tabbarRect ); - const int xLocal = int(event->x_root) - wx + local.x; - const int yLocal = int(event->y_root) - wy + local.y; - - // compare to event root position - if( !Gtk::gdk_rectangle_contains( &allocation, xLocal, yLocal ) ) return false; + // compare to event local position + if( !Gtk::gdk_rectangle_contains( &tabbarRect, xLocal, yLocal ) ) return false; else if( !Style::instance().animations().tabWidgetEngine().contains( widget ) ) return false; else return !Style::instance().animations().tabWidgetEngine().isInTab( widget, xLocal, yLocal ); } else { - allocation = Gtk::gtk_widget_get_allocation( widget ); - allocation.x = wx; - allocation.y = wy; - - // compare to event root position - return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_root) ); + // compare to event position + return Gtk::gdk_rectangle_contains( &allocation, xLocal, yLocal ); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
