Skip to content

Resolve relative UI theme paths #24514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TurboTheTurtle wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −1
Open

Resolve relative UI theme paths #24514

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8edf92d
Resolve relative UI theme paths from app directory
TurboTheTurtle Jun 14, 2026
1cf70ae
Resolve theme path via profile
TurboTheTurtle Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/gui/uithememanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

#include "base/logger.h"
#include "base/path.h"
#include "base/profile.h"
#include "base/preferences.h"
#include "uithemecommon.h"

Expand All @@ -56,6 +57,11 @@ namespace
const QColor &color = palette.color(QPalette::Active, QPalette::Base);
return (color.lightness() < 127);
}

Path resolveThemePath(const Path &themePath)
{
return Profile::instance()->fromPortablePath(themePath);

@glassez glassez Jun 23, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe it is valid to use Profile::fromPortablePath() in this context. It was designed for another purposes.

}
}

UIThemeManager *UIThemeManager::m_instance = nullptr;
Expand Down Expand Up @@ -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))
{
Expand Down
Loading