diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-08-05 16:19:58 +1000 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-08-05 16:19:58 +1000 |
| commit | fb650907a0b18fab4f996c2fdc110d2d091e4060 (patch) | |
| tree | ab2ec5bb7f17fc36ea9ccc12bad451c43a1b7f9c | |
| parent | internal: position slider handle correctly (diff) | |
| download | caelestia-shell-fb650907a0b18fab4f996c2fdc110d2d091e4060.tar.gz caelestia-shell-fb650907a0b18fab4f996c2fdc110d2d091e4060.tar.bz2 caelestia-shell-fb650907a0b18fab4f996c2fdc110d2d091e4060.zip | |
internal: rename dcontent -> controlcenter
| -rw-r--r-- | config/Config.qml | 4 | ||||
| -rw-r--r-- | config/ControlCenterConfig.qml (renamed from config/DContentConfig.qml) | 0 | ||||
| -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 |
11 files changed, 7 insertions, 9 deletions
diff --git a/config/Config.qml b/config/Config.qml index ea7f3f4..a4a4a87 100644 --- a/config/Config.qml +++ b/config/Config.qml @@ -12,7 +12,7 @@ Singleton { property alias bar: adapter.bar property alias border: adapter.border property alias dashboard: adapter.dashboard - property alias dcontent: adapter.dcontent + property alias controlCenter: adapter.controlCenter property alias launcher: adapter.launcher property alias notifs: adapter.notifs property alias osd: adapter.osd @@ -36,7 +36,7 @@ Singleton { property BarConfig bar: BarConfig {} property BorderConfig border: BorderConfig {} property DashboardConfig dashboard: DashboardConfig {} - property DContentConfig dcontent: DContentConfig {} + property ControlCenterConfig controlCenter: ControlCenterConfig {} property LauncherConfig launcher: LauncherConfig {} property NotifsConfig notifs: NotifsConfig {} property OsdConfig osd: OsdConfig {} diff --git a/config/DContentConfig.qml b/config/ControlCenterConfig.qml index 13afbd2..13afbd2 100644 --- a/config/DContentConfig.qml +++ b/config/ControlCenterConfig.qml 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 |