Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kwin: correct metadata type

Browse source 
note that the getter (KWin::AnimationEffect::metaData()) used to return
signed integer while the setter (KWin::AnimationEffect::setMetaData())
takes unsigned integer as argument, i.e. looks like someone messed up
somewhere

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-12 09:40:52 +02:00
parent c6b3223495
commit 71ca696077
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin/libkwineffects/anidata.cpp
View file

@ -38,7 +38,7 @@ AniData::AniData()
waitAtSource = keepAtTarget = false; waitAtSource = keepAtTarget = false;
} }
AniData::AniData(AnimationEffect::Attribute a, int meta, int ms, const FPx2 &to, AniData::AniData(AnimationEffect::Attribute a, uint meta, int ms, const FPx2 &to,
QEasingCurve curve, int delay, const FPx2 &from, bool waitAtSource, bool keepAtTarget ) QEasingCurve curve, int delay, const FPx2 &from, bool waitAtSource, bool keepAtTarget )
{ {
attribute = a; attribute = a;

2
kwin/libkwineffects/anidata_p.h
View file

@ -30,7 +30,7 @@ namespace KWin {
class AniData { class AniData {
public: public:
AniData(); AniData();
AniData(AnimationEffect::Attribute a, int meta, int ms, const FPx2 &to, AniData(AnimationEffect::Attribute a, uint meta, int ms, const FPx2 &to,
QEasingCurve curve, int delay, const FPx2 &from, bool waitAtSource, bool keepAtTarget = false); QEasingCurve curve, int delay, const FPx2 &from, bool waitAtSource, bool keepAtTarget = false);
AniData(const AniData &other); AniData(const AniData &other);
inline void addTime(int t) { time += t; } inline void addTime(int t) { time += t; }

2
kwin/libkwineffects/kwinanimationeffect.cpp
View file

@ -634,7 +634,7 @@ float AnimationEffect::progress( const AniData &a ) const
return 1.0; // we're done and "waiting" at the target value return 1.0; // we're done and "waiting" at the target value
} }
int AnimationEffect::metaData( MetaType type, uint meta ) uint AnimationEffect::metaData( MetaType type, uint meta )
{ {
switch (type) { switch (type) {
case SourceAnchor: case SourceAnchor:

8
kwin/libkwineffects/kwinanimationeffect.h
View file

@ -103,8 +103,10 @@ public:
Position, Size, Translation, Clip, Generic, CrossFadePrevious, Position, Size, Translation, Clip, Generic, CrossFadePrevious,
NonFloatBase = Position NonFloatBase = Position
}; };
enum MetaType { SourceAnchor, TargetAnchor, enum MetaType {
RelativeSourceX, RelativeSourceY, RelativeTargetX, RelativeTargetY, Axis }; SourceAnchor = 0, TargetAnchor,
RelativeSourceX, RelativeSourceY, RelativeTargetX, RelativeTargetY, Axis
};
/** /**
* Whenever you intend to connect to the EffectsHandler::windowClosed() signal, do so when reimplementing the constructor. * Whenever you intend to connect to the EffectsHandler::windowClosed() signal, do so when reimplementing the constructor.
* Do *not* add private slots named _windowClosed( EffectWindow* w ) or _windowDeleted( EffectWindow* w ) !! * Do *not* add private slots named _windowClosed( EffectWindow* w ) or _windowDeleted( EffectWindow* w ) !!
@ -120,7 +122,7 @@ public:
* The first 24 bits are reserved for the AnimationEffect class - you can use the last 8 bits for custom hints. * The first 24 bits are reserved for the AnimationEffect class - you can use the last 8 bits for custom hints.
* In case you transform a Generic attribute, all 32 bits are yours and you can use them as you want and read them in your genericAnimation() implementation. * In case you transform a Generic attribute, all 32 bits are yours and you can use them as you want and read them in your genericAnimation() implementation.
*/ */
static int metaData(MetaType type, uint meta ); static uint metaData(MetaType type, uint meta );
static void setMetaData(MetaType type, uint value, uint &meta ); static void setMetaData(MetaType type, uint value, uint &meta );
/** /**