-removed resources dock, good bye old friend

godotengine · Sep 1, 2015 · 688047a · 688047a
1 parent cf57a65
commit 688047a
Show file tree

Hide file tree

Showing 9 changed files with 404 additions and 29 deletions.
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
@@ -124,7 +124,7 @@ void MenuButton::_set_items(const Array& p_items) {
 
 void MenuButton::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("get_popup"),&MenuButton::get_popup);		
+	ObjectTypeDB::bind_method(_MD("get_popup:PopupMenu"),&MenuButton::get_popup);
 	ObjectTypeDB::bind_method(_MD("_unhandled_key_input"),&MenuButton::_unhandled_key_input);
 	ObjectTypeDB::bind_method(_MD("_set_items"),&MenuButton::_set_items);
 	ObjectTypeDB::bind_method(_MD("_get_items"),&MenuButton::_get_items);

diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp
@@ -123,6 +123,27 @@ void EditorHistory::add_object(ObjectID p_object,int p_relevel){
 	_add_object(p_object,"",p_relevel);
 }
 
+int EditorHistory::get_history_len() {
+	return history.size();
+}
+int EditorHistory::get_history_pos() {
+	return current;
+}
+
+ObjectID EditorHistory::get_history_obj(int p_obj) const {
+	ERR_FAIL_INDEX_V(p_obj,history.size(),0);
+	ERR_FAIL_INDEX_V(history[p_obj].level,history[p_obj].path.size(),0);
+	return history[p_obj].path[history[p_obj].level].object;
+}
+
+bool EditorHistory::is_at_begining() const {
+	return current<=0;
+}
+bool EditorHistory::is_at_end() const {
+
+	return ((current+1)>=history.size());
+}
+
 
 bool EditorHistory::next() {
 

diff --git a/tools/editor/editor_data.h b/tools/editor/editor_data.h
@@ -75,10 +75,17 @@ friend class EditorData;
 
 public:
 
+	bool is_at_begining() const;
+	bool is_at_end() const;
+
 	void add_object(ObjectID p_object);
 	void add_object(ObjectID p_object,const String& p_subprop);
 	void add_object(ObjectID p_object,int p_relevel);
 
+	int get_history_len();
+	int get_history_pos();
+	ObjectID get_history_obj(int p_obj) const;
+
 	bool next();
 	bool previous();
 	ObjectID get_current();