diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-31 12:43:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-31 12:43:09 +0100 |
| commit | c8e7036bc11a72e359a0954809af5b9cee341dfd (patch) | |
| tree | 4346f8887e8e778aee2a1998e193071dc0573405 /scene/gui | |
| parent | 5fa1905131bc20e8a4a939d0edf8370091c88a50 (diff) | |
| parent | 54f70b6b506ee460e6ef2f986158fe5abe696ae6 (diff) | |
Merge pull request #34707 from KoBeWi/omg
Fix argument type in set_follow_focus()
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/scroll_container.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/scroll_container.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index c44cebb84a..169e1db663 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -514,7 +514,7 @@ bool ScrollContainer::is_following_focus() const { return follow_focus; } -void ScrollContainer::set_follow_focus(int p_follow) { +void ScrollContainer::set_follow_focus(bool p_follow) { follow_focus = p_follow; } diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index d4576372ac..959bc43870 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -95,7 +95,7 @@ public: void set_deadzone(int p_deadzone); bool is_following_focus() const; - void set_follow_focus(int p_follow); + void set_follow_focus(bool p_follow); HScrollBar *get_h_scrollbar(); VScrollBar *get_v_scrollbar(); |