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

Reverted the labeled NSlider, which tends to trigger hard crashes when opening the settings

Browse source
This commit is contained in:
quadbyte 2025-08-12 23:46:35 -04:00
parent 25c9217b6b
commit 050877bcb0
4 changed files with 123 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Modules/Demo/DemoPanel.qml
View file

@ -43,7 +43,7 @@ NLoader {
NText {
text: "DemoPanel"
color: Colors.accentPrimary
font.pointSize: Style.fontSizeXL* scaling
font.pointSize: Style.fontSizeXL * scaling
font.weight: Style.fontWeightBold
Layout.alignment: Qt.AlignHCenter
}
@ -60,22 +60,27 @@ NLoader {
color: Colors.accentSecondary
font.weight: Style.fontWeightBold
}
NText {
text: `${Math.round(Scaling.overrideScale * 100)}%`
Layout.alignment: Qt.AlignVCenter
}
RowLayout {
spacing: Style.marginSmall * scaling
NSlider {
label: "Scaling"
description: "Scaling goes brrrr"
valueSuffix: "%"
from: 60
to: 180
stepSize: 1
value: Scaling.overrideScale * 100
implicitWidth: bgRect.width * 0.75
onPressedChanged: function (pressed, value) {
Scaling.overrideEnabled = true
Scaling.overrideScale = value / 100
}
id: scaleSlider
from: 0.6
to: 1.8
stepSize: 0.01
value: Scaling.overrideScale
implicitWidth: bgRect.width * 0.75
onMoved: {
}
onPressedChanged: {
Scaling.overrideScale = value
Scaling.overrideEnabled = true
}
}
NIconButton {
icon: "refresh"
fontPointSize: Style.fontSizeLarge * scaling

8
Modules/Settings/SettingsPanel.qml
View file

@ -10,13 +10,15 @@ import qs.Widgets
NLoader {
id: root
readonly property real scaling: Scaling.scale(screen)
content: Component {
NPanel {
id: panel
WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
readonly property real scaling: Scaling.scale(screen)
property int currentTabIndex: 0
property var tabsModel: [{
"label": "General",
@ -74,8 +76,8 @@ NLoader {
border.color: Colors.backgroundTertiary
border.width: Math.max(1, Style.borderMedium * scaling)
layer.enabled: true
width: (screen.width / 2) * scaling
height: (screen.height / 2) * scaling
width: (screen.width * 0.5) * scaling
height: (screen.height * 0.5) * scaling
anchors.centerIn: parent
MouseArea {

84
Modules/Settings/Tabs/Wallpaper.qml
View file

@ -116,20 +116,20 @@ ColumnLayout {
}
// Wallpaper Interval
NSlider {
label: "Wallpaper Interval"
description: "How often to change wallpapers automatically (in seconds)"
valueSuffix: "s"
from: 10
to: 900
stepSize: 10
value: Settings.data.wallpaper.randomInterval
onPressedChanged: function (pressed, value) {
Settings.data.wallpaper.randomInterval = Math.round(value)
}
cutoutColor: Colors.backgroundPrimary
Layout.fillWidth: true
}
// NSlider {
// label: "Wallpaper Interval"
// description: "How often to change wallpapers automatically (in seconds)"
// valueSuffix: "s"
// from: 10
// to: 900
// stepSize: 10
// value: Settings.data.wallpaper.randomInterval
// onPressedChanged: function (pressed, value) {
// Settings.data.wallpaper.randomInterval = Math.round(value)
// }
// cutoutColor: Colors.backgroundPrimary
// Layout.fillWidth: true
// }
}
NDivider {
@ -229,36 +229,36 @@ ColumnLayout {
}
// Transition FPS
NSlider {
label: "Transition FPS"
description: "Frames per second for transition animations"
valueSuffix: " FPS"
from: 30
to: 500
stepSize: 5
value: Settings.data.wallpaper.swww.transitionFps
onPressedChanged: function (pressed, value) {
Settings.data.wallpaper.swww.transitionFps = Math.round(value)
}
cutoutColor: Colors.backgroundPrimary
Layout.fillWidth: true
}
// NSlider {
// label: "Transition FPS"
// description: "Frames per second for transition animations"
// valueSuffix: " FPS"
// from: 30
// to: 500
// stepSize: 5
// value: Settings.data.wallpaper.swww.transitionFps
// onPressedChanged: function (pressed, value) {
// Settings.data.wallpaper.swww.transitionFps = Math.round(value)
// }
// cutoutColor: Colors.backgroundPrimary
// Layout.fillWidth: true
// }
// Transition Duration
NSlider {
label: "Transition Duration"
description: "Duration of transition animations in seconds"
valueSuffix: "s"
from: 0.25
to: 10
stepSize: 0.05
value: Settings.data.wallpaper.swww.transitionDuration
onPressedChanged: function (pressed, value) {
Settings.data.wallpaper.swww.transitionDuration = value
}
cutoutColor: Colors.backgroundPrimary
Layout.fillWidth: true
}
// NSlider {
// label: "Transition Duration"
// description: "Duration of transition animations in seconds"
// valueSuffix: "s"
// from: 0.25
// to: 10
// stepSize: 0.05
// value: Settings.data.wallpaper.swww.transitionDuration
// onPressedChanged: function (pressed, value) {
// Settings.data.wallpaper.swww.transitionDuration = value
// }
// cutoutColor: Colors.backgroundPrimary
// Layout.fillWidth: true
// }
}
}
}