diff --git a/kstyle/animations/oxygenanimations.cpp b/kstyle/animations/oxygenanimations.cpp --- a/kstyle/animations/oxygenanimations.cpp +++ b/kstyle/animations/oxygenanimations.cpp @@ -175,7 +175,7 @@ _toolBarEngine->setEnabled( animationsEnabled && toolBarAnimationType == StyleConfigData::TB_FOLLOW_MOUSE ); // unregister all toolbuttons that belong to a toolbar - foreach( QWidget* widget, _widgetStateEngine->registeredWidgets( AnimationHover|AnimationFocus ) ) + foreach( QWidget* widget, _widgetStateEngine->registeredWidgets( AnimationMode( AnimationHover|AnimationFocus ) ) ) { if( qobject_cast( widget ) && qobject_cast( widget->parentWidget() ) ) { _widgetStateEngine->unregisterWidget( widget ); } @@ -267,31 +267,31 @@ if( StyleConfigData::toolBarAnimationType() == StyleConfigData::TB_FADE ) { _widgetStateEngine->registerWidget( widget, AnimationHover ); } - } else _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); + } else _widgetStateEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } else if( qobject_cast(widget) ) { if( qobject_cast( widget->parent() ) ) { _toolBoxEngine->registerWidget( widget ); } - _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); + _widgetStateEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } else if( qobject_cast(widget) ) { - _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); + _widgetStateEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } // groupboxes else if( QGroupBox* groupBox = qobject_cast( widget ) ) { if( groupBox->isCheckable() ) - { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + { _widgetStateEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } } // scrollbar else if( qobject_cast( widget ) ) { _scrollBarEngine->registerWidget( widget ); } - else if( qobject_cast( widget ) ) { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + else if( qobject_cast( widget ) ) { _widgetStateEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } else if( qobject_cast( widget ) ) { _progressBarEngine->registerWidget( widget ); @@ -310,24 +310,24 @@ // editors else if( qobject_cast( widget ) ) { _comboBoxEngine->registerWidget( widget, AnimationHover ); - _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); + _inputWidgetEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } else if( qobject_cast( widget ) ) { _spinBoxEngine->registerWidget( widget ); - _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); + _inputWidgetEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } - else if( qobject_cast( widget ) ) { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } - else if( qobject_cast( widget ) ) { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } - else if( widget->inherits( "KTextEditor::View" ) ) { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + else if( qobject_cast( widget ) ) { _inputWidgetEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } + else if( qobject_cast( widget ) ) { _inputWidgetEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } + else if( widget->inherits( "KTextEditor::View" ) ) { _inputWidgetEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } // lists else if( qobject_cast( widget ) ) - { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + { _inputWidgetEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } // scrollarea else if( QAbstractScrollArea* scrollArea = qobject_cast( widget ) ) { if( scrollArea->frameShadow() == QFrame::Sunken && (widget->focusPolicy()&Qt::StrongFocus) ) - { _inputWidgetEngine->registerWidget( widget, AnimationHover|AnimationFocus ); } + { _inputWidgetEngine->registerWidget( widget, AnimationMode( AnimationHover|AnimationFocus ) ); } } diff --git a/kstyle/oxygenstylehelper.cpp b/kstyle/oxygenstylehelper.cpp --- a/kstyle/oxygenstylehelper.cpp +++ b/kstyle/oxygenstylehelper.cpp @@ -358,7 +358,7 @@ // edges TileSet slabTileSet = slab( color, shade, size ); slabTileSet.render( QRect( 0, 0, size*4, size*5 ), &painter, - TileSet::Left | TileSet::Right | TileSet::Top ); + TileSet::Tile( TileSet::Left | TileSet::Right | TileSet::Top ) ); int fixedSize( 28*devicePixelRatio( pixmap ) ); painter.setWindow( 0, 0, fixedSize, fixedSize );