From c1452e3c11afb8241fe9050c3f8a8307fad4d3b0 Mon Sep 17 00:00:00 2001 From: quadbyte Date: Sun, 10 Aug 2025 19:35:16 -0400 Subject: [PATCH] AudioDeviceSelector: moved to Shell so we only get one in memory --- Modules/Audio/AudioDeviceSelector.qml | 4 +--- Modules/Bar/Volume.qml | 7 +------ Widgets/NLoader.qml | 6 ++++-- shell.qml | 5 +++++ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Modules/Audio/AudioDeviceSelector.qml b/Modules/Audio/AudioDeviceSelector.qml index 109d88d..e170844 100644 --- a/Modules/Audio/AudioDeviceSelector.qml +++ b/Modules/Audio/AudioDeviceSelector.qml @@ -119,9 +119,7 @@ NLoader { } } } -} -// NPanel { -// id: ioSelector +} // NPanel {// id: ioSelector // property int tabIndex: 0 // property Item anchorItem: null diff --git a/Modules/Bar/Volume.qml b/Modules/Bar/Volume.qml index d1f0992..f8f69d7 100644 --- a/Modules/Bar/Volume.qml +++ b/Modules/Bar/Volume.qml @@ -2,7 +2,6 @@ import QtQuick import Quickshell import Quickshell.Services.Pipewire import qs.Services -import qs.Modules.Audio import qs.Widgets Item { @@ -72,11 +71,7 @@ Item { } } onClicked: function () { - ioSelector.isLoaded = !ioSelector.isLoaded + audioDeviceSelector.isLoaded = !audioDeviceSelector.isLoaded } } - - AudioDeviceSelector { - id: ioSelector - } } diff --git a/Widgets/NLoader.qml b/Widgets/NLoader.qml index 133083b..b3c5f52 100644 --- a/Widgets/NLoader.qml +++ b/Widgets/NLoader.qml @@ -18,13 +18,15 @@ Loader { sourceComponent: content onActiveChanged: { - if (active && item && item.show) + if (active && item && item.show) { item.show() + } } onItemChanged: { - if (active && item && item.show) + if (active && item && item.show) { item.show() + } } Connections { diff --git a/shell.qml b/shell.qml index a1544a5..05c3654 100644 --- a/shell.qml +++ b/shell.qml @@ -6,6 +6,7 @@ import Quickshell.Io import Quickshell.Widgets import Quickshell.Services.Pipewire import qs.Widgets +import qs.Modules.Audio import qs.Modules.Bar import qs.Modules.DemoPanel import qs.Modules.Background @@ -32,4 +33,8 @@ ShellRoot { Notification { id: notification } + + AudioDeviceSelector { + id: audioDeviceSelector + } }