瀏覽代碼

LibGUI: Remove button padding on Toolbar construction

And assume 24x24 button sizes by default.
There currently aren't any toolbars with custom button sizes, but if
the need arises, they can always determine their own padding.
thankyouverycool 3 年之前
父節點
當前提交
1084eaea0b
共有 2 個文件被更改,包括 8 次插入8 次删除
  1. 6 6
      Userland/Libraries/LibGUI/Toolbar.cpp
  2. 2 2
      Userland/Libraries/LibGUI/Toolbar.h

+ 6 - 6
Userland/Libraries/LibGUI/Toolbar.cpp

@@ -26,11 +26,11 @@ Toolbar::Toolbar(Orientation orientation, int button_size)
     : m_orientation(orientation)
     , m_button_size(button_size)
 {
-    if (m_orientation == Orientation::Horizontal) {
-        set_fixed_height(button_size + 8);
-    } else {
-        set_fixed_width(button_size + 8);
-    }
+    if (m_orientation == Orientation::Horizontal)
+        set_fixed_height(button_size);
+    else
+        set_fixed_width(button_size);
+
     set_layout<BoxLayout>(orientation);
     layout()->set_spacing(0);
     layout()->set_margins({ 2, 2, 2, 2 });
@@ -96,7 +96,7 @@ ErrorOr<NonnullRefPtr<GUI::Button>> Toolbar::try_add_action(Action& action)
     TRY(m_items.try_ensure_capacity(m_items.size() + 1));
 
     auto button = TRY(try_add<ToolbarButton>(action));
-    button->set_fixed_size(m_button_size + 8, m_button_size + 8);
+    button->set_fixed_size(m_button_size, m_button_size);
 
     m_items.unchecked_append(move(item));
     return button;

+ 2 - 2
Userland/Libraries/LibGUI/Toolbar.h

@@ -28,7 +28,7 @@ public:
     virtual Optional<UISize> calculated_preferred_size() const override;
 
 protected:
-    explicit Toolbar(Gfx::Orientation = Gfx::Orientation::Horizontal, int button_size = 16);
+    explicit Toolbar(Gfx::Orientation = Gfx::Orientation::Horizontal, int button_size = 24);
 
     virtual void paint_event(PaintEvent&) override;
 
@@ -44,7 +44,7 @@ private:
     };
     NonnullOwnPtrVector<Item> m_items;
     const Gfx::Orientation m_orientation;
-    int m_button_size { 16 };
+    int m_button_size { 24 };
 };
 
 }