Jacopo De Simoi
1 month ago
parent
d3dd27bd41
commit
6e3c79a2fa
22 changed files with 184 additions and 184 deletions
@ -1,46 +1,46 @@ |
||||
From 00309fc3d23fa111d3edf91b9732dffa6cab67c1 Mon Sep 17 00:00:00 2001
|
||||
From 914aa331e609bf074ed24fe4206635e14bab386e Mon Sep 17 00:00:00 2001
|
||||
From: Jacopo De Simoi <wilderjds@protonmail.com>
|
||||
Date: Tue, 24 Jun 2025 13:19:24 +0200
|
||||
Subject: [PATCH 08/21] Use geometry relative to the cutout
|
||||
Subject: [PATCH 08/22] Use geometry relative to the cutout
|
||||
|
||||
---
|
||||
src/tiles/tile.cpp | 19 +++++++++----------
|
||||
1 file changed, 9 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/tiles/tile.cpp b/src/tiles/tile.cpp
|
||||
index ff6441f7f2..2e474479bd 100644
|
||||
index a94e2005ce..7c1918f633 100644
|
||||
--- a/src/tiles/tile.cpp
|
||||
+++ b/src/tiles/tile.cpp
|
||||
@@ -152,20 +152,19 @@ QRectF Tile::relativeGeometry() const
|
||||
@@ -152,20 +152,19 @@ RectF Tile::relativeGeometry() const
|
||||
|
||||
QRectF Tile::absoluteGeometry() const
|
||||
RectF Tile::absoluteGeometry() const
|
||||
{
|
||||
- const QRectF geom = m_tiling->output()->geometryF();
|
||||
- return QRectF(std::round(geom.x() + m_relativeGeometry.x() * geom.width()),
|
||||
- std::round(geom.y() + m_relativeGeometry.y() * geom.height()),
|
||||
- std::round(m_relativeGeometry.width() * geom.width()),
|
||||
- std::round(m_relativeGeometry.height() * geom.height()));
|
||||
- const RectF geom = m_tiling->output()->geometryF();
|
||||
- return RectF(std::round(geom.x() + m_relativeGeometry.x() * geom.width()),
|
||||
- std::round(geom.y() + m_relativeGeometry.y() * geom.height()),
|
||||
- std::round(m_relativeGeometry.width() * geom.width()),
|
||||
- std::round(m_relativeGeometry.height() * geom.height()));
|
||||
-}
|
||||
+ qreal cutoutSize = m_tiling->output()->defaultPadding() + m_tiling->output()->defaultBorder();
|
||||
+ const QMarginsF cutout = QMarginsF(cutoutSize, cutoutSize, cutoutSize, cutoutSize);
|
||||
+ const QRectF geom = m_tiling->output()->geometryF() - cutout;
|
||||
+ return QRectF(geom.x() + m_relativeGeometry.x() * geom.width(),
|
||||
+ geom.y() + m_relativeGeometry.y() * geom.height(),
|
||||
+ m_relativeGeometry.width() * geom.width(),
|
||||
+ m_relativeGeometry.height() * geom.height());
|
||||
+ const RectF geom = m_tiling->output()->geometryF() - cutout;
|
||||
+ return RectF(geom.x() + m_relativeGeometry.x() * geom.width(),
|
||||
+ geom.y() + m_relativeGeometry.y() * geom.height(),
|
||||
+ m_relativeGeometry.width() * geom.width(),
|
||||
+ m_relativeGeometry.height() * geom.height());
|
||||
+} // the code in master is rounding, but why???
|
||||
|
||||
QRectF Tile::absoluteGeometryInScreen() const
|
||||
RectF Tile::absoluteGeometryInScreen() const
|
||||
{
|
||||
const QRectF geom = m_tiling->output()->geometryF();
|
||||
- return QRectF(std::round(m_relativeGeometry.x() * geom.width()),
|
||||
- std::round(m_relativeGeometry.y() * geom.height()),
|
||||
- std::round(m_relativeGeometry.width() * geom.width()),
|
||||
- std::round(m_relativeGeometry.height() * geom.height()));
|
||||
const RectF geom = m_tiling->output()->geometryF();
|
||||
- return RectF(std::round(m_relativeGeometry.x() * geom.width()),
|
||||
- std::round(m_relativeGeometry.y() * geom.height()),
|
||||
- std::round(m_relativeGeometry.width() * geom.width()),
|
||||
- std::round(m_relativeGeometry.height() * geom.height()));
|
||||
+ return absoluteGeometry().translated(-geom.topLeft());
|
||||
}
|
||||
|
||||
QRectF Tile::windowGeometry() const
|
||||
RectF Tile::windowGeometry() const
|
||||
--
|
||||
2.51.2
|
||||
2.52.0
|
||||
|
||||
|
||||
@ -1,18 +1,17 @@ |
||||
From 4b80a192a5ee7a14fe45aee9c7dcaa046e47d572 Mon Sep 17 00:00:00 2001
|
||||
From 8a2f52d14e0652c1dbfe5224dea6d6fb0de52d4e Mon Sep 17 00:00:00 2001
|
||||
From: Jacopo De Simoi <wilderjds@protonmail.com>
|
||||
Date: Tue, 27 Jan 2026 23:11:00 -0500
|
||||
Subject: [PATCH 22/22] [workspace] Do not move my tiles around when desktop
|
||||
changes.
|
||||
Subject: [PATCH 22/22] Do not move my tiles around when desktop changes.
|
||||
|
||||
---
|
||||
src/workspace.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/workspace.cpp b/src/workspace.cpp
|
||||
index 034c61e31b..01ad3d1d20 100644
|
||||
index 243b3babe0..101c753350 100644
|
||||
--- a/src/workspace.cpp
|
||||
+++ b/src/workspace.cpp
|
||||
@@ -976,8 +976,10 @@ void Workspace::updateWindowVisibilityAndActivateOnDesktopChange(VirtualDesktop
|
||||
@@ -1105,8 +1105,10 @@ void Workspace::updateWindowVisibilityAndActivateOnDesktopChange(VirtualDesktop
|
||||
tile = candidate;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue