RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:08:10 +00:00
Code Issues Activity Actions

LibGUI: Let GTextEditor deal with its horizontal padding internally.

Browse source 
I originally wanted to have the padding concept in GScrollableWidget
but it's really finicky with the ruler and everything.
This commit is contained in:
Andreas Kling 2019-03-16 23:16:37 +01:00
parent 78039ef057
commit ec8bffb06d
4 changed files with 24 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
LibGUI/GScrollableWidget.h
View file

@ -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 };
};