beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 17:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibGUI: Convert GComboBox to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-21 16:35:11 +02:00
parent 7aaad27778
commit e4e92980a1
Notes: sideshowbarker 2024-07-19 12:01:46 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/e4e92980a17
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Applications/DisplayProperties/DisplayProperties.cpp
View file

@ -103,7 +103,7 @@ void DisplayPropertiesWidget::create_frame()
m_wallpaper_preview = GLabel::construct(background_splitter); m_wallpaper_preview = GLabel::construct(background_splitter);
auto* wallpaper_list = new GListView(background_content); auto wallpaper_list = GListView::construct(background_content);
wallpaper_list->set_background_color(Color::White); wallpaper_list->set_background_color(Color::White);
wallpaper_list->set_model(*ItemListModel<AK::String>::create(m_wallpapers)); wallpaper_list->set_model(*ItemListModel<AK::String>::create(m_wallpapers));
wallpaper_list->horizontal_scrollbar().set_visible(false); wallpaper_list->horizontal_scrollbar().set_visible(false);
@ -124,7 +124,7 @@ void DisplayPropertiesWidget::create_frame()
settings_content->set_layout(make<GBoxLayout>(Orientation::Vertical)); settings_content->set_layout(make<GBoxLayout>(Orientation::Vertical));
settings_content->layout()->set_margins({ 4, 4, 4, 4 }); settings_content->layout()->set_margins({ 4, 4, 4, 4 });
auto* resolution_list = new GListView(settings_content); auto resolution_list = GListView::construct(settings_content);
resolution_list->set_background_color(Color::White); resolution_list->set_background_color(Color::White);
resolution_list->set_model(*ItemListModel<Size>::create(m_resolutions)); resolution_list->set_model(*ItemListModel<Size>::create(m_resolutions));
resolution_list->horizontal_scrollbar().set_visible(false); resolution_list->horizontal_scrollbar().set_visible(false);

2
Libraries/LibGUI/GComboBox.cpp
View file

@ -33,7 +33,7 @@ GComboBox::GComboBox(GWidget* parent)
m_list_window->set_window_type(GWindowType::Tooltip); m_list_window->set_window_type(GWindowType::Tooltip);
m_list_window->set_should_destroy_on_close(false); m_list_window->set_should_destroy_on_close(false);
m_list_view = new GListView(nullptr); m_list_view = GListView::construct(nullptr);
m_list_view->horizontal_scrollbar().set_visible(false); m_list_view->horizontal_scrollbar().set_visible(false);
m_list_window->set_main_widget(m_list_view); m_list_window->set_main_widget(m_list_view);

2
Libraries/LibGUI/GComboBox.h
View file

@ -39,6 +39,6 @@ private:
ObjectPtr<GTextEditor> m_editor; ObjectPtr<GTextEditor> m_editor;
GButton* m_open_button { nullptr }; GButton* m_open_button { nullptr };
GWindow* m_list_window { nullptr }; GWindow* m_list_window { nullptr };
GListView* m_list_view { nullptr }; ObjectPtr<GListView> m_list_view;
bool m_only_allow_values_from_model { false }; bool m_only_allow_values_from_model { false };
}; };