RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:27:45 +00:00
Code Issues Activity Actions

DisplaySettings: Stop theme tab from overriding background color

Browse source 
Fixes #13448
This commit is contained in:
Ben Maxwell 2022-04-03 09:22:59 +01:00 • committed by Andreas Kling
parent d8ec9a5501
commit e6ad55ab53
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Applications/DisplaySettings/ThemesSettingsWidget.cpp
View file

@ -14,14 +14,18 @@
namespace DisplaySettings { namespace DisplaySettings {
static inline String current_system_theme()
{
return GUI::ConnectionToWindowServer::the().get_system_theme();
}
ThemesSettingsWidget::ThemesSettingsWidget() ThemesSettingsWidget::ThemesSettingsWidget()
{ {
load_from_gml(themes_settings_gml); load_from_gml(themes_settings_gml);
m_themes = Gfx::list_installed_system_themes(); m_themes = Gfx::list_installed_system_themes();
auto current_theme_name = GUI::ConnectionToWindowServer::the().get_system_theme();
size_t current_theme_index; size_t current_theme_index;
auto current_theme_name = current_system_theme();
m_theme_names.ensure_capacity(m_themes.size()); m_theme_names.ensure_capacity(m_themes.size());
for (auto& theme_meta : m_themes) { for (auto& theme_meta : m_themes) {
m_theme_names.append(theme_meta.name); m_theme_names.append(theme_meta.name);
@ -45,7 +49,7 @@ ThemesSettingsWidget::ThemesSettingsWidget()
void ThemesSettingsWidget::apply_settings() void ThemesSettingsWidget::apply_settings()
{ {
if (m_selected_theme) if (m_selected_theme && m_selected_theme->name != current_system_theme())
VERIFY(GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name)); VERIFY(GUI::ConnectionToWindowServer::the().set_system_theme(m_selected_theme->path, m_selected_theme->name));
} }