diff --git a/Userland/Applications/FileManager/DirectoryView.cpp b/Userland/Applications/FileManager/DirectoryView.cpp index 3b750e8a3a..607144cfa8 100644 --- a/Userland/Applications/FileManager/DirectoryView.cpp +++ b/Userland/Applications/FileManager/DirectoryView.cpp @@ -135,7 +135,7 @@ DirectoryView::DirectoryView(Mode mode) , m_sorting_model(GUI::SortingProxyModel::create(m_model)) { set_active_widget(nullptr); - set_content_margins(2); + set_grabbable_margins(2); setup_actions(); diff --git a/Userland/Libraries/LibGUI/Frame.cpp b/Userland/Libraries/LibGUI/Frame.cpp index 5e0d93688b..f2a3df66e5 100644 --- a/Userland/Libraries/LibGUI/Frame.cpp +++ b/Userland/Libraries/LibGUI/Frame.cpp @@ -42,7 +42,7 @@ void Frame::set_frame_thickness(int thickness) if (m_thickness == thickness) return; m_thickness = thickness; - set_content_margins(thickness); + set_grabbable_margins(thickness); } void Frame::paint_event(PaintEvent& event) diff --git a/Userland/Libraries/LibGUI/MultiView.cpp b/Userland/Libraries/LibGUI/MultiView.cpp index 2fa22b1cc2..fa5fc896da 100644 --- a/Userland/Libraries/LibGUI/MultiView.cpp +++ b/Userland/Libraries/LibGUI/MultiView.cpp @@ -20,7 +20,7 @@ namespace GUI { MultiView::MultiView() { set_active_widget(nullptr); - set_content_margins(2); + set_grabbable_margins(2); m_icon_view = add(); m_table_view = add(); m_columns_view = add(); diff --git a/Userland/Libraries/LibGUI/Splitter.cpp b/Userland/Libraries/LibGUI/Splitter.cpp index 060780f819..be1f0ae128 100644 --- a/Userland/Libraries/LibGUI/Splitter.cpp +++ b/Userland/Libraries/LibGUI/Splitter.cpp @@ -137,10 +137,10 @@ void Splitter::mousedown_event(MouseEvent& event) m_resize_origin = event.position(); } -Gfx::IntRect Splitter::rect_between_widgets(GUI::Widget const& first_widget, GUI::Widget const& second_widget, bool honor_content_margins) const +Gfx::IntRect Splitter::rect_between_widgets(GUI::Widget const& first_widget, GUI::Widget const& second_widget, bool honor_grabbable_margins) const { - auto first_widget_rect = honor_content_margins ? first_widget.content_rect() : first_widget.relative_rect(); - auto second_widget_rect = honor_content_margins ? second_widget.content_rect() : second_widget.relative_rect(); + auto first_widget_rect = honor_grabbable_margins ? first_widget.relative_non_grabbable_rect() : first_widget.relative_rect(); + auto second_widget_rect = honor_grabbable_margins ? second_widget.relative_non_grabbable_rect() : second_widget.relative_rect(); auto first_edge = first_widget_rect.last_edge_for_orientation(m_orientation); auto second_edge = second_widget_rect.first_edge_for_orientation(m_orientation); diff --git a/Userland/Libraries/LibGUI/Splitter.h b/Userland/Libraries/LibGUI/Splitter.h index 946edd3b63..5661492ecf 100644 --- a/Userland/Libraries/LibGUI/Splitter.h +++ b/Userland/Libraries/LibGUI/Splitter.h @@ -35,7 +35,7 @@ protected: private: void override_cursor(bool do_override); - Gfx::IntRect rect_between_widgets(GUI::Widget const& first_widget, GUI::Widget const& second_widget, bool honor_content_margins) const; + Gfx::IntRect rect_between_widgets(GUI::Widget const& first_widget, GUI::Widget const& second_widget, bool honor_grabbable_margins) const; Gfx::Orientation m_orientation; bool m_resizing { false }; diff --git a/Userland/Libraries/LibGUI/Widget.cpp b/Userland/Libraries/LibGUI/Widget.cpp index cf2b2b3aa6..6b9a56f9b3 100644 --- a/Userland/Libraries/LibGUI/Widget.cpp +++ b/Userland/Libraries/LibGUI/Widget.cpp @@ -657,7 +657,7 @@ Widget* Widget::child_at(const Gfx::IntPoint& point) const auto& child = verify_cast(children()[i]); if (!child.is_visible()) continue; - if (child.content_rect().contains(point)) + if (child.relative_non_grabbable_rect().contains(point)) return const_cast(&child); } return nullptr; @@ -999,20 +999,20 @@ void Widget::did_end_inspection() update(); } -void Widget::set_content_margins(const Margins& margins) +void Widget::set_grabbable_margins(const Margins& margins) { - if (m_content_margins == margins) + if (m_grabbable_margins == margins) return; - m_content_margins = margins; + m_grabbable_margins = margins; invalidate_layout(); } -Gfx::IntRect Widget::content_rect() const +Gfx::IntRect Widget::relative_non_grabbable_rect() const { auto rect = relative_rect(); - rect.translate_by(m_content_margins.left(), m_content_margins.top()); - rect.set_width(rect.width() - (m_content_margins.left() + m_content_margins.right())); - rect.set_height(rect.height() - (m_content_margins.top() + m_content_margins.bottom())); + rect.translate_by(m_grabbable_margins.left(), m_grabbable_margins.top()); + rect.set_width(rect.width() - (m_grabbable_margins.left() + m_grabbable_margins.right())); + rect.set_height(rect.height() - (m_grabbable_margins.top() + m_grabbable_margins.bottom())); return rect; } diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index 07b870e28a..70afb5d60b 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -263,10 +263,10 @@ public: Gfx::Palette palette() const; void set_palette(const Gfx::Palette&); - const Margins& content_margins() const { return m_content_margins; } - void set_content_margins(const Margins&); + const Margins& grabbable_margins() const { return m_grabbable_margins; } + void set_grabbable_margins(const Margins&); - Gfx::IntRect content_rect() const; + Gfx::IntRect relative_non_grabbable_rect() const; void set_accepts_emoji_input(bool b) { m_accepts_emoji_input = b; } bool accepts_emoji_input() const { return m_accepts_emoji_input; } @@ -357,7 +357,7 @@ private: Gfx::IntSize m_min_size { -1, -1 }; Gfx::IntSize m_max_size { -1, -1 }; - Margins m_content_margins; + Margins m_grabbable_margins; bool m_fill_with_background_color { false }; bool m_visible { true };