Skip to content

keep default theme objects alive for the process lifetime #37

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

Merged
hypengw merged 2 commits into from
Sep 21, 2026
Merged

keep default theme objects alive for the process lifetime #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbded81
keep default theme objects alive for the process lifetime
wehrwolfmann Sep 19, 2026
983a981
Merge branch 'main' into fix/default-theme-lifetime
hypengw Sep 21, 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
12 changes: 9 additions & 3 deletions src/style/theme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ struct GlobalTheme {
PageContext page_;
PageContext* page { &page_ };
};
Q_GLOBAL_STATIC(GlobalTheme, theGlobalTheme)
// The default objects below are handed to QML and bindings may still read them
// while static destruction is running, which would turn every color into null.
// Create them once and keep them for the process lifetime.
GlobalTheme* theGlobalTheme() {
static GlobalTheme* const the = new GlobalTheme();
return the;
}

} // namespace

Expand All @@ -37,11 +43,11 @@ Theme* Theme::qmlAttachedProperties(QObject* object) { return new Theme(object);

#define IMPL_ATTACH_PROP(_type_, _name_, _prop_, ...) \
Theme::AttachProp<_type_>& Theme::get_##_name_() { return _prop_; } \
_type_ Theme::_name_() const { return _prop_.value.value_or(theGlobalTheme->_name_); } \
_type_ Theme::_name_() const { return _prop_.value.value_or(theGlobalTheme()->_name_); } \
void Theme::set_##_name_(_type_ v) { setProp(_prop_, v); } \
void Theme::reset_##_name_() { \
auto* attached = qobject_cast<Self*>(attachedParent()); \
resetProp(_prop_, attached ? attached->_name_() : theGlobalTheme->_name_); \
resetProp(_prop_, attached ? attached->_name_() : theGlobalTheme()->_name_); \
}

IMPL_ATTACH_PROP(QColor, textColor, m_textColor)
Expand Down
Loading