diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 805f64ad8aa..4b5c424d4bf 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -2517,12 +2517,6 @@
Return whether the animation has the loop flag set.
-
-
-
-
-
-
@@ -2579,12 +2573,6 @@
Set a flag indicating that the animation must loop. This is uses for correct interpolation of animation cycles, and for hinting the player that it must restart the animation.
-
-
-
-
-
-
@@ -4685,6 +4673,12 @@
+
+
+
+
+
+
@@ -6994,6 +6988,12 @@
Set a custom transform for drawing. Anything drawn afterwards will be transformed by this.
+
+
+
+
+
+
@@ -17507,6 +17507,13 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
+
+
+
+
+ Returns a list of selected indexes.
+
+
@@ -18912,6 +18919,34 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
Clear the [LineEdit] text.
+
+
+
+
+ Gets whether the line edit caret is blinking.
+
+
+
+
+
+
+ Gets the line edit caret blink speed.
+
+
+
+
+
+
+ Set the line edit caret to blink.
+
+
+
+
+
+
+ Set the line edit caret blink speed. Cannot be less then or equal to 0.
+
+
@@ -18991,34 +19026,6 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
Set the cursor position inside the [LineEdit], causing it to scroll if needed.
-
-
-
-
- Set the line edit caret to blink.
-
-
-
-
-
-
- Gets whether the line edit caret is blinking.
-
-
-
-
-
-
- Set the line edit caret blink speed. Cannot be less then or equal to 0.
-
-
-
-
-
-
- Gets the line edit caret blink speed.
-
-
@@ -24036,6 +24043,12 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
Return the mirroring of the ParallaxLayer.
+
+
+
+
+
+
@@ -24050,6 +24063,12 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
Set the mirroring of the ParallaxLayer. If an axis is set to 0 then that axis will have no mirroring.
+
+
+
+
+
+
@@ -24882,6 +24901,12 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
+
+
+
+
+
+
@@ -36504,6 +36529,10 @@ A similar effect may be achieved moving this node's descendants.
+
+
+
+
@@ -38495,6 +38524,12 @@ A similar effect may be achieved moving this node's descendants.
+
+
+
+
+
+
@@ -39357,6 +39392,10 @@ A similar effect may be achieved moving this node's descendants.
+
+
+
+
@@ -39365,6 +39404,8 @@ A similar effect may be achieved moving this node's descendants.
+
+
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index 53798367468..d63c483ef92 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -1245,6 +1245,19 @@ real_t ItemList::get_icon_scale() const {
return icon_scale;
}
+Vector ItemList::get_selected_items() {
+ Vector selected;
+ for (int i = 0; i < items.size(); i++) {
+ if (items[i].selected) {
+ selected.push_back(i);
+ if (this->select_mode == SELECT_SINGLE) {
+ break;
+ }
+ }
+ }
+ return selected;
+}
+
void ItemList::_bind_methods(){
ObjectTypeDB::bind_method(_MD("add_item","text","icon:Texture","selectable"),&ItemList::add_item,DEFVAL(Variant()),DEFVAL(true));
@@ -1277,6 +1290,7 @@ void ItemList::_bind_methods(){
ObjectTypeDB::bind_method(_MD("select","idx","single"),&ItemList::select,DEFVAL(true));
ObjectTypeDB::bind_method(_MD("unselect","idx"),&ItemList::unselect);
ObjectTypeDB::bind_method(_MD("is_selected","idx"),&ItemList::is_selected);
+ ObjectTypeDB::bind_method(_MD("get_selected_items"),&ItemList::get_selected_items);
ObjectTypeDB::bind_method(_MD("get_item_count"),&ItemList::get_item_count);
ObjectTypeDB::bind_method(_MD("remove_item","idx"),&ItemList::remove_item);
@@ -1330,8 +1344,6 @@ void ItemList::_bind_methods(){
ADD_SIGNAL( MethodInfo("item_activated",PropertyInfo(Variant::INT,"index")));
}
-
-
ItemList::ItemList() {
current=-1;
diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index aa6dd64c502..e1902d1c1fc 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -144,6 +144,7 @@ public:
void select(int p_idx,bool p_single=true);
void unselect(int p_idx);
bool is_selected(int p_idx) const;
+ Vector get_selected_items();
void set_current(int p_current);
int get_current() const;