diff --git a/Applications/Browser/InspectorWidget.cpp b/Applications/Browser/InspectorWidget.cpp index 718883a27f..3f2330df90 100644 --- a/Applications/Browser/InspectorWidget.cpp +++ b/Applications/Browser/InspectorWidget.cpp @@ -39,7 +39,7 @@ InspectorWidget::InspectorWidget(GUI::Widget* parent) : GUI::Widget(parent) { set_layout(make()); - auto splitter = GUI::Splitter::construct(Orientation::Vertical, this); + auto splitter = GUI::VerticalSplitter::construct(this); m_dom_tree_view = GUI::TreeView::construct(splitter); m_dom_tree_view->on_selection = [this](auto& index) { auto* node = static_cast(index.internal_data()); diff --git a/Applications/DisplayProperties/DisplayProperties.cpp b/Applications/DisplayProperties/DisplayProperties.cpp index b9d1b9ac3e..67ae4ca015 100644 --- a/Applications/DisplayProperties/DisplayProperties.cpp +++ b/Applications/DisplayProperties/DisplayProperties.cpp @@ -125,7 +125,7 @@ void DisplayPropertiesWidget::create_frame() auto tab_widget = GUI::TabWidget::construct(m_root_widget); // First, let's create the "Background" tab - auto background_splitter = GUI::Splitter::construct(Orientation::Vertical, nullptr); + auto background_splitter = GUI::VerticalSplitter::construct(nullptr); tab_widget->add_widget("Wallpaper", background_splitter); auto background_content = GUI::Widget::construct(background_splitter.ptr()); @@ -155,7 +155,7 @@ void DisplayPropertiesWidget::create_frame() }; // Let's add the settings tab - auto settings_splitter = GUI::Splitter::construct(Orientation::Vertical, nullptr); + auto settings_splitter = GUI::VerticalSplitter::construct(nullptr); tab_widget->add_widget("Settings", settings_splitter); auto settings_content = GUI::Widget::construct(settings_splitter.ptr()); diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index a0c604d3d0..7e01363fc8 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -103,7 +103,7 @@ int main(int argc, char** argv) auto location_textbox = GUI::TextEditor::construct(GUI::TextEditor::SingleLine, location_toolbar); - auto splitter = GUI::Splitter::construct(Orientation::Horizontal, widget); + auto splitter = GUI::HorizontalSplitter::construct(widget); auto tree_view = GUI::TreeView::construct(splitter); auto directories_model = GUI::FileSystemModel::create("/", GUI::FileSystemModel::Mode::DirectoriesOnly); tree_view->set_model(directories_model); diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index 9857db9419..dc7317dfd7 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) auto toolbar = GUI::ToolBar::construct(widget); - auto splitter = GUI::Splitter::construct(Orientation::Horizontal, widget); + auto splitter = GUI::HorizontalSplitter::construct(widget); auto model = ManualModel::create(); diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp index 3578e922c8..496a2d7d17 100644 --- a/Applications/IRCClient/IRCAppWindow.cpp +++ b/Applications/IRCClient/IRCAppWindow.cpp @@ -199,7 +199,7 @@ void IRCAppWindow::setup_widgets() outer_container->set_layout(make()); outer_container->layout()->set_margins({ 2, 0, 2, 2 }); - auto horizontal_container = GUI::Splitter::construct(Orientation::Horizontal, outer_container); + auto horizontal_container = GUI::HorizontalSplitter::construct(outer_container); m_window_list = GUI::TableView::construct(horizontal_container); m_window_list->set_headers_visible(false); diff --git a/Applications/IRCClient/IRCWindow.cpp b/Applications/IRCClient/IRCWindow.cpp index e0f1498e68..c78b462b88 100644 --- a/Applications/IRCClient/IRCWindow.cpp +++ b/Applications/IRCClient/IRCWindow.cpp @@ -45,7 +45,7 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na set_layout(make()); // Make a container for the log buffer view + (optional) member list. - auto container = GUI::Splitter::construct(Orientation::Horizontal, this); + auto container = GUI::HorizontalSplitter::construct(this); m_html_view = HtmlView::construct(container); diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp index 5cb23ca6ed..0fb6229f0f 100644 --- a/Applications/SystemMonitor/main.cpp +++ b/Applications/SystemMonitor/main.cpp @@ -121,7 +121,7 @@ int main(int argc, char** argv) auto tabwidget = GUI::TabWidget::construct(keeper); - auto process_container_splitter = GUI::Splitter::construct(Orientation::Vertical, nullptr); + auto process_container_splitter = GUI::VerticalSplitter::construct(nullptr); tabwidget->add_widget("Processes", process_container_splitter); auto process_table_container = GUI::Widget::construct(process_container_splitter.ptr()); diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp index 71da528cf0..6afb9ae6fb 100644 --- a/DevTools/HackStudio/main.cpp +++ b/DevTools/HackStudio/main.cpp @@ -247,7 +247,7 @@ int main(int argc, char** argv) project_tree_view_context_menu->add_action(add_existing_file_action); project_tree_view_context_menu->add_action(delete_action); - auto outer_splitter = GUI::Splitter::construct(Orientation::Horizontal, widget); + auto outer_splitter = GUI::HorizontalSplitter::construct(widget); g_project_tree_view = GUI::TreeView::construct(outer_splitter); g_project_tree_view->set_model(g_project->model()); g_project_tree_view->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); @@ -296,11 +296,11 @@ int main(int argc, char** argv) form_widgets_toolbar->add_action(move(action)); }); - auto form_editor_inner_splitter = GUI::Splitter::construct(Orientation::Horizontal, g_form_inner_container); + auto form_editor_inner_splitter = GUI::HorizontalSplitter::construct(g_form_inner_container); g_form_editor_widget = FormEditorWidget::construct(form_editor_inner_splitter); - auto form_editing_pane_container = GUI::Splitter::construct(Orientation::Vertical, form_editor_inner_splitter); + auto form_editing_pane_container = GUI::VerticalSplitter::construct(form_editor_inner_splitter); form_editing_pane_container->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); form_editing_pane_container->set_preferred_size(190, 0); form_editing_pane_container->set_layout(make()); @@ -345,7 +345,7 @@ int main(int argc, char** argv) add_properties_pane("Form widget tree:", form_widget_tree_view); add_properties_pane("Widget properties:", GUI::TableView::construct(nullptr)); - g_text_inner_splitter = GUI::Splitter::construct(Orientation::Vertical, g_right_hand_stack); + g_text_inner_splitter = GUI::VerticalSplitter::construct(g_right_hand_stack); g_text_inner_splitter->layout()->set_margins({ 0, 3, 0, 0 }); add_new_editor(*g_text_inner_splitter); diff --git a/DevTools/Inspector/main.cpp b/DevTools/Inspector/main.cpp index 4a4e75b3e1..95af8234fd 100644 --- a/DevTools/Inspector/main.cpp +++ b/DevTools/Inspector/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char** argv) widget->set_fill_with_background_color(true); widget->set_layout(make()); - auto splitter = GUI::Splitter::construct(Orientation::Horizontal, widget); + auto splitter = GUI::HorizontalSplitter::construct(widget); RemoteProcess remote_process(pid); diff --git a/Libraries/LibGUI/GSplitter.h b/Libraries/LibGUI/GSplitter.h index b5d9573da6..06c56d5b55 100644 --- a/Libraries/LibGUI/GSplitter.h +++ b/Libraries/LibGUI/GSplitter.h @@ -54,4 +54,28 @@ private: Gfx::Size m_second_resizee_start_size; }; +class VerticalSplitter final : public Splitter { + C_OBJECT(VerticalSplitter) +public: + virtual ~VerticalSplitter() override {} + +private: + explicit VerticalSplitter(Widget* parent) + : Splitter(Orientation::Vertical, parent) + { + } +}; + +class HorizontalSplitter final : public Splitter { + C_OBJECT(HorizontalSplitter) +public: + virtual ~HorizontalSplitter() override {} + +private: + explicit HorizontalSplitter(Widget* parent) + : Splitter(Orientation::Horizontal, parent) + { + } +}; + }