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

Drop Window::inputGeometry

Browse source 
It's been mostly superseded by Window::hitTest().
This commit is contained in:
Vlad Zahorodnii 2023-03-31 20:18:55 +03:00
parent 3763e4f84b
commit 70353d399d
4 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autotests/integration/decoration_input_test.cpp
View file

@ -496,8 +496,6 @@ void DecorationInputTest::testResizeOutsideWindow()
QVERIFY(window->isDecorated());
QVERIFY(!window->noBorder());
window->move(workspace()->activeOutput()->geometry().center() - QPoint(window->width() / 2, window->height() / 2));
QVERIFY(window->frameGeometry() != window->inputGeometry());
QVERIFY(window->inputGeometry().contains(window->frameGeometry()));
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
// go to border

2
autotests/integration/inputmethod_test.cpp
View file

@ -149,7 +149,7 @@ void InputMethodTest::testOpenClose()
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().value<QSize>(), Qt::red);
QVERIFY(frameGeometryChangedSpy.wait());
QCOMPARE(window->frameGeometry().height(), 1024 - keyboardClient->inputGeometry().height());
QCOMPARE(window->frameGeometry().height(), 1024 - keyboardClient->frameGeometry().height());
// Hide the keyboard
textInput->hideInputPanel();

11
src/window.cpp
View file

@ -395,8 +395,7 @@ bool Window::hitTest(const QPointF &point) const
if (m_surface && m_surface->isMapped()) {
return m_surface->inputSurfaceAt(mapToLocal(point));
}
const QPointF relativePoint = point - inputGeometry().topLeft();
return relativePoint.x() >= 0 && relativePoint.y() >= 0 && relativePoint.x() < inputGeometry().width() && relativePoint.y() < inputGeometry().height();
return exclusiveContains(m_bufferGeometry, point);
}
QPointF Window::mapToFrame(const QPointF &point) const
@ -414,14 +413,6 @@ QPointF Window::mapFromLocal(const QPointF &point) const
return point + bufferGeometry().topLeft();
}
QRectF Window::inputGeometry() const
{
if (isDecorated()) {
return frameGeometry() + decoration()->resizeOnlyBorders();
}
return bufferGeometry();
}
bool Window::isLocalhost() const
{
if (!m_clientMachine) {

8
src/window.h
View file

@ -588,13 +588,7 @@ public:
* Default implementation returns a margins object with all margins set to 0.
*/
QMargins frameMargins() const;
/**
* The geometry of the Window which accepts input events. This might be larger
* than the actual geometry, e.g. to support resizing outside the window.
*
* Default implementation returns same as geometry.
*/
virtual QRectF inputGeometry() const;
virtual QSizeF minSize() const;
virtual QSizeF maxSize() const;
QSizeF size() const;