Hello community, here is the log from the commit of package oxygen5 for openSUSE:Factory checked in at 2016-04-12 19:05:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen5 (Old) and /work/SRC/openSUSE:Factory/.oxygen5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen5" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen5/oxygen5.changes 2016-04-07 13:30:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen5.new/oxygen5.changes 2016-04-12 19:05:45.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 5 15:53:52 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.6.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.2.php + +------------------------------------------------------------------- Old: ---- oxygen-5.6.1.tar.xz New: ---- oxygen-5.6.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen5.spec ++++++ --- /var/tmp/diff_new_pack.wDTL0l/_old 2016-04-12 19:05:46.000000000 +0200 +++ /var/tmp/diff_new_pack.wDTL0l/_new 2016-04-12 19:05:46.000000000 +0200 @@ -20,7 +20,7 @@ %define kwin_deco 1 Name: oxygen5 -Version: 5.6.1 +Version: 5.6.2 Release: 0 Summary: Oxygen style, KWin decoration, cursors and sounds License: GPL-2.0+ ++++++ oxygen-5.6.1.tar.xz -> oxygen-5.6.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.6.1/CMakeLists.txt new/oxygen-5.6.2/CMakeLists.txt --- old/oxygen-5.6.1/CMakeLists.txt 2016-03-29 16:16:43.000000000 +0200 +++ new/oxygen-5.6.2/CMakeLists.txt 2016-04-05 15:51:57.000000000 +0200 @@ -1,5 +1,5 @@ project(oxygen) -set(PROJECT_VERSION "5.6.1") +set(PROJECT_VERSION "5.6.2") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.6.1/kstyle/oxygenstyle.cpp new/oxygen-5.6.2/kstyle/oxygenstyle.cpp --- old/oxygen-5.6.1/kstyle/oxygenstyle.cpp 2016-03-29 16:16:10.000000000 +0200 +++ new/oxygen-5.6.2/kstyle/oxygenstyle.cpp 2016-04-05 15:51:08.000000000 +0200 @@ -646,7 +646,7 @@ case PM_DefaultFrameWidth: if( qobject_cast<const QLineEdit*>( widget ) ) return Metrics::LineEdit_FrameWidth; #if QT_VERSION >= 0x050000 - else if( option && option->styleObject && option->styleObject->inherits( "QQuickStyleItem" ) ) + else if( isQtQuickControl( option, widget ) ) { const QString &elementType = option->styleObject->property( "elementType" ).toString(); if( elementType == QLatin1String( "edit" ) || elementType == QLatin1String( "spinbox" ) ) @@ -3029,12 +3029,7 @@ case QStyleOptionMenuItem::SubMenu: { - #if QT_VERSION >= 0x050000 - const bool isQtQuickControl = !widget && option && option->styleObject && option->styleObject->inherits( "QQuickStyleItem" ); - const int iconWidth( isQtQuickControl ? qMax( pixelMetric(PM_SmallIconSize, option, widget ), menuItemOption->maxIconWidth ) : menuItemOption->maxIconWidth ); - #else - const int iconWidth( menuItemOption->maxIconWidth ); - #endif + const int iconWidth( isQtQuickControl( option, widget ) ? qMax( pixelMetric(PM_SmallIconSize, option, widget ), menuItemOption->maxIconWidth ) : menuItemOption->maxIconWidth ); int leftColumnWidth( iconWidth ); @@ -3231,9 +3226,8 @@ const bool enabled( state & State_Enabled ); #if QT_VERSION >= 0x050000 - const bool isQtQuickControl = !widget && option && option->styleObject && option->styleObject->inherits( "QQuickStyleItem" ); const bool isInputWidget( ( widget && widget->testAttribute( Qt::WA_Hover ) ) || - ( isQtQuickControl && option->styleObject->property( "elementType" ).toString() == QStringLiteral( "edit") ) ); + ( isQtQuickControl( option, widget ) && option->styleObject->property( "elementType" ).toString() == QStringLiteral( "edit") ) ); #else const bool isInputWidget( widget && widget->testAttribute( Qt::WA_Hover ) ); #endif @@ -3367,12 +3361,10 @@ _helper->renderWindowBackground( painter, option->rect, widget, option->palette ); _helper->drawFloatFrame( painter, option->rect, option->palette.window().color(), true ); - #if !OXYGEN_USE_KDE4 - } else if( option->styleObject && option->styleObject->inherits( "QQuickItem" ) ) { + } else if( isQtQuickControl( option, widget ) ) { // QtQuick Control case _helper->drawFloatFrame( painter, option->rect, option->palette.window().color(), true ); - #endif } return true; @@ -5205,12 +5197,7 @@ } // icon - #if QT_VERSION >= 0x050000 - const bool isQtQuickControl = !widget && option && option->styleObject && option->styleObject->inherits( "QQuickStyleItem" ); - const int iconWidth( isQtQuickControl ? qMax( pixelMetric(PM_SmallIconSize, option, widget ), menuItemOption->maxIconWidth ) : menuItemOption->maxIconWidth ); - #else - const int iconWidth( menuItemOption->maxIconWidth ); - #endif + const int iconWidth( isQtQuickControl( option, widget ) ? qMax( pixelMetric(PM_SmallIconSize, option, widget ), menuItemOption->maxIconWidth ) : menuItemOption->maxIconWidth ); QRect iconRect( contentsRect.left(), contentsRect.top() + (contentsRect.height()-iconWidth)/2, iconWidth, iconWidth ); contentsRect.setLeft( iconRect.right() + Metrics::MenuItem_ItemSpacing + 1 ); @@ -8622,6 +8609,18 @@ } + //____________________________________________________________________ + bool Style::isQtQuickControl( const QStyleOption* option, const QWidget* widget ) const + { + #if QT_VERSION >= 0x050000 + return (widget == nullptr) && option && option->styleObject && option->styleObject->inherits( "QQuickItem" ); + #else + Q_UNUSED( widget ); + Q_UNUSED( option ); + return false; + #endif + } + //_____________________________________________________________ Style::SlabRect::SlabRect(void): tiles( TileSet::Ring ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-5.6.1/kstyle/oxygenstyle.h new/oxygen-5.6.2/kstyle/oxygenstyle.h --- old/oxygen-5.6.1/kstyle/oxygenstyle.h 2016-03-29 16:16:10.000000000 +0200 +++ new/oxygen-5.6.2/kstyle/oxygenstyle.h 2016-04-05 15:51:08.000000000 +0200 @@ -546,6 +546,9 @@ */ QStyleOptionToolButton separatorMenuItemOption( const QStyleOptionMenuItem*, const QWidget* ) const; + //* return true if option corresponds to QtQuick control + bool isQtQuickControl( const QStyleOption*, const QWidget* ) const; + //@} //* adjust rect based on provided margins
