RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:17:34 +00:00
Code Issues Activity Actions

DisplaySettings: Show a confirmation message when applying changes

Browse source 
The changes will be reverted after 10 seconds of no user input.
This commit is contained in:
EvilHowl 2021-02-02 11:34:45 +01:00 • committed by Andreas Kling
parent 2031baebce
commit a0c773da9e
2 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Applications/DisplaySettings/DisplaySettings.cpp
View file

@ -272,10 +272,41 @@ void DisplaySettingsWidget::load_current_settings()
void DisplaySettingsWidget::send_settings_to_window_server() void DisplaySettingsWidget::send_settings_to_window_server()
{ {
// Store the current screen resolution and scale factor in case the user wants to revert to it.
auto ws_config(Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini"));
Gfx::IntSize current_resolution;
current_resolution.set_width(ws_config->read_num_entry("Screen", "Width", 1024));
current_resolution.set_height(ws_config->read_num_entry("Screen", "Height", 768));
int current_scale_factor = ws_config->read_num_entry("Screen", "ScaleFactor", 1);
if (current_scale_factor != 1 && current_scale_factor != 2) {
dbgln("unexpected ScaleFactor {}, setting to 1", current_scale_factor);
current_scale_factor = 1;
}
auto result = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetResolution>(m_monitor_widget->desktop_resolution(), m_monitor_widget->desktop_scale_factor()); auto result = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetResolution>(m_monitor_widget->desktop_resolution(), m_monitor_widget->desktop_scale_factor());
if (!result->success()) { if (!result->success()) {
GUI::MessageBox::show(nullptr, String::formatted("Reverting to resolution {}x{} @ {}x", result->resolution().width(), result->resolution().height(), result->scale_factor()), GUI::MessageBox::show(nullptr, String::formatted("Reverting to resolution {}x{} @ {}x", result->resolution().width(), result->resolution().height(), result->scale_factor()),
"Unable to set resolution", GUI::MessageBox::Type::Error); "Unable to set resolution", GUI::MessageBox::Type::Error);
} else {
auto box = GUI::MessageBox::construct(window(), String::formatted("Do you want to keep the new settings? They will be reverted after 10 seconds."),
String::formatted("New screen resolution: {}x{} @ {}x", m_monitor_widget->desktop_resolution().width(), m_monitor_widget->desktop_resolution().height(),
m_monitor_widget->desktop_scale_factor()),
GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
box->set_icon(window()->icon());
// If after 10 seconds the user doesn't close the message box, just close it.
auto timer = Core::Timer::construct(10000, [&] {
box->close();
});
// If the user selects "No", closes the window or the window gets closed by the 10 seconds timer, revert the changes.
if (box->exec() != GUI::MessageBox::ExecYes) {
result = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetResolution>(current_resolution, current_scale_factor);
if (!result->success()) {
GUI::MessageBox::show(nullptr, String::formatted("Reverting to resolution {}x{} @ {}x", result->resolution().width(), result->resolution().height(), result->scale_factor()),
"Unable to set resolution", GUI::MessageBox::Type::Error);
}
}
} }
if (!m_monitor_widget->wallpaper().is_empty()) { if (!m_monitor_widget->wallpaper().is_empty()) {

1
Userland/Applications/DisplaySettings/DisplaySettings.h
View file

@ -27,6 +27,7 @@
#pragma once #pragma once
#include "MonitorWidget.h" #include "MonitorWidget.h"
#include <LibCore/Timer.h>
#include <LibGUI/ColorInput.h> #include <LibGUI/ColorInput.h>
#include <LibGUI/ComboBox.h> #include <LibGUI/ComboBox.h>
#include <LibGUI/RadioButton.h> #include <LibGUI/RadioButton.h>