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

tiles: Adjust padding between windows

Browse source 
Make the total padding between windows equal to the padding against the
screen borders by applying just half of it on the common borders.

Adjust tests accordingly.

BUG: 469720
FIXED-IN: 5.27.6
This commit is contained in:
Ismael Asensio 2023-05-16 20:27:48 +02:00
parent dde4f5d03c
commit 2449b58974
2 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
autotests/integration/tiles_test.cpp
View file

@ -115,9 +115,9 @@ void TilesTest::createSampleLayout()
QCOMPARE(newRightTile->relativeGeometry(), QRectF(0.75, 0, 0.25, 1)); QCOMPARE(newRightTile->relativeGeometry(), QRectF(0.75, 0, 0.25, 1));
QCOMPARE(m_rootTile->windowGeometry(), QRectF(4, 4, 1272, 1016)); QCOMPARE(m_rootTile->windowGeometry(), QRectF(4, 4, 1272, 1016));
QCOMPARE(leftTile->windowGeometry(), QRectF(4, 4, 632, 1016)); QCOMPARE(leftTile->windowGeometry(), QRectF(4, 4, 634, 1016));
QCOMPARE(rightTile->windowGeometry(), QRectF(644, 4, 312, 1016)); QCOMPARE(rightTile->windowGeometry(), QRectF(642, 4, 316, 1016));
QCOMPARE(newRightTile->windowGeometry(), QRectF(964, 4, 312, 1016)); QCOMPARE(newRightTile->windowGeometry(), QRectF(962, 4, 314, 1016));
// Splitting with a different layout direction creates 2 children in the tile // Splitting with a different layout direction creates 2 children in the tile
QVERIFY(!rightTile->isLayout()); QVERIFY(!rightTile->isLayout());
@ -131,12 +131,12 @@ void TilesTest::createSampleLayout()
// geometry of rightTile should be the same // geometry of rightTile should be the same
QCOMPARE(m_rootTile->childCount(), 3); QCOMPARE(m_rootTile->childCount(), 3);
QCOMPARE(rightTile->relativeGeometry(), QRectF(0.5, 0, 0.25, 1)); QCOMPARE(rightTile->relativeGeometry(), QRectF(0.5, 0, 0.25, 1));
QCOMPARE(rightTile->windowGeometry(), QRectF(644, 4, 312, 1016)); QCOMPARE(rightTile->windowGeometry(), QRectF(642, 4, 316, 1016));
QCOMPARE(verticalTopTile->relativeGeometry(), QRectF(0.5, 0, 0.25, 0.5)); QCOMPARE(verticalTopTile->relativeGeometry(), QRectF(0.5, 0, 0.25, 0.5));
QCOMPARE(verticalBottomTile->relativeGeometry(), QRectF(0.5, 0.5, 0.25, 0.5)); QCOMPARE(verticalBottomTile->relativeGeometry(), QRectF(0.5, 0.5, 0.25, 0.5));
QCOMPARE(verticalTopTile->windowGeometry(), QRectF(644, 4, 312, 504)); QCOMPARE(verticalTopTile->windowGeometry(), QRectF(642, 4, 316, 506));
QCOMPARE(verticalBottomTile->windowGeometry(), QRectF(644, 516, 312, 504)); QCOMPARE(verticalBottomTile->windowGeometry(), QRectF(642, 514, 316, 506));
} }
void TilesTest::testWindowInteraction() void TilesTest::testWindowInteraction()
@ -243,7 +243,7 @@ void TilesTest::testAssignedTileDeletion()
QCOMPARE(toplevelConfigureRequestedSpy.last().first().value<QSize>(), middleBottomTile->windowGeometry().toRect().size()); QCOMPARE(toplevelConfigureRequestedSpy.last().first().value<QSize>(), middleBottomTile->windowGeometry().toRect().size());
QCOMPARE(middleBottomTile->windowGeometry().toRect(), QRect(516, 516, 440, 504)); QCOMPARE(middleBottomTile->windowGeometry().toRect(), QRect(514, 514, 444, 506));
middleBottomTile->remove(); middleBottomTile->remove();
@ -292,20 +292,20 @@ void TilesTest::resizeTileFromWindow()
auto leftTile = qobject_cast<CustomTile *>(m_rootTile->childTiles().first()); auto leftTile = qobject_cast<CustomTile *>(m_rootTile->childTiles().first());
QVERIFY(leftTile); QVERIFY(leftTile);
leftTile->setRelativeGeometry({0, 0, 0.4, 1}); leftTile->setRelativeGeometry({0, 0, 0.4, 1});
QCOMPARE(leftTile->windowGeometry(), QRectF(4, 4, 504, 1016)); QCOMPARE(leftTile->windowGeometry(), QRectF(4, 4, 506, 1016));
auto middleTile = qobject_cast<CustomTile *>(m_rootTile->childTiles()[1]); auto middleTile = qobject_cast<CustomTile *>(m_rootTile->childTiles()[1]);
QVERIFY(middleTile); QVERIFY(middleTile);
QCOMPARE(middleTile->windowGeometry(), QRectF(516, 4, 440, 1016)); QCOMPARE(middleTile->windowGeometry(), QRectF(514, 4, 444, 1016));
leftTile->split(CustomTile::LayoutDirection::Vertical); leftTile->split(CustomTile::LayoutDirection::Vertical);
auto topLeftTile = qobject_cast<CustomTile *>(leftTile->childTiles().first()); auto topLeftTile = qobject_cast<CustomTile *>(leftTile->childTiles().first());
QVERIFY(topLeftTile); QVERIFY(topLeftTile);
QCOMPARE(topLeftTile->windowGeometry(), QRectF(4, 4, 504, 504)); QCOMPARE(topLeftTile->windowGeometry(), QRectF(4, 4, 506, 506));
QSignalSpy tileGeometryChangedSpy(topLeftTile, &Tile::windowGeometryChanged); QSignalSpy tileGeometryChangedSpy(topLeftTile, &Tile::windowGeometryChanged);
auto bottomLeftTile = qobject_cast<CustomTile *>(leftTile->childTiles().last()); auto bottomLeftTile = qobject_cast<CustomTile *>(leftTile->childTiles().last());
QVERIFY(bottomLeftTile); QVERIFY(bottomLeftTile);
QCOMPARE(bottomLeftTile->windowGeometry(), QRectF(4, 516, 504, 504)); QCOMPARE(bottomLeftTile->windowGeometry(), QRectF(4, 514, 506, 506));
window->setTile(topLeftTile); window->setTile(topLeftTile);
QVERIFY(surfaceConfigureRequestedSpy.wait()); QVERIFY(surfaceConfigureRequestedSpy.wait());
@ -317,7 +317,7 @@ void TilesTest::resizeTileFromWindow()
QCOMPARE(toplevelConfigureRequestedSpy.last().first().value<QSize>(), topLeftTile->windowGeometry().toRect().size()); QCOMPARE(toplevelConfigureRequestedSpy.last().first().value<QSize>(), topLeftTile->windowGeometry().toRect().size());
Test::render(rootSurface.get(), toplevelConfigureRequestedSpy.last().first().value<QSize>(), Qt::blue); Test::render(rootSurface.get(), toplevelConfigureRequestedSpy.last().first().value<QSize>(), Qt::blue);
QVERIFY(frameGeometryChangedSpy.wait()); QVERIFY(frameGeometryChangedSpy.wait());
QCOMPARE(window->frameGeometry(), QRect(4, 4, 504, 504)); QCOMPARE(window->frameGeometry(), QRect(4, 4, 506, 506));
QCOMPARE(workspace()->activeWindow(), window); QCOMPARE(workspace()->activeWindow(), window);
QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted); QSignalSpy interactiveMoveResizeStartedSpy(window, &Window::interactiveMoveResizeStarted);
@ -356,20 +356,20 @@ void TilesTest::resizeTileFromWindow()
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(); states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated)); QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
QVERIFY(states.testFlag(Test::XdgToplevel::State::Resizing)); QVERIFY(states.testFlag(Test::XdgToplevel::State::Resizing));
QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(512, 504)); QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(516, 508));
// Now render new size. // Now render new size.
root->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>()); root->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
Test::render(rootSurface.get(), toplevelConfigureRequestedSpy.last().first().value<QSize>(), Qt::blue); Test::render(rootSurface.get(), toplevelConfigureRequestedSpy.last().first().value<QSize>(), Qt::blue);
QVERIFY(frameGeometryChangedSpy.wait()); QVERIFY(frameGeometryChangedSpy.wait());
QCOMPARE(window->frameGeometry(), QRect(4, 4, 512, 504)); QCOMPARE(window->frameGeometry(), QRect(4, 4, 516, 508));
QTRY_COMPARE(tileGeometryChangedSpy.count(), 1); QTRY_COMPARE(tileGeometryChangedSpy.count(), 2);
QCOMPARE(window->tile(), topLeftTile); QCOMPARE(window->tile(), topLeftTile);
QCOMPARE(topLeftTile->windowGeometry(), QRect(4, 4, 512, 504)); QCOMPARE(topLeftTile->windowGeometry(), QRect(4, 4, 516, 508));
QCOMPARE(bottomLeftTile->windowGeometry(), QRect(4, 516, 512, 504)); QCOMPARE(bottomLeftTile->windowGeometry(), QRect(4, 516, 516, 504));
QCOMPARE(leftTile->windowGeometry(), QRect(4, 4, 512, 1016)); QCOMPARE(leftTile->windowGeometry(), QRect(4, 4, 516, 1016));
QCOMPARE(middleTile->windowGeometry(), QRect(524, 4, 432, 1016)); QCOMPARE(middleTile->windowGeometry(), QRect(524, 4, 434, 1016));
// Resize vertically // Resize vertically
workspace()->slotWindowResize(); workspace()->slotWindowResize();
@ -398,20 +398,20 @@ void TilesTest::resizeTileFromWindow()
states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>(); states = toplevelConfigureRequestedSpy.last().at(1).value<Test::XdgToplevel::States>();
QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated)); QVERIFY(states.testFlag(Test::XdgToplevel::State::Activated));
QVERIFY(states.testFlag(Test::XdgToplevel::State::Resizing)); QVERIFY(states.testFlag(Test::XdgToplevel::State::Resizing));
QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(512, 512)); QCOMPARE(toplevelConfigureRequestedSpy.last().at(0).toSize(), QSize(518, 518));
// Now render new size. // Now render new size.
root->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>()); root->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last().at(0).value<quint32>());
Test::render(rootSurface.get(), toplevelConfigureRequestedSpy.last().first().value<QSize>(), Qt::blue); Test::render(rootSurface.get(), toplevelConfigureRequestedSpy.last().first().value<QSize>(), Qt::blue);
QVERIFY(frameGeometryChangedSpy.wait()); QVERIFY(frameGeometryChangedSpy.wait());
QCOMPARE(window->frameGeometry(), QRect(4, 4, 512, 512)); QCOMPARE(window->frameGeometry(), QRect(4, 4, 518, 518));
QTRY_COMPARE(tileGeometryChangedSpy.count(), 2); QTRY_COMPARE(tileGeometryChangedSpy.count(), 5);
QCOMPARE(window->tile(), topLeftTile); QCOMPARE(window->tile(), topLeftTile);
QCOMPARE(topLeftTile->windowGeometry(), QRect(4, 4, 512, 512)); QCOMPARE(topLeftTile->windowGeometry(), QRect(4, 4, 518, 518));
QCOMPARE(bottomLeftTile->windowGeometry(), QRect(4, 524, 512, 496)); QCOMPARE(bottomLeftTile->windowGeometry(), QRect(4, 526, 518, 494));
QCOMPARE(leftTile->windowGeometry(), QRect(4, 4, 512, 1016)); QCOMPARE(leftTile->windowGeometry(), QRect(4, 4, 518, 1016));
QCOMPARE(middleTile->windowGeometry(), QRect(524, 4, 432, 1016)); QCOMPARE(middleTile->windowGeometry(), QRect(526, 4, 432, 1016));
} }
} }

9
src/tiles/tile.cpp
View file

@ -138,8 +138,15 @@ QRectF Tile::absoluteGeometryInScreen() const
QRectF Tile::windowGeometry() const QRectF Tile::windowGeometry() const
{ {
// Apply half padding between tiles and full against the screen edges
QMarginsF effectiveMargins;
effectiveMargins.setLeft(m_relativeGeometry.left() > 0.0 ? m_padding / 2.0 : m_padding);
effectiveMargins.setTop(m_relativeGeometry.top() > 0.0 ? m_padding / 2.0 : m_padding);
effectiveMargins.setRight(m_relativeGeometry.right() < 1.0 ? m_padding / 2.0 : m_padding);
effectiveMargins.setBottom(m_relativeGeometry.bottom() < 1.0 ? m_padding / 2.0 : m_padding);
const auto geom = absoluteGeometry(); const auto geom = absoluteGeometry();
return geom.intersected(workspace()->clientArea(MaximizeArea, m_tiling->output(), VirtualDesktopManager::self()->currentDesktop())) - QMarginsF(m_padding, m_padding, m_padding, m_padding); return geom.intersected(workspace()->clientArea(MaximizeArea, m_tiling->output(), VirtualDesktopManager::self()->currentDesktop())) - effectiveMargins;
} }
QRectF Tile::maximizedWindowGeometry() const QRectF Tile::maximizedWindowGeometry() const