DialData inherits from WidgetStateData

WidgetStateEngine gives protected accessor to datamaps
typedef -> using
wilder-pre-rebase
Hugo Pereira Da Costa 12 years ago
parent ca54908cd5
commit cbe11c7eb4
  1. 2
      kstyle/animations/breezebaseengine.h
  2. 6
      kstyle/animations/breezedialdata.cpp
  3. 4
      kstyle/animations/breezedialdata.h
  4. 19
      kstyle/animations/breezewidgetstateengine.cpp
  5. 3
      kstyle/animations/breezewidgetstateengine.h

@ -70,7 +70,7 @@ namespace Breeze
virtual bool unregisterWidget( QObject* object ) = 0;
//* list of widgets
typedef QSet<QWidget*> WidgetList;
using WidgetList = QSet<QWidget*>;
//* returns registered widgets
virtual WidgetList registeredWidgets( void ) const

@ -28,7 +28,7 @@ namespace Breeze
//______________________________________________
DialData::DialData( QObject* parent, QWidget* target, int duration ):
SliderData( parent, target, duration ),
WidgetStateData( parent, target, duration ),
_position( -1, -1 )
{ target->installEventFilter( this ); }
@ -37,7 +37,7 @@ namespace Breeze
{
if( object != target().data() )
{ return SliderData::eventFilter( object, event ); }
{ return WidgetStateData::eventFilter( object, event ); }
// check event type
switch( event->type() )
@ -56,7 +56,7 @@ namespace Breeze
}
return SliderData::eventFilter( object, event );
return WidgetStateData::eventFilter( object, event );
}

@ -20,13 +20,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
*************************************************************************/
#include "breezesliderdata.h"
#include "breezewidgetstatedata.h"
namespace Breeze
{
//* dial data
class DialData: public SliderData
class DialData: public WidgetStateData
{
Q_OBJECT

@ -49,8 +49,7 @@ namespace Breeze
WidgetList out;
// the typedef is needed to make Krazy happy
typedef DataMap<WidgetStateData>::Value Value;
using Value = DataMap<WidgetStateData>::Value;
if( mode&AnimationHover )
{
@ -111,4 +110,20 @@ namespace Breeze
}
//____________________________________________________________
DataMap<WidgetStateData>& WidgetStateEngine::dataMap( AnimationMode mode )
{
switch( mode )
{
default:
case AnimationHover: return _hoverData;
case AnimationFocus: return _focusData;
case AnimationEnable: return _enableData;
case AnimationPressed: return _pressedData;
}
}
}

@ -141,6 +141,9 @@ namespace Breeze
//* returns data associated to widget
DataMap<WidgetStateData>::Value data( const QObject*, AnimationMode );
//* returns data map associated to animation mode
DataMap<WidgetStateData>& dataMap( AnimationMode );
private:
//* maps

Loading…
Cancel
Save