godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

Added selection menu to spatial and canvas editors

Browse Source
This commit is contained in:
neikeq
2015-11-04 22:39:07 +01:00
parent d123c89c58
commit f84dc8e59d
4 changed files with 393 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/editor/plugins/canvas_item_editor_plugin.h
View File

@@ -150,6 +150,7 @@ class CanvasItemEditor : public VBoxContainer {
};
EditorSelection *editor_selection;
bool additive_selection;
Tool tool;
bool first_update;
@@ -183,6 +184,18 @@ class CanvasItemEditor : public VBoxContainer {
MenuOption last_option;
struct _SelectResult {
CanvasItem* item;
float z;
bool has_z;
_FORCE_INLINE_ bool operator<(const _SelectResult& p_rr) const {
return has_z && p_rr.has_z ? p_rr.z < z : p_rr.has_z;
}
};
Vector<_SelectResult> selection_results;
struct LockList {
Point2 pos;
bool lock;
@@ -249,6 +262,8 @@ class CanvasItemEditor : public VBoxContainer {
Button *key_scale_button;
Button *key_insert_button;
PopupMenu *selection_menu;
//PopupMenu *popup;
DragType drag;
Point2 drag_from;
@@ -276,8 +291,11 @@ class CanvasItemEditor : public VBoxContainer {
int handle_len;
CanvasItem* _select_canvas_item_at_pos(const Point2 &p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform);
void _find_canvas_items_at_pos(const Point2 &p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform, Vector<_SelectResult> &r_items);
void _find_canvas_items_at_rect(const Rect2& p_rect,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform,List<CanvasItem*> *r_items);
bool _select(CanvasItem *item, Point2 p_click_pos, bool p_append, bool p_drag=true);
ConfirmationDialog *snap_dialog;
AcceptDialog *value_dialog;
@@ -304,6 +322,9 @@ class CanvasItemEditor : public VBoxContainer {
void _append_canvas_item(CanvasItem *p_item);
void _dialog_value_changed(double);
void _snap_changed();
void _selection_result_pressed(int);
void _selection_menu_hide();
UndoRedo *undo_redo;
Point2 _find_topleftmost_point();