RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 18:37:35 +00:00
Code Issues Activity Actions

WindowServer+DisplaySettings: Remove the weird "simple" wallpaper mode

Browse source 
Painting the wallpaper at 100% scale in the top left corner is a weird
mode and I don't think we need it. :^)
This commit is contained in:
Andreas Kling 2021-05-20 17:49:20 +02:00
parent 3046b3467c
commit 93ef661914
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp
View file

@ -26,7 +26,6 @@ namespace DisplaySettings {
BackgroundSettingsWidget::BackgroundSettingsWidget()
{
m_modes.append("simple");
m_modes.append("tile");
m_modes.append("center");
m_modes.append("stretch");
@ -96,10 +95,10 @@ void BackgroundSettingsWidget::load_current_settings()
m_monitor_widget->set_wallpaper(selected_wallpaper);
}
auto mode = ws_config->read_entry("Background", "Mode", "simple");
auto mode = ws_config->read_entry("Background", "Mode", "center");
if (!m_modes.contains_slow(mode)) {
warnln("Invalid background mode '{}' in WindowServer config, falling back to 'simple'", mode);
mode = "simple";
warnln("Invalid background mode '{}' in WindowServer config, falling back to 'center'", mode);
mode = "center";
}
m_monitor_widget->set_wallpaper_mode(mode);
m_mode_combo->set_selected_index(m_modes.find_first_index(mode).value_or(0));

4
Userland/Applications/DisplaySettings/MonitorWidget.cpp
View file

@ -104,9 +104,7 @@ void MonitorWidget::redraw_desktop_if_needed()
auto scaled_size = m_wallpaper_bitmap->size().to_type<float>().scaled_by(sw, sh).to_type<int>();
auto scaled_bitmap = m_wallpaper_bitmap->scaled(sw, sh);
if (m_desktop_wallpaper_mode == "simple") {
painter.blit({}, *scaled_bitmap, scaled_bitmap->rect());
} else if (m_desktop_wallpaper_mode == "center") {
if (m_desktop_wallpaper_mode == "center") {
Gfx::IntRect centered_rect { {}, scaled_size };
centered_rect.center_within(m_desktop_bitmap->rect());
painter.blit(centered_rect.location(), *scaled_bitmap, scaled_bitmap->rect());