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

[wayland] Properly implement minimize of ShellClient

Browse source 
Summary:
We need to call Workspace::clientHidden when minimizing. Otherwise
Workspace doesn't update the active client and the now minimized
window is still active.

BUG: 366634

Test Plan:
Test case works now and also tested in nested setup that
active window changes.

Reviewers: #kwin, #plasma_on_wayland

Subscribers: plasma-devel, kwin

Tags: #plasma_on_wayland, #kwin

Differential Revision: https://phabricator.kde.org/D2410
This commit is contained in:
Martin Gräßlin 2016-08-11 17:32:39 +02:00
parent bd58d7792f
commit 8bbd53a774
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autotests/integration/shell_client_test.cpp
View file

@ -261,9 +261,7 @@ void TestShellClient::testMinimizeActiveWindow()
QCOMPARE(workspace()->activeClient(), c);
workspace()->slotWindowMinimize();
QEXPECT_FAIL("", "BUG 366634", Continue);
QVERIFY(!c->isActive());
QEXPECT_FAIL("", "BUG 366634", Continue);
QVERIFY(!workspace()->activeClient());
}

7
shell_client.cpp
View file

@ -646,7 +646,7 @@ bool ShellClient::isResizable() const
bool ShellClient::isShown(bool shaded_is_shown) const
{
Q_UNUSED(shaded_is_shown)
return !m_closing && !m_unmapped;
return !m_closing && !m_unmapped && !isMinimized();
}
void ShellClient::hideClient(bool hide)
@ -1228,4 +1228,9 @@ KWayland::Server::XdgShellSurfaceInterface::States ShellClient::xdgSurfaceStates
return states;
}
void ShellClient::doMinimize()
{
workspace()->clientHidden(this);
}
}

1
shell_client.h
View file

@ -137,6 +137,7 @@ protected:
void doResizeSync() override;
bool isWaitingForMoveResizeSync() const override;
bool acceptsFocus() const override;
void doMinimize() override;
private Q_SLOTS:
void clientFullScreenChanged(bool fullScreen);