From d4ebfbd767df64231fc812dd30042b042a0ba818 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Fri, 25 Jul 2025 10:50:43 -0400 Subject: [PATCH 1/5] simplify menu --- modules/bar/components/tray/menu/Menu.qml | 53 ++----------------- modules/bar/components/tray/menu/MenuItem.qml | 2 - 2 files changed, 3 insertions(+), 52 deletions(-) diff --git a/modules/bar/components/tray/menu/Menu.qml b/modules/bar/components/tray/menu/Menu.qml index d47396a..52d1627 100644 --- a/modules/bar/components/tray/menu/Menu.qml +++ b/modules/bar/components/tray/menu/Menu.qml @@ -10,33 +10,25 @@ StyledPopupWindow { id: window backgroundColor: Theme.palette.base300 + margins: 8 radius: 8 property QsMenuOpener menuOpener content: ColumnLayout { - id: menu - - anchors.margins: 30 - + spacing: 8 Repeater { - id: repeater model: window.menuOpener.children delegate: Loader { - id: loader - required property QsMenuEntry modelData - required property int index active: true - opacity: 0 - + Layout.fillWidth: true Layout.minimumWidth: 120 sourceComponent: modelData.isSeparator ? menuSeperator : menuItem property Component menuSeperator: Rectangle { - implicitWidth: menu.width implicitHeight: 2 color: Theme.palette.base100 @@ -44,45 +36,6 @@ StyledPopupWindow { property Component menuItem: MenuItem { menuEntry: modelData } - - states: State { - name: "opened" - when: window.opened - PropertyChanges { - loader { - opacity: 1 - } - } - } - - transitions: [ - Transition { - from: "" - to: "opened" - SequentialAnimation { - PauseAnimation { - duration: (repeater.count / root.animationDuration) * loader.index - } - NumberAnimation { - property: "opacity" - duration: 100 - } - } - }, - Transition { - from: "opened" - to: "" - SequentialAnimation { - PauseAnimation { - duration: 15 * (repeater.count - loader.index) - } - NumberAnimation { - property: "opacity" - duration: 200 - } - } - } - ] } } } diff --git a/modules/bar/components/tray/menu/MenuItem.qml b/modules/bar/components/tray/menu/MenuItem.qml index 5624ddc..58b550b 100644 --- a/modules/bar/components/tray/menu/MenuItem.qml +++ b/modules/bar/components/tray/menu/MenuItem.qml @@ -1,5 +1,3 @@ -import QtQuick -import QtQuick.Layouts import Quickshell import "../../../../../config/" import "../../../../../styled/" From 99f7068956a143fee15404b2259cd184555e4111 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Fri, 25 Jul 2025 11:31:58 -0400 Subject: [PATCH 2/5] lux shortcut widget --- widget/LuxShortcut.qml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 widget/LuxShortcut.qml diff --git a/widget/LuxShortcut.qml b/widget/LuxShortcut.qml new file mode 100644 index 0000000..a724552 --- /dev/null +++ b/widget/LuxShortcut.qml @@ -0,0 +1,5 @@ +import Quickshell.Hyprland + +GlobalShortcut { + appid: "lux" +} From 5a4709fe956bdd5c72f1f972e7bd75bb5e23346a Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Fri, 25 Jul 2025 11:32:06 -0400 Subject: [PATCH 3/5] add shortcuts --- modules/Shortcuts.qml | 14 ++++++++++++++ shell.qml | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 modules/Shortcuts.qml diff --git a/modules/Shortcuts.qml b/modules/Shortcuts.qml new file mode 100644 index 0000000..3085709 --- /dev/null +++ b/modules/Shortcuts.qml @@ -0,0 +1,14 @@ +import Quickshell +import "../widget/" + +Scope { + id: root + + LuxShortcut { + name: 'launcher' + description: 'Open the application launcher' + onPressed: { + console.log("Launcher shortcut pressed"); + } + } +} diff --git a/shell.qml b/shell.qml index 37db2c9..e2569b4 100644 --- a/shell.qml +++ b/shell.qml @@ -1,4 +1,5 @@ import Quickshell +import "modules" import "modules/background" import "modules/bar" @@ -7,4 +8,6 @@ ShellRoot { // Background {} Bar {} + + Shortcuts {} } From 57bfd550948d768d3ba93f6861e22f6176a84e4f Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Fri, 25 Jul 2025 18:06:57 -0400 Subject: [PATCH 4/5] nuke background --- modules/background/Background.qml | 35 ------------------------------- shell.qml | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 modules/background/Background.qml diff --git a/modules/background/Background.qml b/modules/background/Background.qml deleted file mode 100644 index 271f5fa..0000000 --- a/modules/background/Background.qml +++ /dev/null @@ -1,35 +0,0 @@ -import QtQuick -import Quickshell -import Quickshell.Wayland -import "../../styled/" - -Variants { - model: Quickshell.screens - - StyledWindow { - id: background - - required property ShellScreen modelData - - screen: modelData - name: "background" - WlrLayershell.exclusionMode: ExclusionMode.Ignore - WlrLayershell.layer: WlrLayer.Background - color: "black" - - anchors.top: true - anchors.bottom: true - anchors.left: true - anchors.right: true - - Image { - id: wallpaper - - anchors.fill: parent - - opacity: 1 - - source: "/home/baobeld/Wallpapers/bailey-zindel-NRQV-hBF10M-unsplash.jpg" - } - } -} diff --git a/shell.qml b/shell.qml index e2569b4..6d3fd32 100644 --- a/shell.qml +++ b/shell.qml @@ -1,12 +1,10 @@ import Quickshell import "modules" -import "modules/background" import "modules/bar" ShellRoot { ReloadPopup {} - // Background {} Bar {} Shortcuts {} From 1c034a3904b712d2c0e38a4a6f866518baa9c318 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Fri, 25 Jul 2025 18:07:13 -0400 Subject: [PATCH 5/5] move reload popup --- ReloadPopup.qml => modules/ReloadPopup.qml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ReloadPopup.qml => modules/ReloadPopup.qml (100%) diff --git a/ReloadPopup.qml b/modules/ReloadPopup.qml similarity index 100% rename from ReloadPopup.qml rename to modules/ReloadPopup.qml