diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-02 17:30:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 17:30:11 +0100 |
| commit | 11d5b91462285d9fc541c20331aedcd4511908cd (patch) | |
| tree | 36e7ef51941600331aec1c3601eb01977c165bc7 /scene/gui | |
| parent | 8c1fc562dc96bfbfd6b3d980f5f8f7ac5c09c7b2 (diff) | |
| parent | c33f407d27a44ae5705fd2d907403af05682d0eb (diff) | |
Merge pull request #55548 from pycbouh/editor-scroll-dat-preview
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/scroll_container.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index 9f4ec558dc..9c87d07f66 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -68,7 +68,6 @@ class ScrollContainer : public Container { protected: Size2 get_minimum_size() const override; - virtual void gui_input(const Ref<InputEvent> &p_gui_input) override; void _gui_focus_changed(Control *p_control); void _update_dimensions(); void _notification(int p_what); @@ -80,6 +79,8 @@ protected: void _update_scrollbar_position(); public: + virtual void gui_input(const Ref<InputEvent> &p_gui_input) override; + void set_h_scroll(int p_pos); int get_h_scroll() const; |