2 files changed, 105 insertions, 1 deletions

diff --git a/tools/editor/editor_path.cpp b/tools/editor/editor_path.cpp
index 6b804b6a24..e7feb1afd3 100644
--- a/tools/editor/editor_path.cpp
+++ b/tools/editor/editor_path.cpp
@@ -27,21 +27,94 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_path.h"
+#include "editor_scale.h"
+#include "editor_node.h"
 
+void EditorPath::_add_children_to_popup(Object* p_obj,int p_depth) {
+
+	if (p_depth>8)
+		return;
+
+	List<PropertyInfo> pinfo;
+	p_obj->get_property_list(&pinfo);
+	for (List<PropertyInfo>::Element *E=pinfo.front();E;E=E->next()) {
+
+		if (!(E->get().usage&PROPERTY_USAGE_EDITOR))
+			continue;
+		if (E->get().hint!=PROPERTY_HINT_RESOURCE_TYPE)
+			continue;
+
+		Variant value = p_obj->get(E->get().name);
+		if (value.get_type()!=Variant::OBJECT)
+			continue;
+		Object *obj = value;
+		if (!obj)
+			continue;
+
+		Ref<Texture> icon;
+
+		if (has_icon(obj->get_type(),"EditorIcons"))
+			icon=get_icon(obj->get_type(),"EditorIcons");
+		else
+			icon=get_icon("Object","EditorIcons");
+
+		int index = popup->get_item_count();
+		popup->add_icon_item(icon,E->get().name.capitalize(),objects.size());
+		popup->set_item_h_offset(index,p_depth*10*EDSCALE);
+		objects.push_back(obj->get_instance_ID());
+
+		_add_children_to_popup(obj,p_depth+1);
+	}
+}
+
+void EditorPath::_input_event(const InputEvent& p_event) {
+
+	if (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index==BUTTON_LEFT && p_event.mouse_button.pressed) {
+
+
+		Object *obj = ObjectDB::get_instance(history->get_path_object( history->get_path_size()-1));
+		if (!obj)
+			return;
+
+
+
+		objects.clear();
+		popup->clear();
+		_add_children_to_popup(obj);
+		popup->set_pos( get_global_pos() + Vector2(0,get_size().height));
+		popup->set_size( Size2(get_size().width,1));
+		popup->popup();
+	}
+}
 
 void EditorPath::_notification(int p_what) {
 
 
 	switch(p_what) {
 
+		case NOTIFICATION_MOUSE_ENTER: {
+			mouse_over=true;
+			update();
+		} break;
+		case NOTIFICATION_MOUSE_EXIT: {
+			mouse_over=false;
+			update();
+		} break;
 		case NOTIFICATION_DRAW: {
 
 			RID ci=get_canvas_item();
 			Ref<Font> label_font = get_font("font","Label");
 			Size2i size = get_size();
 			Ref<Texture> sn = get_icon("SmallNext","EditorIcons");
+			Ref<StyleBox> sb = get_stylebox("pressed","Button");
+
+
+			int ofs=sb->get_margin(MARGIN_LEFT);
+
+			if (mouse_over) {
+				draw_style_box(sb,Rect2(Point2(),get_size()));
+			}
 
-			int ofs=5;
 			for(int i=0;i<history->get_path_size();i++) {
 
 				Object *obj = ObjectDB::get_instance(history->get_path_object(i));
@@ -108,11 +181,34 @@ void EditorPath::_notification(int p_what) {
 
 void EditorPath::update_path() {
 
+
 	update();
 }
 
+void EditorPath::_popup_select(int p_idx) {
+
+	ERR_FAIL_INDEX(p_idx,objects.size());
+
+	Object* obj = ObjectDB::get_instance(objects[p_idx]);
+	if (!obj)
+		return;
+
+	EditorNode::get_singleton()->push_item(obj);
+}
+
+void EditorPath::_bind_methods() {
+
+	ObjectTypeDB::bind_method("_input_event",&EditorPath::_input_event);
+	ObjectTypeDB::bind_method("_popup_select",&EditorPath::_popup_select);
+}
+
 EditorPath::EditorPath(EditorHistory *p_history) {
 
 	history=p_history;
+	mouse_over=false;
+	popup = memnew( PopupMenu );
+	popup->connect("item_pressed",this,"_popup_select");
+	add_child(popup);
+
 
 }
diff --git a/tools/editor/editor_path.h b/tools/editor/editor_path.h
index 11e1005ba3..7f51a5dc48 100644
--- a/tools/editor/editor_path.h
+++ b/tools/editor/editor_path.h
@@ -30,6 +30,7 @@
 #define EDITOR_PATH_H
 
 #include "scene/gui/control.h"
+#include "scene/gui/popup_menu.h"
 #include "editor_data.h"
 
 class EditorPath : public Control {
@@ -39,10 +40,17 @@ class EditorPath : public Control {
 	EditorHistory *history;
 
 
+	Vector<ObjectID> objects;
+	PopupMenu *popup;
+	bool mouse_over;
 	EditorPath();
 
+	void _popup_select(int p_idx);
+	void _input_event(const InputEvent& p_event);
+	void _add_children_to_popup(Object* p_obj,int p_depth=0);
 protected:
 
+	static void _bind_methods();
 	void _notification(int p_what);
 
 public: