From d174736bf626be98f59b678ce0460a1125b6b864 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 26 May 2026 12:54:42 +0200 Subject: [PATCH] fix screencorners not disappearing in fullscreen --- Colors.qml | 32 ++++----- modules/corners/ScreenCorners.qml | 104 ++++++++++++++++++++++-------- 2 files changed, 93 insertions(+), 43 deletions(-) diff --git a/Colors.qml b/Colors.qml index dc56b37..fb96939 100644 --- a/Colors.qml +++ b/Colors.qml @@ -3,24 +3,24 @@ import QtQuick QtObject { // --- The Backgrounds (Darkest to Lightest) --- - readonly property color base00: "#262427" // Default Background - readonly property color base01: "#3b393c" // Lighter Background (Status bars, panels) - readonly property color base02: "#514f52" // Selection Background - readonly property color base03: "#676567" // Comments, Invisibles, line highlighting + readonly property color base00: "#11121d" // Default Background + readonly property color base01: "#212234" // Lighter Background (Status bars, panels) + readonly property color base02: "#212234" // Selection Background + readonly property color base03: "#353945" // Comments, Invisibles, line highlighting // --- The Foregrounds (Darkest to Lightest) --- - readonly property color base04: "#7c7b7d" // Dark Foreground (Used for status bars) - readonly property color base05: "#fcfcfc" // Default Foreground, Caret - readonly property color base06: "#eae9eb" // Light Foreground (Rarely used) - readonly property color base07: "#fcfcfc" // Lightest Foreground + readonly property color base04: "#4a5057" // Dark Foreground (Used for status bars) + readonly property color base05: "#a0a8cd" // Default Foreground, Caret + readonly property color base06: "#abb2bf" // Light Foreground (Rarely used) + readonly property color base07: "#bcc2dc" // Lightest Foreground // --- The Accent Colors --- - readonly property color base08: "#ff7272" // Red (Variables, errors) - readonly property color base09: "#fc9d6f" // Orange (Integers, booleans, constants) - readonly property color base0A: "#ffca58" // Yellow (Classes, search text bg, warnings) - readonly property color base0B: "#bcdf59" // Green (Strings, success states) - readonly property color base0C: "#aee8f4" // Cyan (Support, regex, escape chars) - readonly property color base0D: "#49cae4" // Blue (Functions, methods, headings) - readonly property color base0E: "#a093e2" // Purple/Mauve (Keywords, storage, selectors) - readonly property color base0F: "#ff8787" // Brown/Flamingo (Deprecated, embedded tags) + readonly property color base08: "#ee6d85" // Red (Variables, errors) + readonly property color base09: "#f6955b" // Orange (Integers, booleans, constants) + readonly property color base0A: "#d7a65f" // Yellow (Classes, search text bg, warnings) + readonly property color base0B: "#95c561" // Green (Strings, success states) + readonly property color base0C: "#9fbbf3" // Cyan (Support, regex, escape chars) + readonly property color base0D: "#7199ee" // Blue (Functions, methods, headings) + readonly property color base0E: "#a485dd" // Purple/Mauve (Keywords, storage, selectors) + readonly property color base0F: "#773440" // Brown/Flamingo (Deprecated, embedded tags) } diff --git a/modules/corners/ScreenCorners.qml b/modules/corners/ScreenCorners.qml index 223ec01..d5728a3 100644 --- a/modules/corners/ScreenCorners.qml +++ b/modules/corners/ScreenCorners.qml @@ -14,10 +14,12 @@ Item { required property var modelData screen: modelData visible: Config.rounding > 0 - exclusionMode: ExclusionMode.Ignore layer: WlrLayer.Top - anchors { top: true; left: true } - margins.top: Config.barHeight + anchors { + top: true + left: true + } +// margins.top: Config.barHeight implicitWidth: Config.rounding implicitHeight: Config.rounding color: "transparent" @@ -28,14 +30,23 @@ Item { ShapePath { fillColor: Qt.rgba(Colors.base00.r, Colors.base00.g, Colors.base00.b, Config.opacity) strokeWidth: -1 - startX: 0; startY: 0 - PathLine { x: tlWin.implicitWidth; y: 0 } + startX: 0 + startY: 0 + PathLine { + x: tlWin.implicitWidth + y: 0 + } PathArc { - x: 0; y: tlWin.implicitHeight - radiusX: tlWin.implicitWidth; radiusY: tlWin.implicitHeight + x: 0 + y: tlWin.implicitHeight + radiusX: tlWin.implicitWidth + radiusY: tlWin.implicitHeight direction: PathArc.Counterclockwise } - PathLine { x: 0; y: 0 } + PathLine { + x: 0 + y: 0 + } } } } @@ -51,7 +62,10 @@ Item { visible: Config.rounding > 0 exclusionMode: ExclusionMode.Ignore layer: WlrLayer.Overlay - anchors { top: true; right: true } + anchors { + top: true + right: true + } margins.top: Config.barHeight implicitWidth: Config.rounding implicitHeight: Config.rounding @@ -63,15 +77,27 @@ Item { ShapePath { fillColor: Qt.rgba(Colors.base00.r, Colors.base00.g, Colors.base00.b, Config.opacity) strokeWidth: -1 - startX: 0; startY: 0 - PathLine { x: trWin.implicitWidth; y: 0 } - PathLine { x: trWin.implicitWidth; y: trWin.implicitHeight } + startX: 0 + startY: 0 + PathLine { + x: trWin.implicitWidth + y: 0 + } + PathLine { + x: trWin.implicitWidth + y: trWin.implicitHeight + } PathArc { - x: 0; y: 0 - radiusX: trWin.implicitWidth; radiusY: trWin.implicitHeight + x: 0 + y: 0 + radiusX: trWin.implicitWidth + radiusY: trWin.implicitHeight direction: PathArc.Counterclockwise } - PathLine { x: 0; y: 0 } + PathLine { + x: 0 + y: 0 + } } } } @@ -87,7 +113,10 @@ Item { visible: Config.rounding > 0 exclusionMode: ExclusionMode.Ignore layer: WlrLayer.Overlay - anchors { bottom: true; left: true } + anchors { + bottom: true + left: true + } implicitWidth: Config.rounding implicitHeight: Config.rounding color: "transparent" @@ -98,14 +127,23 @@ Item { ShapePath { fillColor: Qt.rgba(Colors.base00.r, Colors.base00.g, Colors.base00.b, Config.opacity) strokeWidth: -1 - startX: 0; startY: 0 + startX: 0 + startY: 0 PathArc { - x: blWin.implicitWidth; y: blWin.implicitHeight - radiusX: blWin.implicitWidth; radiusY: blWin.implicitHeight + x: blWin.implicitWidth + y: blWin.implicitHeight + radiusX: blWin.implicitWidth + radiusY: blWin.implicitHeight direction: PathArc.Counterclockwise } - PathLine { x: 0; y: blWin.implicitHeight } - PathLine { x: 0; y: 0 } + PathLine { + x: 0 + y: blWin.implicitHeight + } + PathLine { + x: 0 + y: 0 + } } } } @@ -121,7 +159,10 @@ Item { visible: Config.rounding > 0 exclusionMode: ExclusionMode.Ignore layer: WlrLayer.Overlay - anchors { bottom: true; right: true } + anchors { + bottom: true + right: true + } implicitWidth: Config.rounding implicitHeight: Config.rounding color: "transparent" @@ -132,14 +173,23 @@ Item { ShapePath { fillColor: Qt.rgba(Colors.base00.r, Colors.base00.g, Colors.base00.b, Config.opacity) strokeWidth: -1 - startX: brWin.implicitWidth; startY: brWin.implicitHeight - PathLine { x: 0; y: brWin.implicitHeight } + startX: brWin.implicitWidth + startY: brWin.implicitHeight + PathLine { + x: 0 + y: brWin.implicitHeight + } PathArc { - x: brWin.implicitWidth; y: 0 - radiusX: brWin.implicitWidth; radiusY: brWin.implicitHeight + x: brWin.implicitWidth + y: 0 + radiusX: brWin.implicitWidth + radiusY: brWin.implicitHeight direction: PathArc.Counterclockwise } - PathLine { x: brWin.implicitWidth; y: brWin.implicitHeight } + PathLine { + x: brWin.implicitWidth + y: brWin.implicitHeight + } } } }