From ab336e895f1a56b43098d115195ab5747a6846d2 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 23 Apr 2020 17:44:49 +0200 Subject: LibGUI: Add a ToolBarContainer widget and put most ToolBars in one This mimics the Explorer toolbar container from Windows 2000 and looks pretty neat! :^) --- Libraries/LibGUI/Makefile | 1 + Libraries/LibGUI/StatusBar.cpp | 2 +- Libraries/LibGUI/ToolBar.cpp | 10 ++-- Libraries/LibGUI/ToolBarContainer.cpp | 86 +++++++++++++++++++++++++++++++++++ Libraries/LibGUI/ToolBarContainer.h | 58 +++++++++++++++++++++++ 5 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 Libraries/LibGUI/ToolBarContainer.cpp create mode 100644 Libraries/LibGUI/ToolBarContainer.h (limited to 'Libraries/LibGUI') 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(); - 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(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 + * 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 +#include +#include +#include +#include + +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(); + 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 + * 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 +#include + +namespace GUI { + +class ToolBarContainer : public Frame { + C_OBJECT(ToolBarContainer); + +public: + template + inline T& add(Args&&... args) + { + auto& child = Frame::add(forward(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 m_toolbars; +}; + +} -- cgit v1.2.3