LibGUI: Add a ToolBarContainer widget and put most ToolBars in one

This mimics the Explorer toolbar container from Windows 2000 and looks
pretty neat! :^)

12 files changed, 179 insertions, 18 deletions

diff --git a/Applications/Browser/main.cpp b/Applications/Browser/main.cpp
index 1ed5d03d3b..0bf63bb9b4 100644
--- a/Applications/Browser/main.cpp
+++ b/Applications/Browser/main.cpp
@@ -38,6 +38,7 @@
 #include <LibGUI/StatusBar.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/ToolBar.h>
+#include <LibGUI/ToolBarContainer.h>
 #include <LibGUI/Window.h>
 #include <LibWeb/CSS/StyleResolver.h>
 #include <LibWeb/DOM/Element.h>
@@ -104,8 +105,9 @@ int main(int argc, char** argv)
 
     bool bookmarksbar_enabled = true;
 
-    auto& toolbar = widget.add<GUI::ToolBar>();
-    auto& bookmarksbar = widget.add<BookmarksBarWidget>(bookmarks_filename, bookmarksbar_enabled);
+    auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
+    auto& toolbar = toolbar_container.add<GUI::ToolBar>();
+    auto& bookmarksbar = toolbar_container.add<BookmarksBarWidget>(bookmarks_filename, bookmarksbar_enabled);
     auto& html_widget = widget.add<Web::HtmlView>();
 
     bookmarksbar.on_bookmark_click = [&](auto&, auto& url) {
diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
index e6e33d804b..0d3742934c 100644
--- a/Applications/FileManager/main.cpp
+++ b/Applications/FileManager/main.cpp
@@ -52,6 +52,7 @@
 #include <LibGUI/StatusBar.h>
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/ToolBar.h>
+#include <LibGUI/ToolBarContainer.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
@@ -237,12 +238,14 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
 
     auto& widget = window->set_main_widget<GUI::Widget>();
     widget.set_layout<GUI::VerticalBoxLayout>();
-    widget.layout()->set_spacing(0);
+    widget.set_fill_with_background_color(true);
+    widget.layout()->set_spacing(2);
 
-    auto& main_toolbar = widget.add<GUI::ToolBar>();
-    auto& location_toolbar = widget.add<GUI::ToolBar>();
+    auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
+
+    auto& main_toolbar = toolbar_container.add<GUI::ToolBar>();
+    auto& location_toolbar = toolbar_container.add<GUI::ToolBar>();
     location_toolbar.layout()->set_margins({ 6, 3, 6, 3 });
-    location_toolbar.set_preferred_size(0, 25);
 
     auto& location_label = location_toolbar.add<GUI::Label>("Location: ");
     location_label.size_to_fit();
diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp
index daf6819f65..44364cb37d 100644
--- a/Applications/Help/main.cpp
+++ b/Applications/Help/main.cpp
@@ -38,6 +38,7 @@
 #include <LibGUI/Splitter.h>
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/ToolBar.h>
+#include <LibGUI/ToolBarContainer.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/Window.h>
 #include <LibMarkdown/MDDocument.h>
@@ -83,7 +84,8 @@ int main(int argc, char* argv[])
     widget.set_layout<GUI::VerticalBoxLayout>();
     widget.layout()->set_spacing(0);
 
-    auto& toolbar = widget.add<GUI::ToolBar>();
+    auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
+    auto& toolbar = toolbar_container.add<GUI::ToolBar>();
 
     auto& splitter = widget.add<GUI::HorizontalSplitter>();
 
diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp
index 61d3641513..cbb94670b8 100644
--- a/Applications/IRCClient/IRCAppWindow.cpp
+++ b/Applications/IRCClient/IRCAppWindow.cpp
@@ -39,6 +39,7 @@
 #include <LibGUI/StackWidget.h>
 #include <LibGUI/TableView.h>
 #include <LibGUI/ToolBar.h>
+#include <LibGUI/ToolBarContainer.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -312,7 +313,8 @@ void IRCAppWindow::setup_widgets()
     widget.set_layout<GUI::VerticalBoxLayout>();
     widget.layout()->set_spacing(0);
 
-    auto& toolbar = widget.add<GUI::ToolBar>();
+    auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
+    auto& toolbar = toolbar_container.add<GUI::ToolBar>();
     toolbar.set_has_frame(false);
     toolbar.add_action(*m_change_nick_action);
     toolbar.add_separator();
diff --git a/Applications/QuickShow/main.cpp b/Applications/QuickShow/main.cpp
index a60421e319..dd234ee14e 100644
--- a/Applications/QuickShow/main.cpp
+++ b/Applications/QuickShow/main.cpp
@@ -38,6 +38,7 @@
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/ToolBar.h>
+#include <LibGUI/ToolBarContainer.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <stdio.h>
@@ -71,7 +72,8 @@ int main(int argc, char** argv)
     root_widget.set_layout<GUI::VerticalBoxLayout>();
     root_widget.layout()->set_spacing(0);
 
-    auto& main_toolbar = root_widget.add<GUI::ToolBar>();
+    auto& toolbar_container = root_widget.add<GUI::ToolBarContainer>();
+    auto& main_toolbar = toolbar_container.add<GUI::ToolBar>();
 
     auto& widget = root_widget.add<QSWidget>();
     widget.on_scale_change = [&](int scale) {
diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp
index 994b13f703..afb27ea441 100644
--- a/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Applications/TextEditor/TextEditorWidget.cpp
@@ -46,15 +46,18 @@
 #include <LibGUI/TextBox.h>
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/ToolBar.h>
+#include <LibGUI/ToolBarContainer.h>
 #include <LibGfx/Font.h>
 #include <string.h>
 
 TextEditorWidget::TextEditorWidget()
 {
+    set_fill_with_background_color(true);
     set_layout<GUI::VerticalBoxLayout>();
-    layout()->set_spacing(0);
+    layout()->set_spacing(2);
 
-    auto& toolbar = add<GUI::ToolBar>();
+    auto& toolbar_container = add<GUI::ToolBarContainer>();
+    auto& toolbar = toolbar_container.add<GUI::ToolBar>();
     m_editor = add<GUI::TextEditor>();
     m_editor->set_ruler_visible(true);
     m_editor->set_automatic_indentation_enabled(true);
diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp
index 372886a161..b22bf4f90d 100644
--- a/DevTools/HackStudio/main.cpp
+++ b/DevTools/HackStudio/main.cpp
@@ -58,6 +58,7 @@
 #include <LibGUI/TextBox.h>
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/ToolBar.h>
+#include <LibGUI/ToolBarContainer.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
@@ -163,7 +164,8 @@ int main(int argc, char** argv)
 
     open_project("/home/anon/js/javascript.files");
 
-    auto& toolbar = widget.add<GUI::ToolBar>();
+    auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
+    auto& toolbar = toolbar_container.add<GUI::ToolBar>();
 
     auto selected_file_names = [&] {
         Vector<String> files;
diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile
index 5156a15a4a..0054949373 100644
--- a/Libraries/LibGUI/Makefile
+++ b/Libraries/LibGUI/Makefile
@@ -65,6 +65,7 @@ OBJS = \
     TextDocument.o \
     TextEditor.o \
     ToolBar.o \
+    ToolBarContainer.o \
     TreeView.o \
     UndoStack.o \
     Variant.o \
diff --git a/Libraries/LibGUI/StatusBar.cpp b/Libraries/LibGUI/StatusBar.cpp
index 004f266e1e..94fec633aa 100644
--- a/Libraries/LibGUI/StatusBar.cpp
+++ b/Libraries/LibGUI/StatusBar.cpp
@@ -39,7 +39,7 @@ StatusBar::StatusBar(int label_count)
     set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
     set_preferred_size(0, 20);
     set_layout<HorizontalBoxLayout>();
-    layout()->set_margins({ 0, 3, 0, 0 });
+    layout()->set_margins({ 0, 0, 0, 0 });
     layout()->set_spacing(2);
 
     if (label_count < 1)
diff --git a/Libraries/LibGUI/ToolBar.cpp b/Libraries/LibGUI/ToolBar.cpp
index 0c05f7b693..9ef8f7979c 100644
--- a/Libraries/LibGUI/ToolBar.cpp
+++ b/Libraries/LibGUI/ToolBar.cpp
@@ -39,10 +39,10 @@ ToolBar::ToolBar(Orientation orientation, int button_size)
 {
     if (orientation == Orientation::Horizontal) {
         set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
-        set_preferred_size(0, button_size + 10);
+        set_preferred_size(0, button_size + 8);
     } else {
         set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
-        set_preferred_size(button_size + 10, 0);
+        set_preferred_size(button_size + 8, 0);
     }
     set_layout<BoxLayout>(orientation);
     layout()->set_spacing(0);
@@ -111,9 +111,9 @@ void ToolBar::paint_event(PaintEvent& event)
     Painter painter(*this);
     painter.add_clip_rect(event.rect());
 
-    if (m_has_frame)
-        Gfx::StylePainter::paint_surface(painter, rect(), palette(), x() != 0, y() != 0);
-    else
+    //if (m_has_frame)
+//        Gfx::StylePainter::paint_surface(painter, rect(), palette(), x() != 0, y() != 0);
+//    else
         painter.fill_rect(event.rect(), palette().button());
 }
 
diff --git a/Libraries/LibGUI/ToolBarContainer.cpp b/Libraries/LibGUI/ToolBarContainer.cpp
new file mode 100644
index 0000000000..6d7bc8507c
--- /dev/null
+++ b/Libraries/LibGUI/ToolBarContainer.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ToolBarContainer.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
+
+namespace GUI {
+
+void ToolBarContainer::did_add_toolbar(Widget& toolbar)
+{
+    m_toolbars.append(toolbar);
+    int preferred_size = 4 + (m_toolbars.size() - 1) * 2;
+
+    for (auto& toolbar : m_toolbars) {
+        if (m_orientation == Gfx::Orientation::Horizontal)
+            preferred_size += toolbar.preferred_size().height();
+        else
+            preferred_size += toolbar.preferred_size().width();
+    }
+
+    if (m_orientation == Gfx::Orientation::Horizontal)
+        set_preferred_size(0, preferred_size);
+    else
+        set_preferred_size(preferred_size, 0);
+}
+
+ToolBarContainer::ToolBarContainer(Gfx::Orientation orientation)
+    : m_orientation(orientation)
+{
+    set_fill_with_background_color(true);
+
+    set_frame_thickness(2);
+    set_frame_shape(Gfx::FrameShape::Box);
+    set_frame_shadow(Gfx::FrameShadow::Sunken);
+
+    if (m_orientation == Gfx::Orientation::Horizontal)
+        set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
+    else
+        set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
+
+    auto& layout = set_layout<VerticalBoxLayout>();
+    layout.set_spacing(2);
+    layout.set_margins({ 2, 2, 2, 2 });
+}
+
+void ToolBarContainer::paint_event(GUI::PaintEvent& event)
+{
+    Painter painter(*this);
+    painter.add_clip_rect(event.rect());
+
+    for (auto& toolbar : m_toolbars) {
+        auto rect = toolbar.relative_rect();
+        painter.draw_line(rect.top_left().translated(0, -1), rect.top_right().translated(0, -1), palette().threed_highlight());
+        painter.draw_line(rect.bottom_left().translated(0, 1), rect.bottom_right().translated(0, 1), palette().threed_shadow1());
+    }
+
+    Frame::paint_event(event);
+}
+
+}
diff --git a/Libraries/LibGUI/ToolBarContainer.h b/Libraries/LibGUI/ToolBarContainer.h
new file mode 100644
index 0000000000..4dcbf93676
--- /dev/null
+++ b/Libraries/LibGUI/ToolBarContainer.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <LibGUI/Frame.h>
+#include <LibGUI/ToolBar.h>
+
+namespace GUI {
+
+class ToolBarContainer : public Frame {
+    C_OBJECT(ToolBarContainer);
+
+public:
+    template<class T, class... Args>
+    inline T& add(Args&&... args)
+    {
+        auto& child = Frame::add<T>(forward<Args>(args)...);
+        did_add_toolbar(child);
+        return child;
+    }
+
+private:
+    explicit ToolBarContainer(Gfx::Orientation = Gfx::Orientation::Horizontal);
+
+    virtual void paint_event(GUI::PaintEvent&) override;
+
+    void did_add_toolbar(Widget&);
+
+    Gfx::Orientation m_orientation { Gfx::Orientation::Horizontal };
+
+    NonnullRefPtrVector<Widget> m_toolbars;
+};
+
+}