vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'KDE/4.8'

icc-effect-5.14.5
Thomas Lübking 2012-03-11 23:50:42 +01:00
parent bfc406e073 63ab501557
commit d50bf4e283
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
effects/zoom/zoom.cpp
View File

@ -268,9 +268,11 @@ void ZoomEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data)
prevPoint = cursorPoint;
break;
case MouseTrackingCentred:
data.xTranslate = qMin(0, qMax(int(displayWidth() - displayWidth() * zoom), int(displayWidth() / 2 - cursorPoint.x() * zoom)));
data.yTranslate = qMin(0, qMax(int(displayHeight() - displayHeight() * zoom), int(displayHeight() / 2 - cursorPoint.y() * zoom)));
prevPoint = cursorPoint;
// fall through
case MouseTrackingDisabled:
data.xTranslate = qMin(0, qMax(int(displayWidth() - displayWidth() * zoom), int(displayWidth() / 2 - prevPoint.x() * zoom)));
data.yTranslate = qMin(0, qMax(int(displayHeight() - displayHeight() * zoom), int(displayHeight() / 2 - prevPoint.y() * zoom)));
break;
case MouseTrackingPush:
if (timeline.state() != QTimeLine::Running) {
@ -293,8 +295,6 @@ void ZoomEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data)
timeline.start();
}
}
// fall through
case MouseTrackingDisabled:
data.xTranslate = - int(prevPoint.x() * (zoom - 1.0));
data.yTranslate = - int(prevPoint.y() * (zoom - 1.0));
break;
@ -381,6 +381,8 @@ void ZoomEffect::zoomIn()
polling = true;
effects->startMousePolling();
}
if (mouseTracking == MouseTrackingDisabled)
prevPoint = QCursor::pos();
effects->addRepaintFull();
}
@ -394,6 +396,8 @@ void ZoomEffect::zoomOut()
effects->stopMousePolling();
}
}
if (mouseTracking == MouseTrackingDisabled)
prevPoint = QCursor::pos();
effects->addRepaintFull();
}