RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:38:11 +00:00
Code Issues Activity Actions

DisplaySettings: Remove root_widget() from DisplaySettings

Browse source 
This fixes a weird dependency graph in DisplaySettings. The widget itself
(which is described in `gml` now), no longer contains `root_widget()`.

The widget itself has been moved into a tabbed pane, to get it ready
to add some more features and bring it more up to date with the current
UI code.
This commit is contained in:
Jesse Buhagiar 2021-01-02 00:58:05 +11:00 • committed by Andreas Kling
parent 865f524d5b
commit ef5e9af6d3
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Applications/DisplaySettings/DisplaySettings.cpp
View file

@ -90,12 +90,11 @@ void DisplaySettingsWidget::create_wallpaper_list()
void DisplaySettingsWidget::create_frame() void DisplaySettingsWidget::create_frame()
{ {
m_root_widget = GUI::Widget::construct(); load_from_gml(display_settings_window_gml);
m_root_widget->load_from_gml(display_settings_window_gml);
m_monitor_widget = *m_root_widget->find_descendant_of_type_named<DisplaySettings::MonitorWidget>("monitor_widget"); m_monitor_widget = *find_descendant_of_type_named<DisplaySettings::MonitorWidget>("monitor_widget");
m_wallpaper_combo = *m_root_widget->find_descendant_of_type_named<GUI::ComboBox>("wallpaper_combo"); m_wallpaper_combo = *find_descendant_of_type_named<GUI::ComboBox>("wallpaper_combo");
m_wallpaper_combo->set_only_allow_values_from_model(true); m_wallpaper_combo->set_only_allow_values_from_model(true);
m_wallpaper_combo->set_model(*GUI::ItemListModel<AK::String>::create(m_wallpapers)); m_wallpaper_combo->set_model(*GUI::ItemListModel<AK::String>::create(m_wallpapers));
m_wallpaper_combo->on_change = [this](auto& text, const GUI::ModelIndex& index) { m_wallpaper_combo->on_change = [this](auto& text, const GUI::ModelIndex& index) {
@ -120,11 +119,11 @@ void DisplaySettingsWidget::create_frame()
m_monitor_widget->update(); m_monitor_widget->update();
}; };
auto& button = *m_root_widget->find_descendant_of_type_named<GUI::Button>("wallpaper_open_button"); auto& button = *find_descendant_of_type_named<GUI::Button>("wallpaper_open_button");
button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png")); button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"));
button.set_button_style(Gfx::ButtonStyle::CoolBar); button.set_button_style(Gfx::ButtonStyle::CoolBar);
button.on_click = [this](auto) { button.on_click = [this](auto) {
Optional<String> open_path = GUI::FilePicker::get_open_filepath(root_widget()->window(), "Select wallpaper from file system."); Optional<String> open_path = GUI::FilePicker::get_open_filepath(nullptr, "Select wallpaper from file system.");
if (!open_path.has_value()) if (!open_path.has_value())
return; return;
@ -134,7 +133,7 @@ void DisplaySettingsWidget::create_frame()
m_wallpaper_combo->set_only_allow_values_from_model(true); m_wallpaper_combo->set_only_allow_values_from_model(true);
}; };
m_mode_combo = *m_root_widget->find_descendant_of_type_named<GUI::ComboBox>("mode_combo"); 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_only_allow_values_from_model(true);
m_mode_combo->set_model(*GUI::ItemListModel<AK::String>::create(m_modes)); m_mode_combo->set_model(*GUI::ItemListModel<AK::String>::create(m_modes));
m_mode_combo->on_change = [this](auto&, const GUI::ModelIndex& index) { m_mode_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
@ -142,7 +141,7 @@ void DisplaySettingsWidget::create_frame()
m_monitor_widget->update(); m_monitor_widget->update();
}; };
m_resolution_combo = *m_root_widget->find_descendant_of_type_named<GUI::ComboBox>("resolution_combo"); m_resolution_combo = *find_descendant_of_type_named<GUI::ComboBox>("resolution_combo");
m_resolution_combo->set_only_allow_values_from_model(true); m_resolution_combo->set_only_allow_values_from_model(true);
m_resolution_combo->set_model(*GUI::ItemListModel<Gfx::IntSize>::create(m_resolutions)); m_resolution_combo->set_model(*GUI::ItemListModel<Gfx::IntSize>::create(m_resolutions));
m_resolution_combo->on_change = [this](auto&, const GUI::ModelIndex& index) { m_resolution_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
@ -150,7 +149,7 @@ void DisplaySettingsWidget::create_frame()
m_monitor_widget->update(); m_monitor_widget->update();
}; };
m_color_input = *m_root_widget->find_descendant_of_type_named<GUI::ColorInput>("color_input"); 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_has_alpha_channel(false);
m_color_input->set_color_picker_title("Select color for desktop"); m_color_input->set_color_picker_title("Select color for desktop");
m_color_input->on_change = [this] { m_color_input->on_change = [this] {
@ -158,18 +157,18 @@ void DisplaySettingsWidget::create_frame()
m_monitor_widget->update(); m_monitor_widget->update();
}; };
auto& ok_button = *m_root_widget->find_descendant_of_type_named<GUI::Button>("ok_button"); auto& ok_button = *find_descendant_of_type_named<GUI::Button>("ok_button");
ok_button.on_click = [this](auto) { ok_button.on_click = [this](auto) {
send_settings_to_window_server(); send_settings_to_window_server();
GUI::Application::the()->quit(); GUI::Application::the()->quit();
}; };
auto& cancel_button = *m_root_widget->find_descendant_of_type_named<GUI::Button>("cancel_button"); auto& cancel_button = *find_descendant_of_type_named<GUI::Button>("cancel_button");
cancel_button.on_click = [](auto) { cancel_button.on_click = [](auto) {
GUI::Application::the()->quit(); GUI::Application::the()->quit();
}; };
auto& apply_button = *m_root_widget->find_descendant_of_type_named<GUI::Button>("apply_button"); auto& apply_button = *find_descendant_of_type_named<GUI::Button>("apply_button");
apply_button.on_click = [this](auto) { apply_button.on_click = [this](auto) {
send_settings_to_window_server(); send_settings_to_window_server();
}; };
@ -250,7 +249,7 @@ void DisplaySettingsWidget::send_settings_to_window_server()
{ {
auto result = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetResolution>(m_monitor_widget->desktop_resolution()); auto result = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetResolution>(m_monitor_widget->desktop_resolution());
if (!result->success()) { if (!result->success()) {
GUI::MessageBox::show(root_widget()->window(), String::formatted("Reverting to resolution {}x{}", result->resolution().width(), result->resolution().height()), GUI::MessageBox::show(nullptr, String::formatted("Reverting to resolution {}x{}", result->resolution().width(), result->resolution().height()),
"Unable to set resolution", GUI::MessageBox::Type::Error); "Unable to set resolution", GUI::MessageBox::Type::Error);
} }

3
Applications/DisplaySettings/DisplaySettings.h
View file

@ -36,8 +36,6 @@ class DisplaySettingsWidget : public GUI::Widget {
public: public:
DisplaySettingsWidget(); DisplaySettingsWidget();
GUI::Widget* root_widget() { return m_root_widget; }
private: private:
void create_frame(); void create_frame();
void create_wallpaper_list(); void create_wallpaper_list();
@ -49,7 +47,6 @@ private:
Vector<String> m_modes; Vector<String> m_modes;
Vector<Gfx::IntSize> m_resolutions; Vector<Gfx::IntSize> m_resolutions;
RefPtr<GUI::Widget> m_root_widget;
RefPtr<DisplaySettings::MonitorWidget> m_monitor_widget; RefPtr<DisplaySettings::MonitorWidget> m_monitor_widget;
RefPtr<GUI::ComboBox> m_wallpaper_combo; RefPtr<GUI::ComboBox> m_wallpaper_combo;
RefPtr<GUI::ComboBox> m_mode_combo; RefPtr<GUI::ComboBox> m_mode_combo;

11
Applications/DisplaySettings/main.cpp
View file

@ -32,6 +32,7 @@
#include <LibGUI/Icon.h> #include <LibGUI/Icon.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h> #include <LibGUI/MenuBar.h>
#include <LibGUI/TabWidget.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
@ -53,15 +54,17 @@ int main(int argc, char** argv)
auto app_icon = GUI::Icon::default_icon("app-display-settings"); auto app_icon = GUI::Icon::default_icon("app-display-settings");
// FIXME: Clean up this bizarre object graph // Let's create the tab pane that we'll hook our widgets up to :^)
auto instance = DisplaySettingsWidget::construct(); auto tab_widget = GUI::TabWidget::construct();
tab_widget->add_tab<DisplaySettingsWidget>("Display Settings");
tab_widget->set_fill_with_background_color(true); // No black backgrounds!
auto window = GUI::Window::construct(); auto window = GUI::Window::construct();
dbgln("main window: {}", window); dbgln("main window: {}", window);
window->set_title("Display settings"); window->set_title("Display settings");
window->resize(360, 390); window->resize(360, 410);
window->set_resizable(false); window->set_resizable(false);
window->set_main_widget(instance->root_widget()); window->set_main_widget(tab_widget.ptr());
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
auto menubar = GUI::MenuBar::construct(); auto menubar = GUI::MenuBar::construct();