RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 02:35:09 +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

11
Applications/DisplaySettings/main.cpp
View file

@ -32,6 +32,7 @@
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/TabWidget.h>
#include <LibGUI/Widget.h>
#include <LibGUI/Window.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");
// FIXME: Clean up this bizarre object graph
auto instance = DisplaySettingsWidget::construct();
// Let's create the tab pane that we'll hook our widgets up to :^)
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();
dbgln("main window: {}", window);
window->set_title("Display settings");
window->resize(360, 390);
window->resize(360, 410);
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));
auto menubar = GUI::MenuBar::construct();