eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-05-03 21:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

DisplaySettings+WindowServer: Allow updating theme without background

Browse Source 
With this change you can now set the theme and background color at the
same time in the Display Settings. Before if both were changed
before hitting 'apply' the theme background color would overwrite
the custom background.
This commit is contained in:
Ben Maxwell
2022-04-03 10:51:54 +01:00
committed by Andreas Kling
parent e6ad55ab53
commit 8070a98288
Notes: sideshowbarker 2024-07-17 14:33:59 +09:00 
Author: https://github.com/MacDue
Commit: https://github.com/SerenityOS/serenity/commit/8070a98288
Pull-request: https://github.com/SerenityOS/serenity/pull/13456
Issue: https://github.com/SerenityOS/serenity/issues/13448
11 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp
View File

@@ -31,7 +31,8 @@
namespace DisplaySettings {
BackgroundSettingsWidget::BackgroundSettingsWidget()
BackgroundSettingsWidget::BackgroundSettingsWidget(bool& background_settings_changed)
: m_background_settings_changed { background_settings_changed }
{
m_modes.append("tile");
m_modes.append("center");
@@ -86,20 +87,27 @@ void BackgroundSettingsWidget::create_frame()
return;
m_wallpaper_view->selection().clear();
m_monitor_widget->set_wallpaper(path.value());
m_background_settings_changed = true;
};
m_mode_combo = *find_descendant_of_type_named<GUI::ComboBox>("mode_combo");
m_mode_combo->set_only_allow_values_from_model(true);
m_mode_combo->set_model(*GUI::ItemListModel<String>::create(m_modes));
m_mode_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
bool first_mode_change = true;
m_mode_combo->on_change = [this, first_mode_change](auto&, const GUI::ModelIndex& index) mutable {
m_monitor_widget->set_wallpaper_mode(m_modes.at(index.row()));
m_background_settings_changed = !first_mode_change;
first_mode_change = false;
};
m_color_input = *find_descendant_of_type_named<GUI::ColorInput>("color_input");
m_color_input->set_color_has_alpha_channel(false);
m_color_input->set_color_picker_title("Select color for desktop");
m_color_input->on_change = [this] {
bool first_color_change = true;
m_color_input->on_change = [this, first_color_change]() mutable {
m_monitor_widget->set_background_color(m_color_input->color());
m_background_settings_changed = !first_color_change;
first_color_change = false;
};
}
@@ -133,6 +141,7 @@ void BackgroundSettingsWidget::load_current_settings()
m_color_input->set_color(palette_desktop_color);
m_monitor_widget->set_background_color(palette_desktop_color);
m_background_settings_changed = false;
}
void BackgroundSettingsWidget::apply_settings()