never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rebuild' of github.com:Ly-sec/Noctalia into rebuild

Browse source
This commit is contained in:
quadbyte 2025-08-11 10:02:02 -04:00
commit 880d6610fe
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/Settings/SettingsWindow.qml
View file

@ -17,6 +17,8 @@ NLoader {
WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
readonly property real scaling: Scaling.scale(screen) readonly property real scaling: Scaling.scale(screen)
// Active tab index unified for sidebar, header, and content stack
property int currentTabIndex: 0
// Single source of truth for tabs // Single source of truth for tabs
// Each tab points to a QML file path. The content stack simply loads the file via Loader.source. // Each tab points to a QML file path. The content stack simply loads the file via Loader.source.
property var tabsModel: [ property var tabsModel: [
@ -33,13 +35,7 @@ NLoader {
// Always default to the first tab (General) when the panel becomes visible // Always default to the first tab (General) when the panel becomes visible
onVisibleChanged: function () { onVisibleChanged: function () {
if (visible) { if (visible) currentTabIndex = 0
Qt.callLater(function () {
if (typeof stack !== 'undefined' && stack) {
stack.currentIndex = 0
}
})
}
} }
// Ensure panel shows itself once created // Ensure panel shows itself once created
@ -86,7 +82,7 @@ NLoader {
model: settingsPanel.tabsModel model: settingsPanel.tabsModel
delegate: Rectangle { delegate: Rectangle {
readonly property bool selected: index === stack.currentIndex readonly property bool selected: index === settingsPanel.currentTabIndex
Layout.fillWidth: true Layout.fillWidth: true
height: 44 * scaling height: 44 * scaling
radius: Style.radiusSmall * scaling radius: Style.radiusSmall * scaling
@ -107,7 +103,7 @@ NLoader {
} }
NText { text: modelData.label; color: selected ? Colors.onAccent : Colors.textPrimary; Layout.fillWidth: true } NText { text: modelData.label; color: selected ? Colors.onAccent : Colors.textPrimary; Layout.fillWidth: true }
} }
MouseArea { anchors.fill: parent; onClicked: stack.currentIndex = index } MouseArea { anchors.fill: parent; onClicked: settingsPanel.currentTabIndex = index }
} }
} }
} }
@ -137,7 +133,7 @@ NLoader {
Layout.fillWidth: true Layout.fillWidth: true
spacing: Style.marginSmall * scaling spacing: Style.marginSmall * scaling
NText { NText {
text: settingsPanel.tabsModel[stack.currentIndex].label text: settingsPanel.tabsModel[settingsPanel.currentTabIndex].label
font.weight: Style.fontWeightBold font.weight: Style.fontWeightBold
color: Colors.textPrimary color: Colors.textPrimary
Layout.fillWidth: true Layout.fillWidth: true
@ -145,7 +141,7 @@ NLoader {
NIconButton { NIconButton {
id: demoPanelToggle id: demoPanelToggle
icon: "close" icon: "close"
tooltipText: "Open demo panel" tooltipText: "Close settings panel"
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
onClicked: function () { settingsWindow.isLoaded = !settingsWindow.isLoaded } onClicked: function () { settingsWindow.isLoaded = !settingsWindow.isLoaded }
} }
@ -158,14 +154,13 @@ NLoader {
id: stack id: stack
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
currentIndex: 0 currentIndex: settingsPanel.currentTabIndex
Component.onCompleted: currentIndex = 0
// Pages generated from tabsModel // Pages generated from tabsModel
Repeater { Repeater {
model: settingsPanel.tabsModel model: settingsPanel.tabsModel
delegate: Loader { delegate: Loader {
active: index === stack.currentIndex active: index === settingsPanel.currentTabIndex
visible: active visible: active
source: modelData.source source: modelData.source
} }