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

present windows: keep highlighted windows in screen

Browse source 
REVIEW: 103574
(cherry picked from commit 629e8d3885129db2be19bd313e07d6fa02caddc1)
This commit is contained in:
Thomas Lübking 2011-12-30 01:18:04 +01:00
parent 48c28a9b3d
commit e1d15d9c21
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
effects/presentwindows/presentwindows.cpp
View file

@ -343,8 +343,9 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region
data.brightness *= interpolate(0.40, 1.0, winData->highlight); data.brightness *= interpolate(0.40, 1.0, winData->highlight);
if (m_motionManager.isManaging(w)) { if (m_motionManager.isManaging(w)) {
if (w->isDesktop()) if (w->isDesktop()) {
effects->paintWindow(w, mask, region, data); effects->paintWindow(w, mask, region, data);
}
m_motionManager.apply(w, data); m_motionManager.apply(w, data);
QRect rect = m_motionManager.transformedGeometry(w).toRect(); QRect rect = m_motionManager.transformedGeometry(w).toRect();
@ -353,8 +354,9 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region
QRect area = effects->clientArea(FullScreenArea, w); QRect area = effects->clientArea(FullScreenArea, w);
QSizeF effSize(w->width()*data.xScale, w->height()*data.yScale); QSizeF effSize(w->width()*data.xScale, w->height()*data.yScale);
float tScale = sqrt((area.width()*area.height()) / (16.0*effSize.width()*effSize.height())); float tScale = sqrt((area.width()*area.height()) / (16.0*effSize.width()*effSize.height()));
if (tScale < 1.05) if (tScale < 1.05) {
tScale = 1.05; tScale = 1.05;
}
if (effSize.width()*tScale > area.width()) if (effSize.width()*tScale > area.width())
tScale = area.width() / effSize.width(); tScale = area.width() / effSize.width();
if (effSize.height()*tScale > area.height()) if (effSize.height()*tScale > area.height())
@ -364,16 +366,21 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region
if (scale < tScale) // don't use lanczos during transition if (scale < tScale) // don't use lanczos during transition
mask &= ~PAINT_WINDOW_LANCZOS; mask &= ~PAINT_WINDOW_LANCZOS;
const QPoint ac = area.center(); const float df = (tScale-1.0f)*0.5f;
const QPoint wc = rect.center(); int tx = qRound(rect.width()*df);
int ty = qRound(rect.height()*df);
QRect tRect(rect.adjusted(-tx, -ty, tx, ty));
tx = qMax(tRect.x(), area.x()) + qMin(0, area.right()-tRect.right());
ty = qMax(tRect.y(), area.y()) + qMin(0, area.bottom()-tRect.bottom());
tx = qRound((tx-rect.x())*winData->highlight);
ty = qRound((ty-rect.y())*winData->highlight);
data.xScale *= scale;
data.yScale *= scale;
const int tx = -w->width()*data.xScale*(scale-1.0)*(0.5+(wc.x() - ac.x())/area.width());
const int ty = -w->height()*data.yScale*(scale-1.0)*(0.5+(wc.y() - ac.y())/area.height());
rect.translate(tx,ty); rect.translate(tx,ty);
rect.setWidth(rect.width()*scale); rect.setWidth(rect.width()*scale);
rect.setHeight(rect.height()*scale); rect.setHeight(rect.height()*scale);
data.xScale *= scale;
data.yScale *= scale;
data.xTranslate += tx; data.xTranslate += tx;
data.yTranslate += ty; data.yTranslate += ty;
} }