Make tabs look good in SettingsWindow
This commit is contained in:
parent
644f647653
commit
14f4beff03
3 changed files with 26 additions and 27 deletions
|
|
@ -17,9 +17,7 @@ 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
|
property int currentTabIndex: 0
|
||||||
// Single source of truth for tabs (explicit icon/label here)
|
|
||||||
property var tabsModel: [{
|
property var tabsModel: [{
|
||||||
"icon": "tune",
|
"icon": "tune",
|
||||||
"label": "General",
|
"label": "General",
|
||||||
|
|
@ -58,13 +56,11 @@ NLoader {
|
||||||
"source": "Tabs/About.qml"
|
"source": "Tabs/About.qml"
|
||||||
}]
|
}]
|
||||||
|
|
||||||
// Always default to the first tab (General) when the panel becomes visible
|
|
||||||
onVisibleChanged: function () {
|
onVisibleChanged: function () {
|
||||||
if (visible)
|
if (visible)
|
||||||
currentTabIndex = 0
|
currentTabIndex = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure panel shows itself once created
|
|
||||||
Component.onCompleted: show()
|
Component.onCompleted: show()
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
|
@ -78,18 +74,16 @@ NLoader {
|
||||||
height: 640 * scaling
|
height: 640 * scaling
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|
||||||
// Prevent closing when clicking in the panel bg
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main two-pane layout
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Style.marginLarge * scaling
|
anchors.margins: Style.marginLarge * scaling
|
||||||
spacing: Style.marginLarge * scaling
|
spacing: Style.marginLarge * scaling
|
||||||
|
|
||||||
// Sidebar
|
// Sidebar with tighter spacing
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: sidebar
|
id: sidebar
|
||||||
Layout.preferredWidth: 260 * scaling
|
Layout.preferredWidth: 260 * scaling
|
||||||
|
|
@ -99,45 +93,55 @@ NLoader {
|
||||||
border.color: Colors.outline
|
border.color: Colors.outline
|
||||||
border.width: Math.max(1, Style.borderThin * scaling)
|
border.width: Math.max(1, Style.borderThin * scaling)
|
||||||
|
|
||||||
ColumnLayout {
|
Column {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Style.marginSmall * scaling
|
anchors.margins: Style.marginSmall * scaling
|
||||||
spacing: Style.marginSmall * scaling
|
spacing: 2 * scaling // Minimal spacing between tabs
|
||||||
|
|
||||||
Repeater {
|
Repeater {
|
||||||
id: sections
|
id: sections
|
||||||
model: settingsPanel.tabsModel
|
model: settingsPanel.tabsModel
|
||||||
|
|
||||||
delegate: Rectangle {
|
delegate: Rectangle {
|
||||||
|
id: tabItem
|
||||||
readonly property bool selected: index === settingsPanel.currentTabIndex
|
readonly property bool selected: index === settingsPanel.currentTabIndex
|
||||||
Layout.fillWidth: true
|
width: parent.width
|
||||||
height: 44 * scaling
|
height: 32 * scaling // Back to original height
|
||||||
radius: Style.radiusSmall * scaling
|
radius: Style.radiusSmall * scaling
|
||||||
color: selected ? Colors.highlight : "transparent"
|
color: selected ? Colors.accentPrimary : (tabItem.hovering ? Colors.highlight : "transparent")
|
||||||
border.color: Colors.outline
|
border.color: "transparent"
|
||||||
border.width: Math.max(1, Style.borderThin * scaling)
|
border.width: 0
|
||||||
|
|
||||||
|
// Subtle hover effect: only icon/text color tint on hover
|
||||||
|
property bool hovering: false
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.leftMargin: Style.marginMedium * scaling
|
anchors.leftMargin: Style.marginSmall * scaling
|
||||||
anchors.rightMargin: Style.marginMedium * scaling
|
anchors.rightMargin: Style.marginSmall * scaling
|
||||||
spacing: Style.marginSmall * scaling
|
spacing: Style.marginTiny * scaling
|
||||||
NText {
|
NText {
|
||||||
text: modelData.icon
|
text: modelData.icon
|
||||||
font.family: "Material Symbols Outlined"
|
font.family: "Material Symbols Outlined"
|
||||||
font.variableAxes: {
|
font.variableAxes: {
|
||||||
"wght": (Font.Normal + Font.Bold) / 2.0
|
"wght": (Font.Normal + Font.Bold) / 2.0
|
||||||
}
|
}
|
||||||
color: selected ? Colors.onAccent : Colors.textSecondary
|
color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textSecondary)
|
||||||
}
|
}
|
||||||
NText {
|
NText {
|
||||||
text: modelData.label
|
text: modelData.label
|
||||||
color: selected ? Colors.onAccent : Colors.textPrimary
|
color: selected ? Colors.onAccent : (tabItem.hovering ? Colors.onAccent : Colors.textPrimary)
|
||||||
|
font.weight: Style.fontWeightBold
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
|
acceptedButtons: Qt.LeftButton
|
||||||
|
onEntered: tabItem.hovering = true
|
||||||
|
onExited: tabItem.hovering = false
|
||||||
|
onCanceled: tabItem.hovering = false
|
||||||
onClicked: settingsPanel.currentTabIndex = index
|
onClicked: settingsPanel.currentTabIndex = index
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -145,7 +149,7 @@ NLoader {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Content
|
// Content (unchanged)
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: contentPane
|
id: contentPane
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -156,14 +160,12 @@ NLoader {
|
||||||
border.width: Math.max(1, Style.borderThin * scaling)
|
border.width: Math.max(1, Style.borderThin * scaling)
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
// Content layout: header + divider + pages
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: contentLayout
|
id: contentLayout
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Style.marginLarge * scaling
|
anchors.margins: Style.marginLarge * scaling
|
||||||
spacing: Style.marginSmall * scaling
|
spacing: Style.marginSmall * scaling
|
||||||
|
|
||||||
// Header row
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: headerRow
|
id: headerRow
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -189,14 +191,12 @@ NLoader {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stacked pages
|
|
||||||
StackLayout {
|
StackLayout {
|
||||||
id: stack
|
id: stack
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
currentIndex: settingsPanel.currentTabIndex
|
currentIndex: settingsPanel.currentTabIndex
|
||||||
|
|
||||||
// Pages generated from tabsModel
|
|
||||||
Repeater {
|
Repeater {
|
||||||
model: settingsPanel.tabsModel
|
model: settingsPanel.tabsModel
|
||||||
delegate: Loader {
|
delegate: Loader {
|
||||||
|
|
@ -212,4 +212,4 @@ NLoader {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
// Disable reload popup
|
// Disable reload popup add this as a new row: //pragma Env QS_NO_RELOAD_POPUP=1
|
||||||
//@ pragma Env QS_NO_RELOAD_POPUP=1
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import Quickshell
|
import Quickshell
|
||||||
import Quickshell.Io
|
import Quickshell.Io
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue