mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-22 09:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

DisplaySettings: Do not regenerate resolution list on resolution change

Browse source
This commit is contained in:
RatcheT2497 2024-10-20 12:18:23 +02:00 committed by Nico Weber
parent 8b164a8d22
commit aeae39282c
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Applications/DisplaySettings/MonitorSettingsWidget.cpp
View file

@ -112,7 +112,7 @@ ErrorOr<void> MonitorSettingsWidget::create_frame()
m_screen_combo->set_model(*GUI::ItemListModel<String>::create(m_screens));
m_screen_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
m_selected_screen_index = index.row();
auto result = selected_screen_index_or_resolution_changed();
auto result = selected_screen_index_or_resolution_changed(DidScreenIndexChange::Yes);
if (result.is_error())
GUI::MessageBox::show_error(window(), "Screen info could not be updated"sv);
};
@ -125,7 +125,7 @@ ErrorOr<void> MonitorSettingsWidget::create_frame()
selected_screen.resolution = m_resolutions.at(index.row());
// Try to auto re-arrange things if there are overlaps or disconnected screens
m_screen_layout.normalize();
auto result = selected_screen_index_or_resolution_changed();
auto result = selected_screen_index_or_resolution_changed(DidScreenIndexChange::No);
if (result.is_error()) {
GUI::MessageBox::show_error(window(), "Screen info could not be updated"sv);
return;
@ -161,7 +161,7 @@ ErrorOr<void> MonitorSettingsWidget::create_frame()
m_dpi_label = *find_descendant_of_type_named<GUI::Label>("display_dpi");
m_screen_combo->set_selected_index(m_selected_screen_index);
TRY(selected_screen_index_or_resolution_changed());
TRY(selected_screen_index_or_resolution_changed(DidScreenIndexChange::Yes));
return {};
}
@ -217,14 +217,16 @@ ErrorOr<void> MonitorSettingsWidget::load_current_settings()
if (!m_screen_combo.is_null()) {
m_screen_combo->set_selected_index(m_selected_screen_index);
TRY(selected_screen_index_or_resolution_changed());
TRY(selected_screen_index_or_resolution_changed(DidScreenIndexChange::Yes));
}
return {};
}
ErrorOr<void> MonitorSettingsWidget::selected_screen_index_or_resolution_changed()
ErrorOr<void> MonitorSettingsWidget::selected_screen_index_or_resolution_changed(DidScreenIndexChange screen_index_changed)
{
TRY(create_resolution_list());
// Generate new resolution list only when changing monitors
if (screen_index_changed == DidScreenIndexChange::Yes)
TRY(create_resolution_list());
auto& screen = m_screen_layout.screens[m_selected_screen_index];

7
Userland/Applications/DisplaySettings/MonitorSettingsWidget.h
View file

@ -18,6 +18,11 @@
namespace DisplaySettings {
enum class DidScreenIndexChange {
No,
Yes
};
class MonitorSettingsWidget final : public GUI::SettingsWindow::Tab {
C_OBJECT(MonitorSettingsWidget);
@ -43,7 +48,7 @@ private:
ErrorOr<void> create_resolution_list();
ErrorOr<void> load_current_settings();
ErrorOr<void> generate_resolution_strings();
ErrorOr<void> selected_screen_index_or_resolution_changed();
ErrorOr<void> selected_screen_index_or_resolution_changed(DidScreenIndexChange screen_index_changed);
size_t m_selected_screen_index { 0 };