mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
Merge branch 'noctalia-dev:main' into patch-10
This commit is contained in:
@@ -11,7 +11,7 @@ Singleton {
|
||||
id: root
|
||||
|
||||
// Version properties
|
||||
readonly property string baseVersion: "4.7.6"
|
||||
readonly property string baseVersion: "4.7.7"
|
||||
readonly property bool isDevelopment: true
|
||||
readonly property string developmentSuffix: "-git"
|
||||
readonly property string currentVersion: `v${!isDevelopment ? baseVersion : baseVersion + developmentSuffix}`
|
||||
|
||||
@@ -770,6 +770,8 @@ Singleton {
|
||||
return "";
|
||||
if (icon.startsWith("/") || icon.startsWith("file://"))
|
||||
return icon;
|
||||
if (!ThemeIcons.iconExists(icon))
|
||||
return "";
|
||||
return ThemeIcons.iconFromName(icon);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user