yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added Q_DECLARE_OPERATORS_FOR_FLAGS for AnimationTypes and simplified calls to enum in OxygenClient accordingly

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1050095
This commit is contained in:
Hugo Pereira Da Costa 2009-11-16 16:11:45 +00:00
parent e4ab19a936
commit f11a5ad36f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/oxygen/oxygenclient.cpp
View file

@ -1529,7 +1529,7 @@ namespace Oxygen
QPoint position( event->pos() );
int itemClicked( OxygenClient::itemClicked( position, false ) );
itemData_.animate( AnimationTypes( AnimationEnter|AnimationSameTarget ), itemClicked );
itemData_.animate( AnimationEnter|AnimationSameTarget, itemClicked );
}
@ -1545,7 +1545,7 @@ namespace Oxygen
{
if( dragStartTimer_.isActive() ) dragStartTimer_.stop();
itemData_.animate( AnimationTypes(AnimationLeave|AnimationSameTarget), sourceItem_ );
itemData_.animate( AnimationLeave|AnimationSameTarget, sourceItem_ );
} else if( itemData_.animated() ) {
@ -1577,7 +1577,7 @@ namespace Oxygen
QPoint position( event->pos() );
int itemClicked( OxygenClient::itemClicked( position, false ) );
itemData_.animate( AnimationTypes( AnimationMove|AnimationSameTarget ), itemClicked );
itemData_.animate( AnimationMove|AnimationSameTarget, itemClicked );
}
@ -1637,8 +1637,8 @@ namespace Oxygen
// do nothing if there is only one tab
if( itemData_.count() > 1 )
{
itemData_.animate( AnimationTypes( AnimationMove|AnimationSameTarget ), sourceItem_ );
itemData_.animate( AnimationTypes( AnimationLeave|AnimationSameTarget ), sourceItem_ );
itemData_.animate( AnimationMove|AnimationSameTarget, sourceItem_ );
itemData_.animate( AnimationLeave|AnimationSameTarget, sourceItem_ );
}
}

2
clients/oxygen/oxygenclientgroupitemdata.h
View file

@ -196,6 +196,8 @@ namespace Oxygen
};
Q_DECLARE_OPERATORS_FOR_FLAGS(Oxygen::AnimationTypes)
}
#endif