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

Avoids unnecessary searchs for info of the window

Browse source 
We already have the info variable. Why search for it again?
Patch reviewed in https://git.reviewboard.kde.org/r/113872/
This commit is contained in:
Raul Fernandes 2013-11-19 09:49:17 -02:00
parent 9aca68cef1
commit 697180dda0
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
effects/glide/glide.cpp
View file

@ -110,38 +110,32 @@ void GlideEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowP
default:
case GlideInOut:
if (info->added)
glideIn(w, data);
glideIn(w, data, info);
else if (info->closed)
glideOut(w, data);
glideOut(w, data, info);
break;
case GlideOutIn:
if (info->added)
glideOut(w, data);
glideOut(w, data, info);
if (info->closed)
glideIn(w, data);
glideIn(w, data, info);
break;
case GlideIn: glideIn(w, data); break;
case GlideOut: glideOut(w, data); break;
case GlideIn: glideIn(w, data, info); break;
case GlideOut: glideOut(w, data, info); break;
}
}
effects->paintWindow(w, mask, region, data);
}
void GlideEffect::glideIn(EffectWindow* w, WindowPaintData& data)
void GlideEffect::glideIn(EffectWindow* w, WindowPaintData& data, const InfoHash::const_iterator &info)
{
InfoHash::const_iterator info = windows.constFind(w);
if (info == windows.constEnd())
return;
const double progress = info->timeLine->currentValue();
data *= progress;
data.translate(int(w->width() / 2 * (1 - progress)), int(w->height() / 2 * (1 - progress)));
}
void GlideEffect::glideOut(EffectWindow* w, WindowPaintData& data)
void GlideEffect::glideOut(EffectWindow* w, WindowPaintData& data, const InfoHash::const_iterator &info)
{
InfoHash::const_iterator info = windows.constFind(w);
if (info == windows.constEnd())
return;
const double progress = info->timeLine->currentValue();
data *= (2 - progress);
data.translate(- int(w->width() / 2 * (1 - progress)), - int(w->height() / 2 * (1 - progress)));

4
effects/glide/glide.h
View file

@ -67,8 +67,8 @@ public Q_SLOTS:
private:
class WindowInfo;
typedef QMap< const EffectWindow*, WindowInfo > InfoHash;
void glideIn(EffectWindow* w, WindowPaintData& data);
void glideOut(EffectWindow* w, WindowPaintData& data);
void glideIn(EffectWindow* w, WindowPaintData& data, const InfoHash::const_iterator &info);
void glideOut(EffectWindow* w, WindowPaintData& data, const InfoHash::const_iterator &info);
bool isGlideWindow(EffectWindow* w);
InfoHash windows;
float duration;