From 58225c286b49fe467c4e46df4b7a1a855250eeb7 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Fri, 9 Mar 2012 14:59:37 +0100 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwintabbox/kwintabbox.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index 580309d35d..0883f481cb 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -124,6 +124,7 @@ X-KDE-Keywords=window,windows,switcher,window switcher,switching,window switchin X-KDE-Keywords[ca]=finestra,finestres,commutador,commutador de finestres,commutació,commutació de finestres,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[ca@valencia]=finestra,finestres,commutador,commutador de finestres,commutació,commutació de finestres,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[da]=vindue,vinduer,skifter,vinduesskifter,skift,alttab,alt-tab,alt+tab,alt tab +X-KDE-Keywords[de]=fenster,umschalter,fensterumschalter,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[es]=ventana,ventanas,conmutador,conmutador de ventanas,conmutación,conmutación de ventanas,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[et]=aken,aknad,lülitaja,akende vahetaja,vahetamine,lülitamine,akende lülitamine,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[fi]=ikkuna,ikkunat,vaihtaja,vaihto,ikkunan vaihtaja,vaihtaminen,ikkunan vaihtaminen,ikkunan vaihto,alttab,alt-tab,alt+tab,alt tab,altsarkain,alt-sarkain,alt+sarkain,alt sarkain From 63ab501557153f053ec2467b40398cb6aff02f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sun, 11 Mar 2012 18:45:17 +0100 Subject: [PATCH 2/2] zoom untracked towards cursor --- effects/zoom/zoom.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp index 4131399462..dd8c48d768 100644 --- a/effects/zoom/zoom.cpp +++ b/effects/zoom/zoom.cpp @@ -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(); }