summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/bar/popouts/Background.qml2
-rw-r--r--modules/bar/popouts/Wrapper.qml2
-rw-r--r--modules/dashboard/Background.qml4
-rw-r--r--modules/dashboard/Wrapper.qml2
-rw-r--r--modules/drawers/Backgrounds.qml10
-rw-r--r--modules/drawers/Interactions.qml7
-rw-r--r--modules/launcher/Background.qml2
-rw-r--r--modules/launcher/Wrapper.qml2
-rw-r--r--modules/notifications/Background.qml4
-rw-r--r--modules/notifications/Wrapper.qml2
-rw-r--r--modules/osd/Background.qml2
-rw-r--r--modules/osd/Wrapper.qml2
-rw-r--r--modules/session/Background.qml2
-rw-r--r--modules/session/Wrapper.qml2
14 files changed, 21 insertions, 24 deletions
diff --git a/modules/bar/popouts/Background.qml b/modules/bar/popouts/Background.qml
index 6dafaff..2a6d6d2 100644
--- a/modules/bar/popouts/Background.qml
+++ b/modules/bar/popouts/Background.qml
@@ -34,7 +34,7 @@ ShapePath {
}
PathLine {
relativeX: 0
- relativeY: root.wrapper.height - root.rounding * 4
+ relativeY: root.wrapper.height - root.rounding * 2
}
PathArc {
relativeX: root.invertBottomRounding ? root.roundingX : -root.roundingX
diff --git a/modules/bar/popouts/Wrapper.qml b/modules/bar/popouts/Wrapper.qml
index 0b6fba8..47b8af2 100644
--- a/modules/bar/popouts/Wrapper.qml
+++ b/modules/bar/popouts/Wrapper.qml
@@ -11,7 +11,7 @@ Item {
visible: width > 0 && height > 0
implicitWidth: content.implicitWidth
- implicitHeight: content.implicitHeight + BorderConfig.rounding * 2
+ implicitHeight: content.implicitHeight
Content {
id: content
diff --git a/modules/dashboard/Background.qml b/modules/dashboard/Background.qml
index 0ab6658..ebc60c8 100644
--- a/modules/dashboard/Background.qml
+++ b/modules/dashboard/Background.qml
@@ -35,7 +35,7 @@ ShapePath {
}
PathLine {
- relativeX: root.wrapper.width - root.rounding * 4
+ relativeX: root.wrapper.width - root.rounding * 2
relativeY: 0
}
@@ -65,7 +65,5 @@ ShapePath {
easing.type: Easing.BezierSpline
easing.bezierCurve: Appearance.anim.curves.standard
}
-
}
-
}
diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml
index 8d3d2f7..e043904 100644
--- a/modules/dashboard/Wrapper.qml
+++ b/modules/dashboard/Wrapper.qml
@@ -9,7 +9,7 @@ Item {
visible: height > 0
implicitHeight: 0
- implicitWidth: content.implicitWidth + BorderConfig.rounding * 2
+ implicitWidth: content.implicitWidth
states: State {
name: "visible"
diff --git a/modules/drawers/Backgrounds.qml b/modules/drawers/Backgrounds.qml
index 3dcc8ad..c6628ae 100644
--- a/modules/drawers/Backgrounds.qml
+++ b/modules/drawers/Backgrounds.qml
@@ -22,7 +22,7 @@ Shape {
wrapper: panels.osd
startX: root.width - panels.session.width
- startY: (root.height - wrapper.height) / 2
+ startY: (root.height - wrapper.height) / 2 - rounding
}
Notifications.Background {
@@ -36,20 +36,20 @@ Shape {
wrapper: panels.session
startX: root.width
- startY: (root.height - wrapper.height) / 2
+ startY: (root.height - wrapper.height) / 2 - rounding
}
Launcher.Background {
wrapper: panels.launcher
- startX: (root.width - wrapper.width) / 2
+ startX: (root.width - wrapper.width) / 2 - rounding
startY: root.height
}
Dashboard.Background {
wrapper: panels.dashboard
- startX: (root.width - wrapper.width) / 2
+ startX: (root.width - wrapper.width) / 2 - rounding
startY: 0
}
@@ -58,6 +58,6 @@ Shape {
invertBottomRounding: wrapper.y + wrapper.height - BorderConfig.rounding >= root.height
startX: 0
- startY: wrapper.y
+ startY: wrapper.y - rounding
}
}
diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml
index 03c4e5e..42e423d 100644
--- a/modules/drawers/Interactions.qml
+++ b/modules/drawers/Interactions.qml
@@ -16,7 +16,7 @@ MouseArea {
function withinPanelHeight(panel: Item, x: real, y: real): bool {
const panelY = BorderConfig.thickness + panel.y;
- return y >= panelY && y <= panelY + panel.height;
+ return y >= panelY - BorderConfig.rounding && y <= panelY + panel.height + BorderConfig.rounding;
}
function inRightPanel(panel: Item, x: real, y: real): bool {
@@ -25,7 +25,7 @@ MouseArea {
function inTopPanel(panel: Item, x: real, y: real): bool {
const panelX = BorderConfig.thickness + panel.x;
- return y < BorderConfig.thickness + panel.y + panel.height && x >= panelX && x <= panelX + panel.width;
+ return y < BorderConfig.thickness + panel.y + panel.height && x >= panelX - BorderConfig.rounding && x <= panelX + panel.width + BorderConfig.rounding;
}
anchors.fill: parent
@@ -57,8 +57,7 @@ MouseArea {
}
// Show dashboard on hover
- const showDashboard = root.inTopPanel(panels.dashboard, x, y);
- visibilities.dashboard = showDashboard;
+ visibilities.dashboard = inTopPanel(panels.dashboard, x, y);
// Show popouts on hover
const popout = panels.popouts;
diff --git a/modules/launcher/Background.qml b/modules/launcher/Background.qml
index 672b153..5a3d5d4 100644
--- a/modules/launcher/Background.qml
+++ b/modules/launcher/Background.qml
@@ -32,7 +32,7 @@ ShapePath {
radiusY: Math.min(root.rounding, root.wrapper.height)
}
PathLine {
- relativeX: root.wrapper.width - root.rounding * 4
+ relativeX: root.wrapper.width - root.rounding * 2
relativeY: 0
}
PathArc {
diff --git a/modules/launcher/Wrapper.qml b/modules/launcher/Wrapper.qml
index 27f2150..86c8b95 100644
--- a/modules/launcher/Wrapper.qml
+++ b/modules/launcher/Wrapper.qml
@@ -9,7 +9,7 @@ Item {
visible: height > 0
implicitHeight: 0
- implicitWidth: content.implicitWidth + BorderConfig.rounding * 2
+ implicitWidth: content.implicitWidth
states: State {
name: "visible"
diff --git a/modules/notifications/Background.qml b/modules/notifications/Background.qml
index ea9e3a1..2fd05f8 100644
--- a/modules/notifications/Background.qml
+++ b/modules/notifications/Background.qml
@@ -17,7 +17,7 @@ ShapePath {
fillColor: BorderConfig.colour
PathLine {
- relativeX: -root.wrapper.width
+ relativeX: -(root.wrapper.width + root.rounding)
relativeY: 0
}
PathArc {
@@ -38,7 +38,7 @@ ShapePath {
direction: root.fullHeightRounding < 0 ? PathArc.Clockwise : PathArc.Counterclockwise
}
PathLine {
- relativeX: root.wrapper.height > 0 ? root.wrapper.width - root.rounding * 2 - root.fullHeightRounding : root.wrapper.width
+ relativeX: root.wrapper.height > 0 ? root.wrapper.width - root.rounding - root.fullHeightRounding : root.wrapper.width
relativeY: 0
}
PathArc {
diff --git a/modules/notifications/Wrapper.qml b/modules/notifications/Wrapper.qml
index a3a2631..27b9219 100644
--- a/modules/notifications/Wrapper.qml
+++ b/modules/notifications/Wrapper.qml
@@ -6,7 +6,7 @@ Item {
visible: height > 0
implicitHeight: content.implicitHeight
- implicitWidth: content.implicitWidth + BorderConfig.rounding
+ implicitWidth: content.implicitWidth
Content {
id: content
diff --git a/modules/osd/Background.qml b/modules/osd/Background.qml
index 75940d3..551637b 100644
--- a/modules/osd/Background.qml
+++ b/modules/osd/Background.qml
@@ -33,7 +33,7 @@ ShapePath {
}
PathLine {
relativeX: 0
- relativeY: root.wrapper.height - root.rounding * 4
+ relativeY: root.wrapper.height - root.rounding * 2
}
PathArc {
relativeX: root.roundingX
diff --git a/modules/osd/Wrapper.qml b/modules/osd/Wrapper.qml
index d2564ef..2969002 100644
--- a/modules/osd/Wrapper.qml
+++ b/modules/osd/Wrapper.qml
@@ -11,7 +11,7 @@ Item {
visible: width > 0
implicitWidth: 0
- implicitHeight: content.implicitHeight + BorderConfig.rounding * 2
+ implicitHeight: content.implicitHeight
states: State {
name: "visible"
diff --git a/modules/session/Background.qml b/modules/session/Background.qml
index 75940d3..551637b 100644
--- a/modules/session/Background.qml
+++ b/modules/session/Background.qml
@@ -33,7 +33,7 @@ ShapePath {
}
PathLine {
relativeX: 0
- relativeY: root.wrapper.height - root.rounding * 4
+ relativeY: root.wrapper.height - root.rounding * 2
}
PathArc {
relativeX: root.roundingX
diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml
index d92e22c..db7105e 100644
--- a/modules/session/Wrapper.qml
+++ b/modules/session/Wrapper.qml
@@ -10,7 +10,7 @@ Item {
visible: width > 0
implicitWidth: 0
- implicitHeight: content.implicitHeight + BorderConfig.rounding * 2
+ implicitHeight: content.implicitHeight
states: State {
name: "visible"
generated by cgit v1.2.3-freya (git 2.51.1) at 2026-01-20 07:30:18 +0000