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

Interpolate between brightness changes when highlighting window under cursor.

Browse source 
svn path=/branches/work/kwin_composite/; revision=648132
This commit is contained in:
Rivo Laks 2007-03-30 15:35:19 +00:00
parent 64051d3cf8
commit 9027b501c8
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
effects/presentwindows.cpp
View file

@ -81,6 +81,13 @@ void PresentWindowsEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion*
Client* c = static_cast< Client* >( w->window() ); Client* c = static_cast< Client* >( w->window() );
if( mActiveness < 1.0f && (c->isMinimized() || !c->isOnCurrentDesktop() )) if( mActiveness < 1.0f && (c->isMinimized() || !c->isOnCurrentDesktop() ))
*mask |= Scene::PAINT_WINDOW_TRANSLUCENT; *mask |= Scene::PAINT_WINDOW_TRANSLUCENT;
// Change window's hover according to cursor pos
WindowData& windata = mWindowData[w->window()];
const float hoverchangetime = 200;
if( windata.area.contains(cursorPos()) )
windata.hover = qMin(1.0f, windata.hover + time / hoverchangetime);
else
windata.hover = qMax(0.0f, windata.hover - time / hoverchangetime);
} }
effects->prePaintWindow( w, mask, paint, clip, time ); effects->prePaintWindow( w, mask, paint, clip, time );
@ -97,8 +104,7 @@ void PresentWindowsEffect::paintWindow( EffectWindow* w, int mask, QRegion regio
data.xTranslate = (int)interpolate(data.xTranslate, windata.area.left() - w->window()->x(), mActiveness); data.xTranslate = (int)interpolate(data.xTranslate, windata.area.left() - w->window()->x(), mActiveness);
data.yTranslate = (int)interpolate(data.yTranslate, windata.area.top() - w->window()->y(), mActiveness); data.yTranslate = (int)interpolate(data.yTranslate, windata.area.top() - w->window()->y(), mActiveness);
// Darken all windows except for the one under the cursor // Darken all windows except for the one under the cursor
if( !windata.area.contains(cursorPos()) ) data.brightness *= interpolate(1.0, 0.7, mActiveness * (1.0f - windata.hover));
data.brightness *= interpolate(1.0, 0.7, mActiveness);
// If it's minimized window or on another desktop and effect is not // If it's minimized window or on another desktop and effect is not
// fully active, then apply some transparency // fully active, then apply some transparency
Client* c = static_cast< Client* >( w->window() ); Client* c = static_cast< Client* >( w->window() );
@ -219,6 +225,7 @@ void PresentWindowsEffect::calculateWindowTransformationsDumb(ClientList clientl
// Row/Col of this window // Row/Col of this window
int r = i / cols; int r = i / cols;
int c = i % cols; int c = i % cols;
mWindowData[client].hover = 0.0f;
mWindowData[client].scale = qMin(cellwidth / (float)client->width(), cellheight / (float)client->height()); mWindowData[client].scale = qMin(cellwidth / (float)client->width(), cellheight / (float)client->height());
mWindowData[client].area.setLeft(placementRect.left() + cellwidth * c); mWindowData[client].area.setLeft(placementRect.left() + cellwidth * c);
mWindowData[client].area.setTop(placementRect.top() + cellheight * r); mWindowData[client].area.setTop(placementRect.top() + cellheight * r);
@ -375,6 +382,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(ClientList clie
geom.setY( geom.y() + topOffset ); geom.setY( geom.y() + topOffset );
mWindowData[client].area = geom; mWindowData[client].area = geom;
mWindowData[client].scale = geom.width() / (float)client->width(); mWindowData[client].scale = geom.width() / (float)client->width();
mWindowData[client].hover = 0.0f;
kDebug() << k_funcinfo << "Window '" << client->caption() << "' gets moved to (" << kDebug() << k_funcinfo << "Window '" << client->caption() << "' gets moved to (" <<
mWindowData[client].area.left() << "; " << mWindowData[client].area.right() << mWindowData[client].area.left() << "; " << mWindowData[client].area.right() <<

1
effects/presentwindows.h
View file

@ -74,6 +74,7 @@ class PresentWindowsEffect
{ {
QRect area; QRect area;
float scale; float scale;
float hover;
}; };
QHash<Toplevel*, WindowData> mWindowData; QHash<Toplevel*, WindowData> mWindowData;
}; };