From 992ff4bd6329e29ade318632b0c946f03a25939f Mon Sep 17 00:00:00 2001
From: FrHun <28605587+frhun@users.noreply.github.com>
Date: Fri, 10 Jun 2022 23:03:11 +0200
Subject: [PATCH] LibGUI: Use new DialogButton for consistency

---
 Userland/Libraries/LibGUI/AboutDialog.cpp          |  3 +--
 Userland/Libraries/LibGUI/ColorPicker.cpp          |  6 ++----
 Userland/Libraries/LibGUI/FilePickerDialog.gml     |  6 ++----
 Userland/Libraries/LibGUI/FontPickerDialog.gml     |  6 ++----
 Userland/Libraries/LibGUI/InputBox.cpp             |  4 ++--
 Userland/Libraries/LibGUI/PasswordInputDialog.gml  |  6 ++----
 Userland/Libraries/LibGUI/SettingsWindow.cpp       | 12 ++++--------
 Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp |  9 +++------
 8 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/Userland/Libraries/LibGUI/AboutDialog.cpp b/Userland/Libraries/LibGUI/AboutDialog.cpp
index d40c9523d3..1d86433364 100644
--- a/Userland/Libraries/LibGUI/AboutDialog.cpp
+++ b/Userland/Libraries/LibGUI/AboutDialog.cpp
@@ -79,8 +79,7 @@ AboutDialog::AboutDialog(StringView name, Gfx::Bitmap const* icon, Window* paren
     button_container.set_fixed_height(22);
     button_container.set_layout<HorizontalBoxLayout>();
     button_container.layout()->add_spacer();
-    auto& ok_button = button_container.add<Button>("OK");
-    ok_button.set_fixed_width(80);
+    auto& ok_button = button_container.add<DialogButton>("OK");
     ok_button.on_click = [this](auto) {
         done(ExecResult::OK);
     };
diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp
index 0759ff1675..2af591fde5 100644
--- a/Userland/Libraries/LibGUI/ColorPicker.cpp
+++ b/Userland/Libraries/LibGUI/ColorPicker.cpp
@@ -232,16 +232,14 @@ void ColorPicker::build_ui()
     button_container.layout()->set_spacing(4);
     button_container.layout()->add_spacer();
 
-    auto& ok_button = button_container.add<Button>();
-    ok_button.set_fixed_width(80);
+    auto& ok_button = button_container.add<DialogButton>();
     ok_button.set_text("OK");
     ok_button.on_click = [this](auto) {
         done(ExecResult::OK);
     };
     ok_button.set_default(true);
 
-    auto& cancel_button = button_container.add<Button>();
-    cancel_button.set_fixed_width(80);
+    auto& cancel_button = button_container.add<DialogButton>();
     cancel_button.set_text("Cancel");
     cancel_button.on_click = [this](auto) {
         done(ExecResult::Cancel);
diff --git a/Userland/Libraries/LibGUI/FilePickerDialog.gml b/Userland/Libraries/LibGUI/FilePickerDialog.gml
index 61034bbce0..cd45636dd4 100644
--- a/Userland/Libraries/LibGUI/FilePickerDialog.gml
+++ b/Userland/Libraries/LibGUI/FilePickerDialog.gml
@@ -69,10 +69,9 @@
                     fixed_width: 20
                 }
 
-                @GUI::Button {
+                @GUI::DialogButton {
                     name: "ok_button"
                     text: "OK"
-                    fixed_width: 75
                 }
             }
 
@@ -82,10 +81,9 @@
 
                 @GUI::Layout::Spacer {}
 
-                @GUI::Button {
+                @GUI::DialogButton {
                     name: "cancel_button"
                     text: "Cancel"
-                    fixed_width: 75
                 }
             }
         }
diff --git a/Userland/Libraries/LibGUI/FontPickerDialog.gml b/Userland/Libraries/LibGUI/FontPickerDialog.gml
index ebd4a1ba56..6d6074fcd0 100644
--- a/Userland/Libraries/LibGUI/FontPickerDialog.gml
+++ b/Userland/Libraries/LibGUI/FontPickerDialog.gml
@@ -73,16 +73,14 @@
 
         @GUI::Widget {}
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "ok_button"
             text: "OK"
-            fixed_width: 80
         }
 
-        @GUI::Button {
+        @GUI::DialogButton {
             name: "cancel_button"
             text: "Cancel"
-            fixed_width: 80
         }
     }
 }
diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp
index f6d838c09a..d0363e4e18 100644
--- a/Userland/Libraries/LibGUI/InputBox.cpp
+++ b/Userland/Libraries/LibGUI/InputBox.cpp
@@ -82,7 +82,7 @@ void InputBox::build(InputType input_type)
     button_container_inner.layout()->set_margins({ 4, 0, 4, 4 });
     button_container_inner.layout()->add_spacer();
 
-    m_ok_button = button_container_inner.add<Button>();
+    m_ok_button = button_container_inner.add<DialogButton>();
     m_ok_button->set_text("OK");
     m_ok_button->on_click = [this](auto) {
         dbgln("GUI::InputBox: OK button clicked");
@@ -91,7 +91,7 @@ void InputBox::build(InputType input_type)
     };
     m_ok_button->set_default(true);
 
-    m_cancel_button = button_container_inner.add<Button>();
+    m_cancel_button = button_container_inner.add<DialogButton>();
     m_cancel_button->set_text("Cancel");
     m_cancel_button->on_click = [this](auto) {
         dbgln("GUI::InputBox: Cancel button clicked");
diff --git a/Userland/Libraries/LibGUI/PasswordInputDialog.gml b/Userland/Libraries/LibGUI/PasswordInputDialog.gml
index 5bc2b75092..931403bd3f 100644
--- a/Userland/Libraries/LibGUI/PasswordInputDialog.gml
+++ b/Userland/Libraries/LibGUI/PasswordInputDialog.gml
@@ -78,16 +78,14 @@
 
             @GUI::Widget {}
 
-            @GUI::Button {
+            @GUI::DialogButton {
                 text: "OK"
                 name: "ok_button"
-                fixed_width: 75
             }
 
-            @GUI::Button {
+            @GUI::DialogButton {
                 text: "Cancel"
                 name: "cancel_button"
-                fixed_width: 75
             }
         }
     }
diff --git a/Userland/Libraries/LibGUI/SettingsWindow.cpp b/Userland/Libraries/LibGUI/SettingsWindow.cpp
index 23815f0b8a..cbd3a2d0ef 100644
--- a/Userland/Libraries/LibGUI/SettingsWindow.cpp
+++ b/Userland/Libraries/LibGUI/SettingsWindow.cpp
@@ -46,8 +46,7 @@ ErrorOr<NonnullRefPtr<SettingsWindow>> SettingsWindow::create(String title, Show
     button_container->layout()->set_spacing(6);
 
     if (show_defaults_button == ShowDefaultsButton::Yes) {
-        window->m_reset_button = TRY(button_container->try_add<GUI::Button>("Defaults"));
-        window->m_reset_button->set_fixed_width(75);
+        window->m_reset_button = TRY(button_container->try_add<GUI::DialogButton>("Defaults"));
         window->m_reset_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
             window->reset_default_values();
         };
@@ -55,22 +54,19 @@ ErrorOr<NonnullRefPtr<SettingsWindow>> SettingsWindow::create(String title, Show
 
     TRY(button_container->layout()->try_add_spacer());
 
-    window->m_ok_button = TRY(button_container->try_add<GUI::Button>("OK"));
-    window->m_ok_button->set_fixed_width(75);
+    window->m_ok_button = TRY(button_container->try_add<GUI::DialogButton>("OK"));
     window->m_ok_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
         window->apply_settings();
         GUI::Application::the()->quit();
     };
 
-    window->m_cancel_button = TRY(button_container->try_add<GUI::Button>("Cancel"));
-    window->m_cancel_button->set_fixed_width(75);
+    window->m_cancel_button = TRY(button_container->try_add<GUI::DialogButton>("Cancel"));
     window->m_cancel_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
         window->cancel_settings();
         GUI::Application::the()->quit();
     };
 
-    window->m_apply_button = TRY(button_container->try_add<GUI::Button>("Apply"));
-    window->m_apply_button->set_fixed_width(75);
+    window->m_apply_button = TRY(button_container->try_add<GUI::DialogButton>("Apply"));
     window->m_apply_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
         window->apply_settings();
     };
diff --git a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp
index d0c335c1c9..586ba182e9 100644
--- a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp
+++ b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp
@@ -46,14 +46,12 @@ WizardDialog::WizardDialog(Window* parent_window)
     nav_container_widget.layout()->set_spacing(0);
     nav_container_widget.layout()->add_spacer();
 
-    m_back_button = nav_container_widget.add<Button>("< Back");
-    m_back_button->set_fixed_width(75);
+    m_back_button = nav_container_widget.add<DialogButton>("< Back");
     m_back_button->on_click = [&](auto) {
         pop_page();
     };
 
-    m_next_button = nav_container_widget.add<Button>("Next >");
-    m_next_button->set_fixed_width(75);
+    m_next_button = nav_container_widget.add<DialogButton>("Next >");
     m_next_button->on_click = [&](auto) {
         VERIFY(has_pages());
 
@@ -70,8 +68,7 @@ WizardDialog::WizardDialog(Window* parent_window)
     auto& button_spacer = nav_container_widget.add<Widget>();
     button_spacer.set_fixed_width(10);
 
-    m_cancel_button = nav_container_widget.add<Button>("Cancel");
-    m_cancel_button->set_fixed_width(75);
+    m_cancel_button = nav_container_widget.add<DialogButton>("Cancel");
     m_cancel_button->on_click = [&](auto) {
         handle_cancel();
     };