From 5d0e3839249efce42643d30689a696e4e6de9975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 22 Jan 2013 00:29:55 +0100 Subject: [PATCH 1/5] don't stopMousePolling when not started REVIEW: 108536 BUG: 313655 --- effects/mouseclick/mouseclick.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/effects/mouseclick/mouseclick.cpp b/effects/mouseclick/mouseclick.cpp index 0b76074a6d..7f13a2045d 100644 --- a/effects/mouseclick/mouseclick.cpp +++ b/effects/mouseclick/mouseclick.cpp @@ -68,7 +68,8 @@ MouseClickEffect::~MouseClickEffect() if (!s_XrBuffer.isNull()) XFreePixmap(display(), s_XrBuffer.handle()); #endif - effects->stopMousePolling(); + if (m_enabled) + effects->stopMousePolling(); foreach (const MouseEvent* click, m_clicks) { delete click; } From ad36e510e4a380b9127b50dc6c46bad114018854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Fri, 18 Jan 2013 21:43:27 +0100 Subject: [PATCH 2/5] don't zoom or clamp windows on effect start/end REVIEW: 108477 BUG: 294428 --- effects/presentwindows/presentwindows.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index 100d5ec0ab..ff53aefea1 100755 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -337,7 +337,7 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region m_motionManager.apply(w, data); QRect rect = m_motionManager.transformedGeometry(w).toRect(); - if (m_activated && winData->highlight > 0.0) { + if (m_activated && winData->highlight > 0.0 && !m_motionManager.areWindowsMoving()) { // scale the window (interpolated by the highlight level) to at least 105% or to cover 1/16 of the screen size - yet keep it in screen bounds QRect area = effects->clientArea(FullScreenArea, w); From 6ea8909ae4ecaf7abb7b47684c89eae21ce3c8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 15 Jan 2013 19:13:09 +0100 Subject: [PATCH 3/5] keep tabbox kcm more on the left CC: kde@privat.broulik.de --- kcmkwin/kwintabbox/main.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwintabbox/main.ui b/kcmkwin/kwintabbox/main.ui index 48f77c6f5f..40a5e6d212 100644 --- a/kcmkwin/kwintabbox/main.ui +++ b/kcmkwin/kwintabbox/main.ui @@ -10,7 +10,7 @@ 398 - + From 664f06e0058d46bb8bd634f3ad2527735171e133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Thu, 17 Jan 2013 21:13:04 +0100 Subject: [PATCH 4/5] re-fix resetShowingDesktop invocation was fixed with f9e182068f380fc67b89501bf40f16aa35dd861b broke it with 3433b31a085a6d3f9439532777cab8fdf1cdf663 REVIEW: 108452 BUG: 302248 --- client.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client.cpp b/client.cpp index 0e9c10d0ce..7de2b06353 100644 --- a/client.cpp +++ b/client.cpp @@ -1092,7 +1092,8 @@ void Client::updateVisibility() internalHide(Allowed); return; } - resetShowingDesktop(true); + if (isManaged()) + resetShowingDesktop(true); internalShow(Allowed); } From 9ae3cd36183dddb6f3f8d37928b54522f7e95108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Wed, 16 Jan 2013 14:21:51 +0100 Subject: [PATCH 5/5] turn labels into checkboxes BUG: 313228 --- kcmkwin/kwinoptions/moving.ui | 115 ++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 53 deletions(-) diff --git a/kcmkwin/kwinoptions/moving.ui b/kcmkwin/kwinoptions/moving.ui index 18a3395978..b6cb0bc759 100644 --- a/kcmkwin/kwinoptions/moving.ui +++ b/kcmkwin/kwinoptions/moving.ui @@ -6,12 +6,12 @@ 0 0 - 539 - 352 + 624 + 354 - - + + Qt::Horizontal @@ -24,46 +24,52 @@ - - - + + + + + + Qt::Horizontal + + + + 90 + 20 + + + + + Enable this option if you want a window's geometry to be displayed while it is being moved or resized. The window position relative to the top-left corner of the screen is displayed together with its size. - - - - - - - Display window &geometry when moving or resizing - - geometryTipOn - - + + + + Qt::Horizontal + + + + 100 + 20 + + + + + When enabled, this feature activates the border of maximized windows and allows you to move or resize them, just like for normal windows - - - - - - - Display borders on &maximized windows - - moveResizeMaximized - @@ -196,24 +202,27 @@ - + + + + Qt::Horizontal + + + + 107 + 20 + + + + + Here you can set that windows will be only snapped if you try to overlap them, i.e. they will not be snapped if the windows comes only near another window or border. - - - - - - - Snap windows onl&y when overlapping - - OverlapSnap - @@ -249,22 +258,9 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - + Qt::Horizontal @@ -277,6 +273,19 @@ + + + + Qt::Vertical + + + + 20 + 112 + + + +