From 68d4240fcbc605ee36a0e71797c04c0ac33f3e19 Mon Sep 17 00:00:00 2001 From: voidarc Date: Tue, 7 Jul 2026 16:04:19 +0100 Subject: [PATCH] Revert "very broken keybinds lol" This reverts commit 63e360d427014918c905f7dfb4829848f5538058. --- Bar.qml | 34 ++----------------------- Bar/Center.qml | 53 --------------------------------------- Bar/Center/Logout.qml | 18 ------------- Services/FocusManager.qml | 19 -------------- Services/IpcManager.qml | 18 ------------- Services/qmldir | 2 -- 6 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 Bar/Center/Logout.qml delete mode 100644 Services/FocusManager.qml delete mode 100644 Services/IpcManager.qml diff --git a/Bar.qml b/Bar.qml index cf9838c..45a8464 100644 --- a/Bar.qml +++ b/Bar.qml @@ -1,9 +1,8 @@ import QtQuick +import QtQuick.Effects +import QtQuick.Layouts import Quickshell import Quickshell.Hyprland -import Quickshell.Io -import Quickshell.Wayland -import "./Services/" import "Bar" import "Color.js" as Colors @@ -20,15 +19,6 @@ Scope { required property var modelData property HyprlandMonitor monitor: Hyprland.monitorFor(modelData) - function refocus() { - if (WlrLayershell == null) - return; - WlrLayershell.keyboardFocus = WlrKeyboardFocus.None; - Qt.callLater(() => { - WlrLayershell.keyboardFocus = WlrKeyboardFocus.Exclusive; - }); - } - color: "transparent" exclusionMode: ExclusionMode.Normal exclusiveZone: barExclusionZone @@ -49,26 +39,6 @@ Scope { } } - Component.onCompleted: { - if (this.WlrLayershell != null) { - this.WlrLayershell.keyboardFocus = WlrKeyboardFocus.OnDemand; - } - } - - - Connections { - function onRaiseCancelled() { - win.WlrLayershell.keyboardFocus = WlrKeyboardFocus.OnDemand; - } - - function onRaiseRequested() { - // win.WlrLayershell.keyboardFocus = WlrKeyboardFocus.Exclusive; - win.refocus(); - } - - target: FocusManager - } - anchors { left: true right: true diff --git a/Bar/Center.qml b/Bar/Center.qml index f863a3c..103cd75 100644 --- a/Bar/Center.qml +++ b/Bar/Center.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts import Quickshell import Quickshell.Hyprland -import Quickshell.Io import Quickshell.Services.Mpris import Quickshell.Services.Notifications import "../Color.js" as Colors @@ -120,23 +119,6 @@ Container { root.previousState = "notified"; } } - }, - State { - name: "logout" - - PropertyChanges { - root.boxHeight: 90 - root.boxRadius: 30 - root.boxWidth: 330 - root.visibleTopMargin: 20 - } - - StateChangeScript { - script: { - root.stack.replace(logout); - root.previousState = "logout"; - } - } } ] @@ -145,8 +127,6 @@ Container { if (root.state == "notified") { root.state = "notified"; notificationViewTimer.stop(); - } else if (root.state == "logout") { - root.state = "logout"; } else if (MprisManager.getPlaying() == true) { root.state = "mprisToast"; } else { @@ -154,7 +134,6 @@ Container { } } else { root.state = ""; - FocusManager.exitRaise(); } } onLatestNotificationChanged: { @@ -169,32 +148,6 @@ Container { root.state == "hovered" ? root.state = "expanded" : undefined; } - Connections { - function onactivated() { - console.log("some", root.state); - } - - target: root.stack - } - - Connections { - function onLogoutTriggered() { - if (Hyprland.focusedMonitor == root.exclusiveMonitor) { - root.state = "logout"; - } - } - - target: IpcManager - } - - Connections { - function onRaiseCancelled() { - root.state = ""; - } - - target: FocusManager - } - Connections { function onTrackChanged() { if (Hyprland.focusedMonitor == root.monitor) { @@ -307,10 +260,4 @@ Container { } } } - - Component { - id: logout - - Logout {} - } } diff --git a/Bar/Center/Logout.qml b/Bar/Center/Logout.qml deleted file mode 100644 index 4799970..0000000 --- a/Bar/Center/Logout.qml +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick -import "../../Components/" -import "../../Services/" - -Item { - CenteredText { - text: "some" - } - - Shortcut { - sequence: "Escape" - - onActivated: { - console.log("shortcut triggered"); - FocusManager.exitRaise(); - } - } -} diff --git a/Services/FocusManager.qml b/Services/FocusManager.qml deleted file mode 100644 index 9951195..0000000 --- a/Services/FocusManager.qml +++ /dev/null @@ -1,19 +0,0 @@ -pragma Singleton -import QtQuick -import Quickshell - -Singleton { - id: root - - signal raiseCancelled - signal raiseRequested - - function exitRaise() { - console.log("exiting raise"); - root.raiseCancelled(); - } - - function requestRaise() { - root.raiseRequested(); - } -} diff --git a/Services/IpcManager.qml b/Services/IpcManager.qml deleted file mode 100644 index 3aa7bfa..0000000 --- a/Services/IpcManager.qml +++ /dev/null @@ -1,18 +0,0 @@ -pragma Singleton -import QtQuick -import Quickshell -import Quickshell.Io - -Singleton { - id: root - - signal logoutTriggered() - - IpcHandler { - function logout() { - root.logoutTriggered(); - } - - target: "main" - } -} diff --git a/Services/qmldir b/Services/qmldir index fd14833..b6984ea 100644 --- a/Services/qmldir +++ b/Services/qmldir @@ -4,5 +4,3 @@ singleton NotificationManager 1.0 NotificationManager.qml singleton WorkspaceManager 1.0 WorkspaceManager.qml singleton BluetoothManager 1.0 BluetoothManager.qml singleton MprisManager 1.0 MprisManager.qml -singleton IpcManager 1.0 IpcManager.qml -singleton FocusManager 1.0 FocusManager.qml