summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/launcher/Background.qml18
-rw-r--r--modules/launcher/Launcher.qml2
-rw-r--r--modules/notifications/Notifications.qml2
3 files changed, 11 insertions, 11 deletions
diff --git a/modules/launcher/Background.qml b/modules/launcher/Background.qml
index 41305ae..c74adbd 100644
--- a/modules/launcher/Background.qml
+++ b/modules/launcher/Background.qml
@@ -7,10 +7,10 @@ Shape {
id: root
required property real wrapperWidth
- required property real realWrapperHeight
+ required property real wrapperHeight
readonly property real rounding: BorderConfig.rounding
- readonly property real roundingY: Math.min(rounding, realWrapperHeight / 2)
- readonly property real wrapperHeight: realWrapperHeight - 1 // Pixel issues :sob:
+ readonly property bool flatten: wrapperHeight < rounding * 2
+ readonly property real roundingY: flatten ? wrapperHeight / 2 : rounding
preferredRendererType: Shape.CurveRenderer
opacity: Colours.transparency.enabled ? Colours.transparency.base : 1
@@ -19,13 +19,13 @@ Shape {
strokeWidth: -1
fillColor: BorderConfig.colour
- startY: root.wrapperHeight
+ startY: root.wrapperHeight - 1
PathArc {
relativeX: root.rounding
relativeY: -root.roundingY
radiusX: root.rounding
- radiusY: root.roundingY
+ radiusY: Math.min(root.rounding, root.wrapperHeight)
direction: PathArc.Counterclockwise
}
PathLine {
@@ -36,7 +36,7 @@ Shape {
relativeX: root.rounding
relativeY: -root.roundingY
radiusX: root.rounding
- radiusY: root.roundingY
+ radiusY: Math.min(root.rounding, root.wrapperHeight)
}
PathLine {
x: root.wrapperWidth - root.rounding * 2
@@ -45,17 +45,17 @@ Shape {
relativeX: root.rounding
relativeY: root.roundingY
radiusX: root.rounding
- radiusY: root.roundingY
+ radiusY: Math.min(root.rounding, root.wrapperHeight)
}
PathLine {
relativeX: 0
- y: root.wrapperHeight - root.roundingY
+ y: (root.flatten ? root.roundingY : root.wrapperHeight - root.rounding) - 1
}
PathArc {
relativeX: root.rounding
relativeY: root.roundingY
radiusX: root.rounding
- radiusY: root.roundingY
+ radiusY: Math.min(root.rounding, root.wrapperHeight)
direction: PathArc.Counterclockwise
}
diff --git a/modules/launcher/Launcher.qml b/modules/launcher/Launcher.qml
index e0b002b..d3021b0 100644
--- a/modules/launcher/Launcher.qml
+++ b/modules/launcher/Launcher.qml
@@ -39,7 +39,7 @@ Scope {
anchors.bottom: parent.bottom
wrapperWidth: wrapper.width
- realWrapperHeight: Math.min(wrapper.height, content.height)
+ wrapperHeight: Math.min(wrapper.height, content.height)
}
LayerShadow {
diff --git a/modules/notifications/Notifications.qml b/modules/notifications/Notifications.qml
index 9496a7f..2c73802 100644
--- a/modules/notifications/Notifications.qml
+++ b/modules/notifications/Notifications.qml
@@ -15,7 +15,7 @@ Variants {
property bool osdVisible
Timer {
- running: true
+ // running: true
repeat: true
interval: 2000
onTriggered: root.osdVisible = !root.osdVisible