feat: replace control center popout with nexus
This commit is contained in:
parent
8c844867e9
commit
eb0a2a0813
3 changed files with 21 additions and 10 deletions
|
|
@ -7,7 +7,7 @@ import Quickshell.Wayland
|
||||||
import Caelestia.Config
|
import Caelestia.Config
|
||||||
import qs.components
|
import qs.components
|
||||||
import qs.services
|
import qs.services
|
||||||
import qs.modules.controlcenter
|
import qs.modules.nexus
|
||||||
import qs.modules.windowinfo
|
import qs.modules.windowinfo
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
|
@ -18,7 +18,7 @@ Item {
|
||||||
|
|
||||||
readonly property alias content: content
|
readonly property alias content: content
|
||||||
readonly property alias winfo: winfo
|
readonly property alias winfo: winfo
|
||||||
readonly property alias controlCenter: controlCenter
|
readonly property alias nexus: nexus
|
||||||
|
|
||||||
readonly property real nonAnimWidth: children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth
|
readonly property real nonAnimWidth: children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth
|
||||||
readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight
|
readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight
|
||||||
|
|
@ -128,15 +128,24 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Comp {
|
Comp {
|
||||||
id: controlCenter
|
id: nexus
|
||||||
|
|
||||||
shouldBeActive: root.detachedMode === "any"
|
shouldBeActive: root.detachedMode === "any"
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|
||||||
sourceComponent: ControlCenter {
|
sourceComponent: StyledClippingRect {
|
||||||
screen: root.screen
|
radius: Tokens.rounding.extraLarge
|
||||||
active: root.queuedMode
|
implicitWidth: nexusInner.implicitWidth
|
||||||
onClose: root.close()
|
implicitHeight: nexusInner.implicitHeight
|
||||||
|
|
||||||
|
Nexus {
|
||||||
|
id: nexusInner
|
||||||
|
|
||||||
|
anchors.fill: parent
|
||||||
|
nState.screen: root.screen
|
||||||
|
nState.currentPageIdx: ["appearance", "network", "bluetooth", "audio"].indexOf(root.queuedMode)
|
||||||
|
onClose: root.close()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,13 +51,14 @@ Item {
|
||||||
|
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
anchors.margins: root.nState.isWindow ? 0 : Tokens.padding.extraSmall
|
||||||
|
|
||||||
group: blobGroup
|
group: blobGroup
|
||||||
opacity: root.blobColour.a
|
opacity: root.blobColour.a
|
||||||
radius: Tokens.rounding.medium
|
radius: Tokens.rounding.medium
|
||||||
|
|
||||||
implicitWidth: windowBtn.implicitWidth + Tokens.padding.extraSmall * 2
|
implicitWidth: windowBtn.implicitWidth + (root.nState.isWindow ? Tokens.padding.extraSmall : Tokens.padding.small) * 2
|
||||||
implicitHeight: windowBtn.implicitHeight + Tokens.padding.extraSmall
|
implicitHeight: windowBtn.implicitHeight + (root.nState.isWindow ? Tokens.padding.extraSmall : Tokens.padding.small)
|
||||||
}
|
}
|
||||||
|
|
||||||
IconButton {
|
IconButton {
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ import Caelestia.Config
|
||||||
import qs.components
|
import qs.components
|
||||||
import qs.components.controls
|
import qs.components.controls
|
||||||
import qs.services
|
import qs.services
|
||||||
|
import qs.modules.nexus
|
||||||
import qs.modules.bar.popouts as BarPopouts
|
import qs.modules.bar.popouts as BarPopouts
|
||||||
|
|
||||||
StyledRect {
|
StyledRect {
|
||||||
|
|
@ -118,7 +119,7 @@ StyledRect {
|
||||||
isToggle: false
|
isToggle: false
|
||||||
onClicked: {
|
onClicked: {
|
||||||
root.visibilities.utilities = false;
|
root.visibilities.utilities = false;
|
||||||
root.popouts.detach("network");
|
WindowFactory.create();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue