Resolve relative UI theme paths

TurboTheTurtle · web-flow · commit 7c9facbea653 · 2026-06-27T11:55:54.000+03:00
PR #24514. Closes #24489.
diff --git a/src/gui/uithememanager.cpp b/src/gui/uithememanager.cpp
@@ -39,6 +39,7 @@
 
 #include "base/logger.h"
 #include "base/path.h"
+#include "base/profile.h"
 #include "base/preferences.h"
 #include "uithemecommon.h"
 
@@ -56,6 +57,11 @@ namespace
         const QColor &color = palette.color(QPalette::Active, QPalette::Base);
         return (color.lightness() < 127);
     }
+
+    Path resolveThemePath(const Path &themePath)
+    {
+        return (themePath.isAbsolute() ? themePath : (Profile::instance()->rootPath() / themePath));
+    }
 }
 
 UIThemeManager *UIThemeManager::m_instance = nullptr;
@@ -100,7 +106,7 @@ UIThemeManager::UIThemeManager()
 
     if (m_useCustomTheme)
     {
-        const Path themePath = Preferences::instance()->customUIThemePath();
+        const Path themePath = resolveThemePath(Preferences::instance()->customUIThemePath());
 
         if (themePath.hasExtension(u".qbtheme"_s))
         {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`
`40`	`40`	`#include "base/logger.h"`
`41`	`41`	`#include "base/path.h"`
	`42`	`+#include "base/profile.h"`
`42`	`43`	`#include "base/preferences.h"`
`43`	`44`	`#include "uithemecommon.h"`
`44`	`45`
`@@ -56,6 +57,11 @@ namespace`
`56`	`57`	`const QColor &color = palette.color(QPalette::Active, QPalette::Base);`
`57`	`58`	`return (color.lightness() < 127);`
`58`	`59`	`}`
	`60`	`+`
	`61`	`+ Path resolveThemePath(const Path &themePath)`
	`62`	`+ {`
	`63`	`+ return (themePath.isAbsolute() ? themePath : (Profile::instance()->rootPath() / themePath));`
	`64`	`+ }`
`59`	`65`	`}`
`60`	`66`
`61`	`67`	`UIThemeManager *UIThemeManager::m_instance = nullptr;`
`@@ -100,7 +106,7 @@ UIThemeManager::UIThemeManager()`
`100`	`106`
`101`	`107`	`if (m_useCustomTheme)`
`102`	`108`	`{`
`103`		`- const Path themePath = Preferences::instance()->customUIThemePath();`
	`109`	`+ const Path themePath = resolveThemePath(Preferences::instance()->customUIThemePath());`
`104`	`110`
`105`	`111`	`if (themePath.hasExtension(u".qbtheme"_s))`
`106`	`112`	`{`