nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

controlcenter: changed to popout vs floating to match the other settings buttons (fixed issues with resizing)

Browse source
This commit is contained in:
ATMDA 2025-11-16 09:45:05 -05:00
parent d3124c34ac
commit 21e715468e
7 changed files with 14 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/bar/components/Settings.qml
View file

@ -21,7 +21,9 @@ Item {
radius: Appearance.rounding.full radius: Appearance.rounding.full
function onClicked(): void { function onClicked(): void {
WindowFactory.create(); WindowFactory.create(null, {
active: "appearance"
});
} }
} }

4
modules/bar/components/SettingsIcon.qml
View file

@ -21,7 +21,9 @@ Item {
radius: Appearance.rounding.full radius: Appearance.rounding.full
function onClicked(): void { function onClicked(): void {
WindowFactory.create(); WindowFactory.create(null, {
active: "appearance"
});
} }
} }

119
modules/controlcenter/NavRail.qml
View file

@ -30,129 +30,12 @@ Item {
PropertyChanges { PropertyChanges {
layout.spacing: Appearance.spacing.small layout.spacing: Appearance.spacing.small
menuIcon.opacity: 0
menuIconExpanded.opacity: 1
menuIcon.rotation: 180
menuIconExpanded.rotation: 0
} }
} }
transitions: Transition { transitions: Transition {
Anim { Anim {
properties: "spacing,opacity,rotation" properties: "spacing"
}
}
Item {
id: menuBtn
Layout.topMargin: Appearance.spacing.large
implicitWidth: menuIcon.implicitWidth + menuIcon.anchors.leftMargin * 2
implicitHeight: menuIcon.implicitHeight + Appearance.padding.normal * 2
StateLayer {
radius: Appearance.rounding.small
function onClicked(): void {
root.session.navExpanded = !root.session.navExpanded;
}
}
MaterialIcon {
id: menuIcon
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: Appearance.padding.large
text: "menu"
font.pointSize: Appearance.font.size.large
}
MaterialIcon {
id: menuIconExpanded
anchors.fill: menuIcon
text: "menu_open"
font.pointSize: menuIcon.font.pointSize
opacity: 0
rotation: -180
}
}
Loader {
asynchronous: true
active: !root.session.floating
visible: active
sourceComponent: StyledRect {
readonly property int nonAnimWidth: normalWinIcon.implicitWidth + (root.session.navExpanded ? normalWinLabel.anchors.leftMargin + normalWinLabel.implicitWidth : 0) + normalWinIcon.anchors.leftMargin * 2
implicitWidth: nonAnimWidth
implicitHeight: root.session.navExpanded ? normalWinIcon.implicitHeight + Appearance.padding.normal * 2 : nonAnimWidth
color: Colours.palette.m3primaryContainer
radius: Appearance.rounding.small
StateLayer {
id: normalWinState
color: Colours.palette.m3onPrimaryContainer
function onClicked(): void {
root.session.root.close();
WindowFactory.create(null, {
screen: root.screen,
active: root.session.active,
navExpanded: root.session.navExpanded
});
}
}
MaterialIcon {
id: normalWinIcon
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: Appearance.padding.large
text: "select_window"
color: Colours.palette.m3onPrimaryContainer
font.pointSize: Appearance.font.size.large
fill: 1
}
StyledText {
id: normalWinLabel
anchors.left: normalWinIcon.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: Appearance.spacing.normal
text: qsTr("Float window")
color: Colours.palette.m3onPrimaryContainer
opacity: root.session.navExpanded ? 1 : 0
Behavior on opacity {
Anim {
duration: Appearance.anim.durations.small
}
}
}
Behavior on implicitWidth {
Anim {
duration: Appearance.anim.durations.expressiveDefaultSpatial
easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
}
}
Behavior on implicitHeight {
Anim {
duration: Appearance.anim.durations.expressiveDefaultSpatial
easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
}
}
} }
} }

1
modules/drawers/Panels.qml
View file

@ -109,6 +109,7 @@ Item {
visibilities: root.visibilities visibilities: root.visibilities
sidebar: sidebar sidebar: sidebar
popouts: popouts
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right

2
modules/utilities/Content.qml
View file

@ -8,6 +8,7 @@ Item {
required property var props required property var props
required property var visibilities required property var visibilities
required property Item popouts
implicitWidth: layout.implicitWidth implicitWidth: layout.implicitWidth
implicitHeight: layout.implicitHeight implicitHeight: layout.implicitHeight
@ -28,6 +29,7 @@ Item {
Toggles { Toggles {
visibilities: root.visibilities visibilities: root.visibilities
popouts: root.popouts
} }
} }

2
modules/utilities/Wrapper.qml
View file

@ -10,6 +10,7 @@ Item {
required property var visibilities required property var visibilities
required property Item sidebar required property Item sidebar
required property Item popouts
readonly property PersistentProperties props: PersistentProperties { readonly property PersistentProperties props: PersistentProperties {
property bool recordingListExpanded: false property bool recordingListExpanded: false
@ -89,6 +90,7 @@ Item {
implicitWidth: root.implicitWidth - Appearance.padding.large * 2 implicitWidth: root.implicitWidth - Appearance.padding.large * 2
props: root.props props: root.props
visibilities: root.visibilities visibilities: root.visibilities
popouts: root.popouts
} }
} }
} }

5
modules/utilities/cards/Toggles.qml
View file

@ -12,6 +12,7 @@ StyledRect {
id: root id: root
required property var visibilities required property var visibilities
required property Item popouts
Layout.fillWidth: true Layout.fillWidth: true
implicitHeight: layout.implicitHeight + Appearance.padding.large * 2 implicitHeight: layout.implicitHeight + Appearance.padding.large * 2
@ -67,9 +68,7 @@ StyledRect {
toggle: false toggle: false
onClicked: { onClicked: {
root.visibilities.utilities = false; root.visibilities.utilities = false;
WindowFactory.create(null, { root.popouts.detach("appearance");
screen: QsWindow.window?.screen ?? null
});
} }
} }