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

Merge branch 'KDE/4.8'

Browse source
This commit is contained in:
Martin Gräßlin 2012-01-13 09:08:25 +01:00
commit c3ca894171
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
effects/explosion/explosion.cpp
View file

@ -67,6 +67,9 @@ bool ExplosionEffect::supported()
bool ExplosionEffect::loadData()
{
mInited = true;
if (!ShaderManager::instance()->isValid()) {
return false;
}
QString shadername("explosion");
const QString fragmentshader = KGlobal::dirs()->findResource("data", "kwin/explosion.frag");
QString starttexture = KGlobal::dirs()->findResource("data", "kwin/explosion-start.png");
@ -113,8 +116,6 @@ void ExplosionEffect::prePaintScreen(ScreenPrePaintData& data, int time)
void ExplosionEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)
{
if (mWindows.contains(w)) {
if (mValid && !mInited)
mValid = loadData();
if (mValid) {
mWindows[ w ] += time / animationTime(700.0); // complete change in 700ms
if (mWindows[ w ] < 1) {
@ -190,6 +191,12 @@ void ExplosionEffect::slotWindowClosed(EffectWindow* c)
if (e && e != this)
return;
if (c->isOnCurrentDesktop() && !c->isMinimized()) {
if (mValid && !mInited)
mValid = loadData();
if (!mValid) {
// don't add to list as we cannot animate this window;
return;
}
mWindows[ c ] = 0; // count up to 1
c->addRepaintFull();
c->refWindow();

2
effects/highlightwindow/highlightwindow.desktop
View file

@ -89,7 +89,7 @@ Comment[fi]=Korostaa ikkunaa, jonka kohdalla hiiri on tehtävärivillä
Comment[fr]=Met en évidence la fenêtre appropriée lorsque le curseur survole son icône dans le gestionnaire des tâches
Comment[fy]=Markearje it juste finster as jo sweve boppe de taakbalke ynfier
Comment[ga]=Aibhsigh an fhuinneog chuí nuair atá an cúrsóir os cionn iontrála sa tascbharra
Comment[gl]=Realza a xanela apropriada ao pasar o rato sobre a barra de tarefas
Comment[gl]=Realza a xanela apropiada ao pasar o rato sobre a barra de tarefas
Comment[he]=הבלטת החלון המתאים במעבר בין פריטים בשורת המשימות
Comment[hr]=Označi odgovarajući prozor kad se mišem prijeđe preko stavki u programskoj traci
Comment[hu]=Ha az egérmutató egy ablakbejegyzés fölé kerül a feladatsávon, a megfelelő ablak kiemelést kap