Hello community,
here is the log from the commit of package oxygen-gtk3 for openSUSE:Factory checked in at 2014-10-31 09:39:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/oxygen-gtk3 (Old)
and /work/SRC/openSUSE:Factory/.oxygen-gtk3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk3"
Changes:
--------
--- /work/SRC/openSUSE:Factory/oxygen-gtk3/oxygen-gtk3.changes 2014-08-27 07:47:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.oxygen-gtk3.new/oxygen-gtk3.changes 2014-10-31 12:28:12.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Oct 29 23:20:26 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to version 1.4.1
+ * Properly handle GTK_STATE_FLAG_CHECKED when rendering check
+ buttons or radio buttons (kde#338538)
+ * Fixed progressbars rendering
+ * Changed AnimationType::None into AnimationType::NoAnimation
+ due to possible conflict with X11 None.
+ * Disconnect old button if already set (kde#339174)
+ * Fixed decoColor consistently with Qt
+
+-------------------------------------------------------------------
Old:
----
oxygen-gtk3-1.4.0.tar.bz2
New:
----
oxygen-gtk3-1.4.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oxygen-gtk3.spec ++++++
--- /var/tmp/diff_new_pack.UZp868/_old 2014-10-31 12:28:13.000000000 +0100
+++ /var/tmp/diff_new_pack.UZp868/_new 2014-10-31 12:28:13.000000000 +0100
@@ -17,7 +17,7 @@
Name: oxygen-gtk3
-Version: 1.4.0
+Version: 1.4.1
Release: 0
Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 3.x
License: LGPL-2.1+
++++++ oxygen-gtk3-1.4.0.tar.bz2 -> oxygen-gtk3-1.4.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.4.0/CMakeLists.txt new/oxygen-gtk3-1.4.1/CMakeLists.txt
--- old/oxygen-gtk3-1.4.0/CMakeLists.txt 2014-07-02 12:07:10.000000000 +0200
+++ new/oxygen-gtk3-1.4.1/CMakeLists.txt 2014-10-22 09:24:47.000000000 +0200
@@ -13,7 +13,7 @@
set( CPACK_PACKAGE_VENDOR "hugo.pereira(a)free.fr" )
set( CPACK_PACKAGE_VERSION_MAJOR "1" )
set( CPACK_PACKAGE_VERSION_MINOR "4" )
-set( CPACK_PACKAGE_VERSION_PATCH "0" )
+set( CPACK_PACKAGE_VERSION_PATCH "1" )
set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" )
##################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.4.0/src/animations/oxygencomboboxdata.cpp new/oxygen-gtk3-1.4.1/src/animations/oxygencomboboxdata.cpp
--- old/oxygen-gtk3-1.4.0/src/animations/oxygencomboboxdata.cpp 2014-07-02 12:07:10.000000000 +0200
+++ new/oxygen-gtk3-1.4.1/src/animations/oxygencomboboxdata.cpp 2014-10-22 09:24:26.000000000 +0200
@@ -78,7 +78,13 @@
void ComboBoxData::setButton( GtkWidget* widget )
{
if( _button._widget == widget ) return;
- assert( !_button._widget );
+
+ if( _button._widget )
+ {
+ std::cerr << "Oxygen::WindowManager::wmButtonPress - warning: a button was already set for this combobox" << std::endl;
+ _button._toggledId.disconnect();
+ _button._sizeAllocateId.disconnect();
+ }
_button._toggledId.connect( G_OBJECT(widget), "toggled", G_CALLBACK( childToggledEvent ), this );
_button._sizeAllocateId.connect( G_OBJECT(widget), "size-allocate", G_CALLBACK( childSizeAllocateEvent ), this );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.4.0/src/oxygencolorutils.cpp new/oxygen-gtk3-1.4.1/src/oxygencolorutils.cpp
--- old/oxygen-gtk3-1.4.0/src/oxygencolorutils.cpp 2014-02-17 11:11:14.000000000 +0100
+++ new/oxygen-gtk3-1.4.1/src/oxygencolorutils.cpp 2014-10-08 11:11:17.000000000 +0200
@@ -242,7 +242,7 @@
//_________________________________________________________________________
ColorUtils::Rgba ColorUtils::decoColor( const ColorUtils::Rgba& background, const ColorUtils::Rgba& color )
- { return mix( background, color, 0.4 + 0.8*contrast() ); }
+ { return mix( background, color, 0.8*(1.0 + contrast() ) ); }
//_________________________________________________________________________
ColorUtils::Rgba ColorUtils::alphaColor( const ColorUtils::Rgba& color, double alpha )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.4.0/src/oxygenstyleoptions.h new/oxygen-gtk3-1.4.1/src/oxygenstyleoptions.h
--- old/oxygen-gtk3-1.4.0/src/oxygenstyleoptions.h 2014-07-02 12:07:10.000000000 +0200
+++ new/oxygen-gtk3-1.4.1/src/oxygenstyleoptions.h 2014-10-22 09:24:26.000000000 +0200
@@ -78,6 +78,10 @@
if( flags & GTK_STATE_FLAG_SELECTED ) (*this) |= (Selected|Active);
if( flags & GTK_STATE_FLAG_ACTIVE ) (*this) |= Sunken;
+ #if GTK_CHECK_VERSION( 3, 13, 7 )
+ if( flags & GTK_STATE_FLAG_CHECKED ) (*this) |= Sunken;
+ #endif
+
// TODO: check whether one should use this, or gtk_widget_has_focus
if( flags & GTK_STATE_FLAG_FOCUSED ) (*this) |= Focus;
@@ -91,6 +95,11 @@
if( flags & GTK_STATE_FLAG_PRELIGHT ) (*this) |= Hover;
if( flags & GTK_STATE_FLAG_SELECTED ) (*this) |= (Selected|Active);
if( flags & GTK_STATE_FLAG_ACTIVE ) (*this) |= Sunken;
+
+ #if GTK_CHECK_VERSION( 3, 13, 7 )
+ if( flags & GTK_STATE_FLAG_CHECKED ) (*this) |= Sunken;
+ #endif
+
if( flags & GTK_STATE_FLAG_FOCUSED ) (*this) |= Focus;
else if( GTK_IS_WIDGET( widget ) && gtk_widget_has_focus(widget) ) (*this)|=Focus;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.4.0/src/oxygenthemingengine.cpp new/oxygen-gtk3-1.4.1/src/oxygenthemingengine.cpp
--- old/oxygen-gtk3-1.4.0/src/oxygenthemingengine.cpp 2014-07-02 12:07:10.000000000 +0200
+++ new/oxygen-gtk3-1.4.1/src/oxygenthemingengine.cpp 2014-10-22 09:24:26.000000000 +0200
@@ -335,7 +335,7 @@
} else if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_NOTEBOOK ) ) {
- // no need to render anything for notebook gradient
+ // no need to render anything for notebook background
} else if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_CELL ) ) {
@@ -514,15 +514,15 @@
// render background
if( !Gtk::gtk_widget_is_applet( widget ) )
- {
+ {
#if OXYGEN_DEBUG
int r;
const GtkStateFlags state( gtk_theming_engine_get_state( engine ) );
gtk_theming_engine_get( engine, state, GTK_STYLE_PROPERTY_BORDER_RADIUS, &r, NULL );
std::cerr << "Oxygen::ThemingEngine::render_background - radius: " << r << std::endl;
- #endif
-
- Style::instance().renderTitleBarBackground( context, widget, x, y, w, h );
+ #endif
+
+ Style::instance().renderTitleBarBackground( context, widget, x, y, w, h );
}
render_animated_button( context, widget );
@@ -546,6 +546,7 @@
} else if(
gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_BUTTON ) ||
gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_INFO ) ||
+ gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_PROGRESSBAR ) ||
gtk_widget_path_is_type( path, GTK_TYPE_INFO_BAR ) ||
gtk_widget_path_is_type( path, GTK_TYPE_BUTTON ) )
{
@@ -701,6 +702,32 @@
}
+ #if GTK_CHECK_VERSION( 3, 13, 7 )
+ } else if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_PROGRESSBAR ) ) {
+
+ // lookup widget and state
+ GtkWidget* widget( Style::instance().widgetLookup().find( context, gtk_theming_engine_get_path( engine ) ) );
+ GtkStateFlags state( gtk_theming_engine_get_state( engine ) );
+
+ StyleOptions options( widget, state);
+ if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_VERTICAL ) ) options |= Vertical;
+
+ if( GTK_IS_PROGRESS_BAR(widget) )
+ {
+
+ y+=1; h-=2;
+ x+=1; w-=2;
+
+ } else if( GTK_IS_ENTRY( widget ) ) {
+
+ y+=1; h-=2;
+ x+=3; w-=6;
+
+ }
+
+ Style::instance().renderProgressBarHandle( context, x, y, w, h, options );
+ return;
+ #endif
}
// adjust shadow type for some known widgets
@@ -1867,9 +1894,13 @@
// shadow type defines checkmark presence and type
GtkShadowType shadow( GTK_SHADOW_OUT );
- if( state>K_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
- else if( state>K_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
+ if( state & GTK_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
+ else if( state & GTK_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
+ #if GTK_CHECK_VERSION( 3, 13, 7 )
+ else if( state & GTK_STATE_FLAG_CHECKED ) shadow = GTK_SHADOW_IN;
+ #endif
+ // render
Style::instance().renderCheckBox( widget, context, x, y, w, h, shadow, options, data );
} else {
@@ -1955,7 +1986,12 @@
// shadow type defines checkmark presence and type
GtkShadowType shadow( GTK_SHADOW_OUT );
if( state>K_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
- else if( state>K_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
+ else if( state & GTK_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
+ #if GTK_CHECK_VERSION( 3, 13, 7 )
+ else if( state & GTK_STATE_FLAG_CHECKED ) shadow = GTK_SHADOW_IN;
+ #endif
+
+ // render
Style::instance().renderRadioButton( widget, context, x, y, w, h, shadow, options, data );
} else {
@@ -2480,6 +2516,7 @@
<< std::endl;
#endif
+ #if !GTK_CHECK_VERSION( 3, 13, 7 )
if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_PROGRESSBAR ) )
{
@@ -2504,15 +2541,16 @@
}
Style::instance().renderProgressBarHandle( context, x, y, w, h, options );
-
- } else {
-
- #if OXYGEN_DEBUG
- std::cerr << "Oxygen::render_activity - Calling parentClass()->render_activity()\n";
- #endif
- ThemingEngine::parentClass()->render_activity( engine, context, x, y, w, h );
+ return;
}
+ #endif
+
+ // fallback to parent theme in all other cases
+ #if OXYGEN_DEBUG
+ std::cerr << "Oxygen::render_activity - Calling parentClass()->render_activity()\n";
+ #endif
+ ThemingEngine::parentClass()->render_activity( engine, context, x, y, w, h );
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.4.0/src/oxygenwindowmanager.cpp new/oxygen-gtk3-1.4.1/src/oxygenwindowmanager.cpp
--- old/oxygen-gtk3-1.4.0/src/oxygenwindowmanager.cpp 2014-07-02 12:07:10.000000000 +0200
+++ new/oxygen-gtk3-1.4.1/src/oxygenwindowmanager.cpp 2014-10-22 09:24:26.000000000 +0200
@@ -166,6 +166,8 @@
if( GTK_IS_NOTEBOOK( parent ) && Gtk::gtk_notebook_is_tab_label( GTK_NOTEBOOK( parent ), widget ) )
{ return false; }
+
+ #if GTK_CHECK_VERSION( 3, 13, 7 )
/*
check event mask (for now we only need to do that for GtkWindow)
The idea is that if the window has been set to receive button_press and button_release events
@@ -173,9 +175,13 @@
in which case we should not use them for grabbing
*/
if(
+ ( GTK_IS_VIEWPORT( widget ) ) &&
+ ( gtk_widget_get_events ( widget ) & ( GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK ) ) )
+ #else
+ if(
( GTK_IS_WINDOW( widget ) || GTK_IS_VIEWPORT( widget ) ) &&
- ( gtk_widget_get_events ( widget ) &
- ( GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK ) ) )
+ ( gtk_widget_get_events ( widget ) & ( GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK ) ) )
+ #endif
{
#if OXYGEN_DEBUG
std::cerr
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
