use widgetStateEngine instead of slider engine for QSlider animations.

implement focus animation of sliders
wilder-pre-rebase
Hugo Pereira Da Costa 12 years ago
parent 680b97b918
commit ca54908cd5
  1. 3
      kstyle/animations/breezeanimations.cpp
  2. 8
      kstyle/animations/breezeanimations.h
  3. 7
      kstyle/breezestyle.cpp

@ -54,7 +54,6 @@ namespace Breeze
registerEngine( _headerViewEngine = new HeaderViewEngine( this ) );
registerEngine( _widgetStateEngine = new WidgetStateEngine( this ) );
registerEngine( _scrollBarEngine = new ScrollBarEngine( this ) );
registerEngine( _sliderEngine = new SliderEngine( this ) );
registerEngine( _tabBarEngine = new TabBarEngine( this ) );
registerEngine( _dialEngine = new DialEngine( this ) );
@ -141,7 +140,7 @@ namespace Breeze
// sliders
else if( qobject_cast<QScrollBar*>( widget ) ) { _scrollBarEngine->registerWidget( widget ); }
else if( qobject_cast<QSlider*>( widget ) ) { _sliderEngine->registerWidget( widget ); }
else if( qobject_cast<QSlider*>( widget ) ) { _widgetStateEngine->registerWidget( widget, AnimationHover|AnimationFocus ); }
else if( qobject_cast<QDial*>( widget ) ) { _dialEngine->registerWidget( widget ); }
// progress bar

@ -24,7 +24,6 @@
#include "breezedialengine.h"
#include "breezeheaderviewengine.h"
#include "breezescrollbarengine.h"
#include "breezesliderengine.h"
#include "breezespinboxengine.h"
#include "breezetabbarengine.h"
#include "breezetoolboxengine.h"
@ -85,10 +84,6 @@ namespace Breeze
ScrollBarEngine& scrollBarEngine( void ) const
{ return *_scrollBarEngine; }
//* slider engine
SliderEngine& sliderEngine( void ) const
{ return *_sliderEngine; }
//* dial engine
DialEngine& dialEngine( void ) const
{ return *_dialEngine; }
@ -138,9 +133,6 @@ namespace Breeze
//* scrollbar engine
ScrollBarEngine* _scrollBarEngine;
//* slider engine
SliderEngine* _sliderEngine;
//* dial engine
DialEngine* _dialEngine;

@ -5577,9 +5577,10 @@ namespace Breeze
const bool sunken( state & (State_On|State_Sunken) );
// animation state
_animations->sliderEngine().updateState( widget, enabled && handleActive );
const AnimationMode mode( _animations->sliderEngine().isAnimated( widget ) ? AnimationHover:AnimationNone );
const qreal opacity( _animations->sliderEngine().opacity( widget ) );
_animations->widgetStateEngine().updateState( widget, AnimationHover, handleActive && mouseOver );
_animations->widgetStateEngine().updateState( widget, AnimationFocus, hasFocus );
const AnimationMode mode( _animations->widgetStateEngine().buttonAnimationMode( widget ) );
const qreal opacity( _animations->widgetStateEngine().buttonOpacity( widget ) );
// define colors
const QColor background( palette.color( QPalette::Button ) );

Loading…
Cancel
Save