5 files changed, 39 insertions, 4 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index d7632b14b8..a2b7cd2e0a 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -31,6 +31,7 @@
 #include "print_string.h"
 #include "button_group.h"
 #include "scene/scene_string_names.h"
+#include "scene/main/viewport.h"
 
 void BaseButton::_input_event(InputEvent p_event) {
 
@@ -416,6 +417,10 @@ Ref<ShortCut> BaseButton:: get_shortcut() const {
 void BaseButton::_unhandled_input(InputEvent p_event) {
 
 	if (!is_disabled() && is_visible() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
+
+		if (get_viewport()->get_modal_stack_top() && !get_viewport()->get_modal_stack_top()->is_a_parent_of(this))
+			return; //ignore because of modal window
+
 		if (is_toggle_mode()) {
 			set_pressed(!is_pressed());
 			emit_signal("toggled",is_pressed());
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 2e28baa137..fc27c0d24f 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -49,14 +49,22 @@
 
 Variant Control::edit_get_state() const {
 
-	return get_rect();
+	Dictionary s;
+	s["rect"]=get_rect();
+	s["rot"]=get_rotation();
+	s["scale"]=get_scale();
+	return s;
 
 }
 void Control::edit_set_state(const Variant& p_state) {
 
-	Rect2 state=p_state;
+	Dictionary s=p_state;
+
+	Rect2 state=s["rect"];
 	set_pos(state.pos);
 	set_size(state.size);
+	set_rotation(s["rot"]);
+	set_scale(s["scale"]);
 }
 
 void Control::set_custom_minimum_size(const Size2& p_custom) {
@@ -754,6 +762,11 @@ bool Control::is_window_modal_on_top() const {
 	return get_viewport()->_gui_is_modal_on_top(this);
 }
 
+uint64_t Control::get_modal_frame() const {
+
+	return data.modal_frame;
+}
+
 
 
 Size2 Control::get_minimum_size() const {
@@ -1829,6 +1842,7 @@ void Control::show_modal(bool p_exclusive) {
 	raise();
 	data.modal_exclusive=p_exclusive;
 	data.MI=get_viewport()->_gui_show_modal(this);
+	data.modal_frame=OS::get_singleton()->get_frames_drawn();
 
 }
 
@@ -2539,6 +2553,7 @@ Control::Control() {
 	data.parent_canvas_item=NULL;
 	data.scale=Vector2(1,1);
 	data.drag_owner=0;
+	data.modal_frame=0;
 
 
 	for (int i=0;i<4;i++) {
diff --git a/scene/gui/control.h b/scene/gui/control.h
index 07a28de1ea..830ebd1620 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -132,6 +132,7 @@ private:
 		ObjectID drag_owner;
 		bool modal;
 		bool modal_exclusive;
+		uint64_t modal_frame; //frame used to put something as modal
 		Ref<Theme> theme;
 		Control *theme_owner;
 		String tooltip;
@@ -249,6 +250,7 @@ public:
 	Size2 get_custom_minimum_size() const;
 
 	bool is_window_modal_on_top() const;
+	uint64_t get_modal_frame() const; //frame in which this was made modal
 
 	Control *get_parent_control() const;
 
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index 5379836746..d63c483ef9 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<int> ItemList::get_selected_items() {
+	Vector<int> 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 aa6dd64c50..e1902d1c1f 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<int> get_selected_items();
 
 	void set_current(int p_current);
 	int get_current() const;