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 9b9ac48..e26f481 100644 Binary files a/colorkey.frag.qsb and b/colorkey.frag.qsb differ