Explorar o código

Userland: Set tab-widget properties in GML instead of code

Sam Atkins %!s(int64=3) %!d(string=hai) anos
pai
achega
84b98da259

+ 0 - 3
Userland/Applications/Browser/BrowserWindow.cpp

@@ -74,9 +74,6 @@ BrowserWindow::BrowserWindow(CookieJar& cookie_jar, URL url)
     auto& top_line = *widget.find_descendant_of_type_named<GUI::HorizontalSeparator>("top_line");
 
     m_tab_widget = *widget.find_descendant_of_type_named<GUI::TabWidget>("tab_widget");
-    m_tab_widget->set_reorder_allowed(true);
-    m_tab_widget->set_close_button_enabled(true);
-
     m_tab_widget->on_tab_count_change = [&top_line](size_t tab_count) {
         top_line.set_visible(tab_count > 1);
     };

+ 2 - 0
Userland/Applications/Browser/BrowserWindow.gml

@@ -13,6 +13,8 @@
         name: "tab_widget"
         container_margins: [0]
         uniform_tabs: true
+        reorder_allowed: true
+        show_close_buttons: true
         text_alignment: "CenterLeft"
     }
 }

+ 0 - 3
Userland/Applications/PixelPaint/MainWidget.cpp

@@ -40,9 +40,6 @@ MainWidget::MainWidget()
     m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
 
     m_tab_widget = find_descendant_of_type_named<GUI::TabWidget>("tab_widget");
-    m_tab_widget->set_container_margins({ 4, 5, 5, 4 });
-    m_tab_widget->set_reorder_allowed(true);
-    m_tab_widget->set_close_button_enabled(true);
 
     m_palette_widget = *find_descendant_of_type_named<PixelPaint::PaletteWidget>("palette_widget");
 

+ 3 - 0
Userland/Applications/PixelPaint/PixelPaintWindow.gml

@@ -33,6 +33,9 @@
 
             @GUI::TabWidget {
                 name: "tab_widget"
+                container_margins: [4, 5, 5, 4]
+                reorder_allowed: true
+                show_close_buttons: true
             }
 
             @PixelPaint::PaletteWidget {

+ 1 - 0
Userland/Demos/WidgetGallery/GalleryGML/Window.gml

@@ -6,5 +6,6 @@
 
     @GUI::TabWidget {
         name: "tab_widget"
+        reorder_allowed: true
     }
 }

+ 0 - 1
Userland/Demos/WidgetGallery/GalleryWidget.cpp

@@ -34,7 +34,6 @@ GalleryWidget::GalleryWidget()
     load_from_gml(window_gml);
 
     auto& tab_widget = *find_descendant_of_type_named<GUI::TabWidget>("tab_widget");
-    tab_widget.set_reorder_allowed(true);
 
     auto basics_tab = tab_widget.try_add_tab<GUI::Widget>("Basics").release_value_but_fixme_should_propagate_errors();
     basics_tab->load_from_gml(basics_tab_gml);