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

FolderListModel: improve robustness by reusing the same path

Browse source
This commit is contained in:
quadbyte 2025-08-15 00:11:56 -04:00
parent b79744c135
commit dd471581cd
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Services/ColorSchemes.qml
View file

@ -14,8 +14,6 @@ Singleton {
} }
property var schemes: [] property var schemes: []
property string baseDirectory: "file://" + Quickshell.shellDir + "/Assets/ColorSchemes"
// //property string currentScheme: Settings.data.wallpaper.current
property bool scanning: false property bool scanning: false
function loadColorSchemes() { function loadColorSchemes() {
@ -24,7 +22,7 @@ Singleton {
schemes = [] schemes = []
// Unsetting, then setting the folder will re-trigger the parsing! // Unsetting, then setting the folder will re-trigger the parsing!
folderModel.folder = "" folderModel.folder = ""
folderModel.folder = baseDirectory folderModel.folder = "file://" + Quickshell.shellDir + "/Assets/ColorSchemes"
} }
FolderListModel { FolderListModel {
@ -36,7 +34,7 @@ Singleton {
if (status === FolderListModel.Ready) { if (status === FolderListModel.Ready) {
var files = [] var files = []
for (var i = 0; i < count; i++) { for (var i = 0; i < count; i++) {
var filepath = baseDirectory + "/" + get(i, "fileName") var filepath = folderModel.folder + "/" + get(i, "fileName")
files.push(filepath) files.push(filepath)
} }
schemes = files schemes = files

3
Services/Wallpapers.qml
View file

@ -120,8 +120,7 @@ Singleton {
if (status === FolderListModel.Ready) { if (status === FolderListModel.Ready) {
var files = [] var files = []
for (var i = 0; i < count; i++) { for (var i = 0; i < count; i++) {
var filepath = (Settings.data.wallpaper.directory !== undefined ? Settings.data.wallpaper.directory : "") + "/" + get( var filepath = folderModel.folder + "/" + get(i, "fileName")
i, "fileName")
files.push(filepath) files.push(filepath)
} }
wallpaperList = files wallpaperList = files