zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into qt-scaling

Browse Source
This commit is contained in:
ItsLemmy
2025-10-12 18:27:56 -04:00
parent 48ade771fb f0f95343f3
commit 2888b7c02e
27 changed files with 600 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/BarWidgetRegistry.qml
+6 -3
View File
@@ -43,7 +43,8 @@ Singleton {
"showIcon": true,
"autoHide": false,
"scrollingMode": "hover",
"width": 145
"width": 145,
"colorizeIcons": false
},
"Battery": {
"allowUserSettings": true,
@@ -114,11 +115,13 @@ Singleton {
"Taskbar": {
"allowUserSettings": true,
"onlySameOutput": true,
"onlyActiveWorkspaces": true
"onlyActiveWorkspaces": true,
"colorizeIcons": false
},
"Tray": {
"allowUserSettings": true,
"blacklist": []
"blacklist": [],
"colorizeIcons": false
},
"Workspace": {
"allowUserSettings": true,
Services/ScreenRecorderService.qml
+1 -1
View File
@@ -49,7 +49,7 @@ Singleton {
function launchRecorder() {
var filename = Time.getFormattedTimestamp() + ".mp4"
var videoDir = settings.directory
var videoDir = Settings.preprocessPath(settings.directory)
if (videoDir && !videoDir.endsWith("/")) {
videoDir += "/"
}
Services/WallpaperService.qml
+8 -7
View File
@@ -10,6 +10,7 @@ Singleton {
id: root
readonly property ListModel fillModeModel: ListModel {}
readonly property string defaultDirectory: Settings.preprocessPath(Settings.data.wallpaper.directory)
// All available wallpaper transitions
readonly property ListModel transitionsModel: ListModel {}
@@ -44,7 +45,7 @@ Singleton {
if (!Settings.data.wallpaper.enableMultiMonitorDirectories) {
// All monitors use the main directory
for (var i = 0; i < Quickshell.screens.length; i++) {
root.wallpaperDirectoryChanged(Quickshell.screens[i].name, Settings.data.wallpaper.directory)
root.wallpaperDirectoryChanged(Quickshell.screens[i].name, root.defaultDirectory)
}
} else {
// Only monitors without custom directories are affected
@@ -52,7 +53,7 @@ Singleton {
var screenName = Quickshell.screens[i].name
var monitor = root.getMonitorConfig(screenName)
if (!monitor || !monitor.directory) {
root.wallpaperDirectoryChanged(screenName, Settings.data.wallpaper.directory)
root.wallpaperDirectoryChanged(screenName, root.defaultDirectory)
}
}
}
@@ -177,16 +178,16 @@ Singleton {
// Get specific monitor directory
function getMonitorDirectory(screenName) {
if (!Settings.data.wallpaper.enableMultiMonitorDirectories) {
return Settings.data.wallpaper.directory
return root.defaultDirectory
}
var monitor = getMonitorConfig(screenName)
if (monitor !== undefined && monitor.directory !== undefined) {
return monitor.directory
return Settings.preprocessPath(monitor.directory)
}
// Fall back to the main/single directory
return Settings.data.wallpaper.directory
return root.defaultDirectory
}
// -------------------------------------------------------------------
@@ -218,7 +219,7 @@ Singleton {
// Update Settings with new array to ensure proper persistence
Settings.data.wallpaper.monitors = newMonitors.slice()
root.wallpaperDirectoryChanged(screenName, directory)
root.wallpaperDirectoryChanged(screenName, Settings.preprocessPath(directory))
}
// -------------------------------------------------------------------
@@ -274,7 +275,7 @@ Singleton {
found = true
return {
"name": screenName,
"directory": monitor.directory || getMonitorDirectory(screenName),
"directory": Settings.preprocessPath(monitor.directory) || getMonitorDirectory(screenName),
"wallpaper": path
}
}