From ec8bffb06d9d4e7609f6aa0969e77f16731d7ea5 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 16 Mar 2019 23:16:37 +0100 Subject: LibGUI: Let GTextEditor deal with its horizontal padding internally. I originally wanted to have the padding concept in GScrollableWidget but it's really finicky with the ruler and everything. --- LibGUI/GScrollableWidget.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'LibGUI/GScrollableWidget.h') diff --git a/LibGUI/GScrollableWidget.h b/LibGUI/GScrollableWidget.h index d48bf5b793..8efb70dcd6 100644 --- a/LibGUI/GScrollableWidget.h +++ b/LibGUI/GScrollableWidget.h @@ -8,19 +8,18 @@ class GScrollableWidget : public GWidget { public: virtual ~GScrollableWidget() override; - virtual const char* class_name() const override { return "GScrollableWidget"; } - Size content_size() const { return m_content_size; } int content_width() const { return m_content_size.width(); } int content_height() const { return m_content_size.height(); } - Size padding() const { return m_padding; } - Rect visible_content_rect() const; void scroll_into_view(const Rect&, Orientation); void scroll_into_view(const Rect&, bool scroll_horizontally, bool scroll_vertically); + void set_scrollbars_enabled(bool); + bool is_scrollbars_enabled() const { return m_scrollbars_enabled; } + GScrollBar& vertical_scrollbar() { return *m_vertical_scrollbar; } const GScrollBar& vertical_scrollbar() const { return *m_vertical_scrollbar; } GScrollBar& horizontal_scrollbar() { return *m_horizontal_scrollbar; } @@ -28,15 +27,13 @@ public: GWidget& corner_widget() { return *m_corner_widget; } const GWidget& corner_widget() const { return *m_corner_widget; } - void set_scrollbars_enabled(bool); - bool is_scrollbars_enabled() const { return m_scrollbars_enabled; } + virtual const char* class_name() const override { return "GScrollableWidget"; } protected: explicit GScrollableWidget(GWidget* parent); virtual void resize_event(GResizeEvent&) override; void set_content_size(const Size&); void set_size_occupied_by_fixed_elements(const Size&); - void set_padding(const Size&); int width_occupied_by_vertical_scrollbar() const; int height_occupied_by_horizontal_scrollbar() const; @@ -49,6 +46,5 @@ private: GWidget* m_corner_widget { nullptr }; Size m_content_size; Size m_size_occupied_by_fixed_elements; - Size m_padding; bool m_scrollbars_enabled { true }; }; -- cgit v1.2.3