From 74ec881d6a8a0693207d18275cebf4f036e467ad Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Jan 2017 07:42:23 +0100 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- packageplugins/scripts/kwin-packagestructure-scripts.desktop | 5 +++++ .../kwin-packagestructure-windowswitcher.desktop | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index 50407642d8..b224011d62 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -11,6 +11,11 @@ Name[ko]=KWin 스크립트 Name[nl]=KWin-script Name[pl]=Skrypt KWin Name[pt]=Programa do KWin +Name[sk]=KWin skript +Name[sr]=К‑винова скрипта +Name[sr@ijekavian]=К‑винова скрипта +Name[sr@ijekavianlatin]=KWinova skripta +Name[sr@latin]=KWinova skripta Name[sv]=Kwin-skript Name[uk]=Скрипт KWin Name[x-test]=xxKWin Scriptxx diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 7ca437076b..6f628e111e 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -11,6 +11,11 @@ Name[ko]=KWin 창 전환기 Name[nl]=KWin-vensterwisselaar Name[pl]=Przełącznik okien KWin Name[pt]=Mudança de Janelas do KWin +Name[sk]=Prepínač okien KWin +Name[sr]=К‑винов мењач прозора +Name[sr@ijekavian]=К‑винов мењач прозора +Name[sr@ijekavianlatin]=KWinov menjač prozora +Name[sr@latin]=KWinov menjač prozora Name[sv]=Kwin-fönsterbyte Name[uk]=Перемикач вікон KWin Name[x-test]=xxKWin Window Switcherxx From 5083adb1b85a7194bd84d170225596ca507b8858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sun, 29 Jan 2017 14:30:43 +0100 Subject: [PATCH 2/2] Call performMoveResize when we got a new geoemtry during resize Summary: So far on a geometry sync we did not call performMoveResize like we do on X11 when getting the sync. This resulted in the clientStepUserMovedResized not getting called during resize and the geometry update effect to not function. BUG: 374869 FIXED-IN: 5.9.1 Test Plan: Geometry hint updates Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D4333 --- autotests/integration/move_resize_window_test.cpp | 2 -- shell_client.cpp | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autotests/integration/move_resize_window_test.cpp b/autotests/integration/move_resize_window_test.cpp index 078f82b873..8ca1c01cba 100644 --- a/autotests/integration/move_resize_window_test.cpp +++ b/autotests/integration/move_resize_window_test.cpp @@ -252,7 +252,6 @@ void MoveResizeWindowTest::testResize() Test::render(surface.data(), QSize(108, 50), Qt::blue); QVERIFY(geometryChangedSpy.wait()); QCOMPARE(c->geometry(), QRect(0, 0, 108, 50)); - QEXPECT_FAIL("", "BUG 374869", Continue); QCOMPARE(clientStepUserMovedResizedSpy.count(), 1); // go down @@ -266,7 +265,6 @@ void MoveResizeWindowTest::testResize() Test::render(surface.data(), QSize(108, 58), Qt::blue); QVERIFY(geometryChangedSpy.wait()); QCOMPARE(c->geometry(), QRect(0, 0, 108, 58)); - QEXPECT_FAIL("", "BUG 374869", Continue); QCOMPARE(clientStepUserMovedResizedSpy.count(), 2); // let's end diff --git a/shell_client.cpp b/shell_client.cpp index 7ad971bd68..c4322f1488 100644 --- a/shell_client.cpp +++ b/shell_client.cpp @@ -508,6 +508,10 @@ void ShellClient::doSetGeometry(const QRect &rect) workspace()->updateClientArea(); } emit geometryShapeChanged(this, old); + + if (isResize()) { + performMoveResize(); + } } void ShellClient::doMove(int x, int y)