diff options
Diffstat (limited to 'scene/gui/scroll_container.h')
| -rw-r--r-- | scene/gui/scroll_container.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index 6423b36fcc..7e32cbed1c 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -36,7 +36,6 @@ #include "scroll_bar.h" class ScrollContainer : public Container { - GDCLASS(ScrollContainer, Container); HScrollBar *h_scroll; @@ -67,14 +66,16 @@ class ScrollContainer : public Container { void _cancel_drag(); protected: - Size2 get_minimum_size() const; + Size2 get_minimum_size() const override; void _gui_input(const Ref<InputEvent> &p_gui_input); + void _update_dimensions(); void _notification(int p_what); void _scroll_moved(float); static void _bind_methods(); + bool _updating_scrollbars = false; void _update_scrollbar_position(); void _ensure_focused_visible(Control *p_node); @@ -100,9 +101,9 @@ public: HScrollBar *get_h_scrollbar(); VScrollBar *get_v_scrollbar(); - virtual bool clips_input() const; + virtual bool clips_input() const override; - virtual String get_configuration_warning() const; + virtual String get_configuration_warning() const override; ScrollContainer(); }; |