From 69cc62cb55177e7233fbe24da49ec62f6c7c33e1 Mon Sep 17 00:00:00 2001 From: chlorospingus Date: Tue, 8 Sep 2026 01:14:21 -0700 Subject: [PATCH] Remove slide animation from mcsr thin macro --- Panes/Launcher.qml | 1 - Panes/Overview.qml | 15 +++++++++------ Thin.qml | 33 ++++++--------------------------- colorkey.frag | 2 +- colorkey.frag.qsb | Bin 1794 -> 1701 bytes 5 files changed, 16 insertions(+), 35 deletions(-) diff --git a/Panes/Launcher.qml b/Panes/Launcher.qml index 8bfbb05..f982b11 100644 --- a/Panes/Launcher.qml +++ b/Panes/Launcher.qml @@ -63,7 +63,6 @@ Item { break; case Qt.Key_Backspace: // If control is held when backspace is pressed - console.log((event.modifiers & 0x4000000).toString(16)) if (event.modifiers & 0x4000000) { input.text = "" } diff --git a/Panes/Overview.qml b/Panes/Overview.qml index 9d8a450..a9c7158 100644 --- a/Panes/Overview.qml +++ b/Panes/Overview.qml @@ -10,7 +10,7 @@ Grid { top: parent.top horizontalCenter: parent.horiontalCenter } - spacing: 6 + spacing: 4 padding: 6 columns: 5 horizontalItemAlignment: Grid.AlignHCenter @@ -20,13 +20,15 @@ Grid { Hyprland.refreshToplevels() } component WorkspaceView: ClippingRectangle { + id: workspaceView color: "#282828" width: 192 radius: 8 topLeftRadius: modelData == 0 ? 12 : this.radius topRightRadius: modelData == 4 ? 12 : this.radius bottomLeftRadius: modelData == 5 ? 12 : this.radius - height: this.width * Hyprland.focusedMonitor?.height / Hyprland.focusedMonitor?.width + property var widthRatio: this.width / Hyprland.focusedMonitor?.width + height: Hyprland.focusedMonitor?.height * widthRatio border { width: 2 color: { @@ -42,6 +44,7 @@ Grid { Behavior on color { ColorAnimation {duration: 150} } } required property var modelData + Image { anchors.fill: parent source: Quickshell.shellPath('assets/wallpaper') @@ -50,10 +53,10 @@ Grid { Repeater { model: Hyprland.toplevels.values.filter(tl => tl.workspace?.id == modelData + 1) delegate: ClippingRectangle { - x: modelData.lastIpcObject.at[0] / 10 - 2 - y: modelData.lastIpcObject.at[1] / 10 - 2 - width: modelData.lastIpcObject.size[0] / 10 - height: modelData.lastIpcObject.size[1] / 10 + x: modelData.lastIpcObject.at[0] * workspaceView.widthRatio - 2 + y: modelData.lastIpcObject.at[1] * workspaceView.widthRatio - 2 + width: modelData.lastIpcObject.size[0] * workspaceView.widthRatio + height: modelData.lastIpcObject.size[1] * workspaceView.widthRatio ScreencopyView { anchors.fill: parent captureSource: modelData.wayland diff --git a/Thin.qml b/Thin.qml index eed97fe..ee1fa2c 100644 --- a/Thin.qml +++ b/Thin.qml @@ -9,33 +9,10 @@ import QtQuick.Effects Item { id: thin property bool open: false - property real pos: 0 - PropertyAnimation on pos { - id: entry - running: false - to: 1 - duration: 400 - easing.type: Easing.OutQuint - } - PropertyAnimation on pos { - id: exit - running: false - to: 0 - duration: 350 - easing.type: Easing.OutQuint - onFinished: thin.open = false - } IpcHandler { target: "thin" - function open() { - thin.open = true - exit.stop() - entry.start() - } - function close() { - entry.stop() - exit.start() - } + function open() { thin.open = true } + function close() { thin.open = false } } PanelWindow { visible: thin.open @@ -47,6 +24,7 @@ Item { implicitWidth: 1080 color: "transparent" WlrLayershell.layer: WlrLayer.Overlay + WlrLayershell.namespace: 'mcsr-thin' RectangularShadow { anchors.fill: pie_wrapper @@ -60,7 +38,7 @@ Item { left: parent.left top: parent.top margins: 12 - leftMargin: 1080 * (1 - thin.pos) + 12 + leftMargin: 12 } width: 210 height: 210 @@ -96,6 +74,7 @@ Item { implicitHeight: 120 color: "transparent" WlrLayershell.layer: WlrLayer.Overlay + WlrLayershell.namespace: 'mcsr-thin' RectangularShadow { anchors.fill: e_wrapper radius: e_wrapper.radius @@ -108,7 +87,7 @@ Item { right: parent.right bottom: parent.bottom margins: 12 - rightMargin: 1080 * (1 - thin.pos) + 12 + rightMargin: 12 } width: 240 height: 48 diff --git a/colorkey.frag b/colorkey.frag index c8c7eb4..5e8b104 100644 --- a/colorkey.frag +++ b/colorkey.frag @@ -11,7 +11,7 @@ layout(binding = 1) uniform sampler2D source; void main() { vec4 p = texture(source, qt_TexCoord0); if ( - key_enabled && + // key_enabled && p.r == bgcol.r && p.g == bgcol.g && p.b == bgcol.b diff --git a/colorkey.frag.qsb b/colorkey.frag.qsb index 9b9ac48f512a77ff6b3f99200ed0ac810d54ef16..e26f481220158702902a08b3a3afa87b44bd513f 100644 GIT binary patch literal 1701 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 kGh