summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-09-10 11:40:22 -0300
committerGitHub <noreply@github.com>2016-09-10 11:40:22 -0300
commit83b0d7848e426a213ad0177ce03dd1d44b3afd8e (patch)
tree9e09c535376eb69752c751b73f90ceadbb9020e7
parent365f3d7a6ea613b2678d2f667d1ec52c2e15a628 (diff)
parent7d455fca71c37563f3a57c91b716c66101ce03fc (diff)
Merge pull request #6439 from Paulb23/item_list_scroll_issue_6343
Added get_v_scroll to item list, issue 6343
-rw-r--r--doc/base/classes.xml7
-rw-r--r--scene/gui/item_list.cpp2
-rw-r--r--scene/gui/item_list.h2
3 files changed, 11 insertions, 0 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 1b54a70be8..e202369eda 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -17976,6 +17976,13 @@
Returns the list of selected indexes.
</description>
</method>
+ <method name="get_v_scroll">
+ <return type="VScrollBar">
+ </return>
+ <description>
+ Returns the current vertical scroll bar for the List.
+ </description>
+ </method>
<method name="is_item_disabled" qualifiers="const">
<return type="bool">
</return>
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index 63902ef815..89cd509fbd 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -1358,6 +1358,8 @@ void ItemList::_bind_methods(){
ObjectTypeDB::bind_method(_MD("ensure_current_is_visible"),&ItemList::ensure_current_is_visible);
+ ObjectTypeDB::bind_method(_MD("get_v_scroll"),&ItemList::get_v_scroll);
+
ObjectTypeDB::bind_method(_MD("_scroll_changed"),&ItemList::_scroll_changed);
ObjectTypeDB::bind_method(_MD("_input_event"),&ItemList::_input_event);
diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index 91c74b5291..cb5908bc79 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -195,6 +195,8 @@ public:
void set_icon_scale(real_t p_scale);
real_t get_icon_scale() const;
+ VScrollBar *get_v_scroll() { return scroll_bar; }
+
ItemList();
~ItemList();
};