From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- scene/gui/scroll_container.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'scene/gui/scroll_container.h') diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index f6832acf6..813bfd965 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -37,8 +37,8 @@ class ScrollContainer : public Container { OBJ_TYPE(ScrollContainer, Container); - HScrollBar* h_scroll; - VScrollBar* v_scroll; + HScrollBar *h_scroll; + VScrollBar *v_scroll; Size2 child_max_size; Size2 scroll; @@ -63,16 +63,15 @@ class ScrollContainer : public Container { protected: Size2 get_minimum_size() const; - - void _input_event(const InputEvent& p_input_event); + void _input_event(const InputEvent &p_input_event); void _notification(int p_what); void _scroll_moved(float); static void _bind_methods(); void _update_scrollbar_pos(); -public: +public: int get_v_scroll() const; void set_v_scroll(int p_pos); -- cgit v1.2.3-70-g09d2