diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bar/popouts/Wrapper.qml | 6 | ||||
| -rw-r--r-- | modules/controlcenter/ControlCenter.qml (renamed from modules/detachedcontent/DetachedContent.qml) | 4 | ||||
| -rw-r--r-- | modules/controlcenter/NavRail.qml (renamed from modules/detachedcontent/NavRail.qml) | 2 | ||||
| -rw-r--r-- | modules/controlcenter/Panes.qml (renamed from modules/detachedcontent/Panes.qml) | 0 | ||||
| -rw-r--r-- | modules/controlcenter/Session.qml (renamed from modules/detachedcontent/Session.qml) | 0 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/BtPane.qml (renamed from modules/detachedcontent/bluetooth/BtPane.qml) | 0 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/Details.qml (renamed from modules/detachedcontent/bluetooth/Details.qml) | 0 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/DeviceList.qml (renamed from modules/detachedcontent/bluetooth/DeviceList.qml) | 0 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/Settings.qml (renamed from modules/detachedcontent/bluetooth/Settings.qml) | 0 |
9 files changed, 5 insertions, 7 deletions
diff --git a/modules/bar/popouts/Wrapper.qml b/modules/bar/popouts/Wrapper.qml index 4ef7492..bb80ad0 100644 --- a/modules/bar/popouts/Wrapper.qml +++ b/modules/bar/popouts/Wrapper.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import qs.services import qs.config import qs.modules.windowinfo -import qs.modules.detachedcontent +import qs.modules.controlcenter import Quickshell import Quickshell.Wayland import Quickshell.Hyprland @@ -94,13 +94,11 @@ Item { } Comp { - id: detachedContent - shouldBeActive: root.detachedMode === "any" asynchronous: true anchors.centerIn: parent - sourceComponent: DetachedContent { + sourceComponent: ControlCenter { screen: root.screen active: root.queuedMode } diff --git a/modules/detachedcontent/DetachedContent.qml b/modules/controlcenter/ControlCenter.qml index cf564cb..2e7ce07 100644 --- a/modules/detachedcontent/DetachedContent.qml +++ b/modules/controlcenter/ControlCenter.qml @@ -17,8 +17,8 @@ Item { id: session } - implicitWidth: implicitHeight * Config.dcontent.sizes.ratio - implicitHeight: screen.height * Config.dcontent.sizes.heightMult + implicitWidth: implicitHeight * Config.controlCenter.sizes.ratio + implicitHeight: screen.height * Config.controlCenter.sizes.heightMult RowLayout { anchors.fill: parent diff --git a/modules/detachedcontent/NavRail.qml b/modules/controlcenter/NavRail.qml index 826e8ca..a631465 100644 --- a/modules/detachedcontent/NavRail.qml +++ b/modules/controlcenter/NavRail.qml @@ -115,7 +115,7 @@ Item { PropertyChanges { expandedLabel.opacity: 1 smallLabel.opacity: 0 - background.implicitWidth: Config.dcontent.sizes.expandedNavWidth + background.implicitWidth: Config.controlCenter.sizes.expandedNavWidth background.implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 item.implicitHeight: background.implicitHeight } diff --git a/modules/detachedcontent/Panes.qml b/modules/controlcenter/Panes.qml index d1ec581..d1ec581 100644 --- a/modules/detachedcontent/Panes.qml +++ b/modules/controlcenter/Panes.qml diff --git a/modules/detachedcontent/Session.qml b/modules/controlcenter/Session.qml index 0c3f1b4..0c3f1b4 100644 --- a/modules/detachedcontent/Session.qml +++ b/modules/controlcenter/Session.qml diff --git a/modules/detachedcontent/bluetooth/BtPane.qml b/modules/controlcenter/bluetooth/BtPane.qml index c6dbbcc..c6dbbcc 100644 --- a/modules/detachedcontent/bluetooth/BtPane.qml +++ b/modules/controlcenter/bluetooth/BtPane.qml diff --git a/modules/detachedcontent/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index f856002..f856002 100644 --- a/modules/detachedcontent/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml diff --git a/modules/detachedcontent/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml index d975e17..d975e17 100644 --- a/modules/detachedcontent/bluetooth/DeviceList.qml +++ b/modules/controlcenter/bluetooth/DeviceList.qml diff --git a/modules/detachedcontent/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index f298432..f298432 100644 --- a/modules/detachedcontent/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml |