diff options
| author | Andreas Haas | 2017-06-03 12:47:54 +0200 |
|---|---|---|
| committer | GitHub | 2017-06-03 12:47:54 +0200 |
| commit | 69bec86028f87307e549d7a2f49bbb7e2b1f3771 (patch) | |
| tree | 30316ffea9d6321c6b8292a02b6db3dac9cd1053 /scene/gui/scroll_bar.cpp | |
| parent | 5a6d4971e13157cc5f0de199de7f6d257070fc66 (diff) | |
| parent | 9bc534896135322a578118f433f0dc6265839082 (diff) | |
| download | godot-69bec86028f87307e549d7a2f49bbb7e2b1f3771.tar.gz godot-69bec86028f87307e549d7a2f49bbb7e2b1f3771.tar.zst godot-69bec86028f87307e549d7a2f49bbb7e2b1f3771.zip | |
Merge pull request #9031 from Hinsbart/inputevent_pos
InputEvent: Renamed "pos" property to "position"
Diffstat (limited to '')
| -rw-r--r-- | scene/gui/scroll_bar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 27a16ccc3..1143bdcde 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -72,7 +72,7 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) { if (b->is_pressed()) { - double ofs = orientation == VERTICAL ? b->get_pos().y : b->get_pos().x; + double ofs = orientation == VERTICAL ? b->get_position().y : b->get_position().x; Ref<Texture> decr = get_icon("decrement"); Ref<Texture> incr = get_icon("increment"); @@ -130,7 +130,7 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) { if (drag.active) { - double ofs = orientation == VERTICAL ? m->get_pos().y : m->get_pos().x; + double ofs = orientation == VERTICAL ? m->get_position().y : m->get_position().x; Ref<Texture> decr = get_icon("decrement"); double decr_size = orientation == VERTICAL ? decr->get_height() : decr->get_width(); @@ -141,7 +141,7 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) { set_as_ratio(drag.value_at_click + diff); } else { - double ofs = orientation == VERTICAL ? m->get_pos().y : m->get_pos().x; + double ofs = orientation == VERTICAL ? m->get_position().y : m->get_position().x; Ref<Texture> decr = get_icon("decrement"); Ref<Texture> incr = get_icon("increment"); |