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

screen edge: Emit cleanup signals if needed on teardown

Browse source 
The Effects API has one signal screenEdgeApproaching with effects
monitoring the last signal to stay in sync.

If an Edge is destroyed whilst visible, effects currently do not get
notified and it can stay there forever.

This patch emits screenEdgeApproaching if appropriate with a factor of 0
when an edge is destroyed.

BUG: 403354
This commit is contained in:
David Edmundson 2023-05-25 09:59:00 +00:00 committed by Vlad Zahorodnii
parent db10a85efc
commit 3ea701743e
3 changed files with 72 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
autotests/integration/layershellv1window_test.cpp
View file

@ -9,6 +9,7 @@
#include "core/output.h"
#include "main.h"
#include "pointer_input.h"
#include "screenedge.h"
#include "wayland_server.h"
#include "window.h"
#include "workspace.h"
@ -634,35 +635,63 @@ void LayerShellV1WindowTest::testScreenEdge()
QVERIFY(window);
QVERIFY(!window->isActive());
// The layer surface will be hidden and shown when the screen edge is activated or deactivated.
QSignalSpy windowShowSpy(window, &Window::windowShown);
QSignalSpy windowHiddenSpy(window, &Window::windowHidden);
screenEdge->activate();
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
quint32 timestamp = 0;
screenEdge->deactivate();
QVERIFY(windowShowSpy.wait());
QVERIFY(window->isShown());
// The layer surface will be hidden and shown when the screen edge is activated or deactivated.
{
screenEdge->activate();
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
screenEdge->deactivate();
QVERIFY(windowShowSpy.wait());
QVERIFY(window->isShown());
}
// The layer surface will be shown when the screen edge is triggered.
screenEdge->activate();
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
{
screenEdge->activate();
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
Test::pointerMotion(QPointF(640, 1023), 0);
Test::pointerMotion(QPointF(640, 512), 1);
QVERIFY(windowShowSpy.wait());
QVERIFY(window->isShown());
Test::pointerMotion(QPointF(640, 1023), timestamp++);
Test::pointerMotion(QPointF(640, 512), timestamp++);
QVERIFY(windowShowSpy.wait());
QVERIFY(window->isShown());
}
// The approaching state will be reset if the window is shown manually.
{
QSignalSpy approachingSpy(workspace()->screenEdges(), &ScreenEdges::approaching);
screenEdge->activate();
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
Test::pointerMotion(QPointF(640, 1020), timestamp++);
QVERIFY(approachingSpy.last().at(1).toReal() == 0.0);
Test::pointerMotion(QPointF(640, 1021), timestamp++);
QVERIFY(approachingSpy.last().at(1).toReal() != 0.0);
screenEdge->deactivate();
QVERIFY(windowShowSpy.wait());
QVERIFY(window->isShown());
QVERIFY(approachingSpy.last().at(1).toReal() == 0.0);
Test::pointerMotion(QPointF(640, 512), timestamp++);
}
// The layer surface will be shown when the screen edge is destroyed.
screenEdge->activate();
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
{
screenEdge->activate();
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
screenEdge.reset();
QVERIFY(windowShowSpy.wait());
QVERIFY(window->isShown());
screenEdge.reset();
QVERIFY(windowShowSpy.wait());
QVERIFY(window->isShown());
}
}
} // namespace KWin

22
autotests/integration/screenedges_test.cpp
View file

@ -464,6 +464,28 @@ void ScreenEdgesTest::testKdeNetWmScreenEdgeShow()
QVERIFY(windowShownSpy.wait());
QVERIFY(window->isShown());
}
// The approaching state will be reset if the window is shown manually.
{
QSignalSpy approachingSpy(workspace()->screenEdges(), &ScreenEdges::approaching);
enableAutoHide(c.get(), windowId, ElectricBottom);
xcb_flush(c.get());
QVERIFY(windowHiddenSpy.wait());
QVERIFY(!window->isShown());
Test::pointerMotion(QPointF(640, 1020), timestamp++);
QVERIFY(approachingSpy.last().at(1).toReal() == 0.0);
Test::pointerMotion(QPointF(640, 1021), timestamp++);
QVERIFY(approachingSpy.last().at(1).toReal() != 0.0);
enableAutoHide(c.get(), windowId, ElectricNone);
xcb_flush(c.get());
QVERIFY(windowShownSpy.wait());
QVERIFY(window->isShown());
QVERIFY(approachingSpy.last().at(1).toReal() == 0.0);
Test::pointerMotion(QPointF(640, 512), timestamp++);
}
}
} // namespace KWin

1
src/screenedge.cpp
View file

@ -145,6 +145,7 @@ Edge::Edge(ScreenEdges *parent)
Edge::~Edge()
{
stopApproaching();
}
void Edge::reserve()