asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added ability to hide edit lock and groups in editor view

Browse source 
Added ability to hide edit lock and groups in editor view
This commit is contained in:
DualMatrix 2018-09-20 02:41:19 +02:00
parent e20a28a7db
commit 494354c835
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -2946,13 +2946,13 @@ void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p
float offset = 0; float offset = 0;
Ref<Texture> lock = get_icon("LockViewport", "EditorIcons"); Ref<Texture> lock = get_icon("LockViewport", "EditorIcons");
if (p_node->has_meta("_edit_lock_")) { if (p_node->has_meta("_edit_lock_") && show_edit_locks) {
lock->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0)); lock->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
offset += lock->get_size().x; offset += lock->get_size().x;
} }
Ref<Texture> group = get_icon("GroupViewport", "EditorIcons"); Ref<Texture> group = get_icon("GroupViewport", "EditorIcons");
if (canvas_item->has_meta("_edit_group_")) { if (canvas_item->has_meta("_edit_group_") && show_edit_locks) {
group->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0)); group->draw(viewport_canvas_item, (transform * canvas_xform * parent_xform).xform(Point2(0, 0)) + Point2(offset, 0));
//offset += group->get_size().x; //offset += group->get_size().x;
} }
@ -3551,6 +3551,12 @@ void CanvasItemEditor::_popup_callback(int p_op) {
view_menu->get_popup()->set_item_checked(idx, show_viewport); view_menu->get_popup()->set_item_checked(idx, show_viewport);
viewport->update(); viewport->update();
} break; } break;
case SHOW_EDIT_LOCKS: {
show_edit_locks = !show_edit_locks;
int idx = view_menu->get_popup()->get_item_index(SHOW_EDIT_LOCKS);
view_menu->get_popup()->set_item_checked(idx, show_edit_locks);
viewport->update();
} break;
case SNAP_USE_NODE_PARENT: { case SNAP_USE_NODE_PARENT: {
snap_node_parent = !snap_node_parent; snap_node_parent = !snap_node_parent;
int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_PARENT); int idx = smartsnap_config_popup->get_item_index(SNAP_USE_NODE_PARENT);
@ -4154,6 +4160,7 @@ Dictionary CanvasItemEditor::get_state() const {
state["show_rulers"] = show_rulers; state["show_rulers"] = show_rulers;
state["show_guides"] = show_guides; state["show_guides"] = show_guides;
state["show_helpers"] = show_helpers; state["show_helpers"] = show_helpers;
state["show_edit_locks"] = show_edit_locks;
state["snap_rotation"] = snap_rotation; state["snap_rotation"] = snap_rotation;
state["snap_relative"] = snap_relative; state["snap_relative"] = snap_relative;
state["snap_pixel"] = snap_pixel; state["snap_pixel"] = snap_pixel;
@ -4273,6 +4280,12 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
view_menu->get_popup()->set_item_checked(idx, show_helpers); view_menu->get_popup()->set_item_checked(idx, show_helpers);
} }
if (state.has("show_edit_locks")) {
show_edit_locks = state["show_edit_locks"];
int idx = view_menu->get_popup()->get_item_index(SHOW_EDIT_LOCKS);
view_menu->get_popup()->set_item_checked(idx, show_edit_locks);
}
if (state.has("snap_rotation")) { if (state.has("snap_rotation")) {
snap_rotation = state["snap_rotation"]; snap_rotation = state["snap_rotation"];
int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_ROTATION); int idx = snap_config_menu->get_popup()->get_item_index(SNAP_USE_ROTATION);
@ -4543,6 +4556,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTR("Show Guides"), KEY_Y), SHOW_GUIDES); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_guides", TTR("Show Guides"), KEY_Y), SHOW_GUIDES);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_origin", TTR("Show Origin")), SHOW_ORIGIN); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_origin", TTR("Show Origin")), SHOW_ORIGIN);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_viewport", TTR("Show Viewport")), SHOW_VIEWPORT); p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_viewport", TTR("Show Viewport")), SHOW_VIEWPORT);
p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_edit_locks", TTR("Show Group And Lock Icons")), SHOW_EDIT_LOCKS);
p->add_separator(); p->add_separator();
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/center_selection", TTR("Center Selection"), KEY_F), VIEW_CENTER_TO_SELECTION); p->add_shortcut(ED_SHORTCUT("canvas_item_editor/center_selection", TTR("Center Selection"), KEY_F), VIEW_CENTER_TO_SELECTION);
p->add_shortcut(ED_SHORTCUT("canvas_item_editor/frame_selection", TTR("Frame Selection"), KEY_MASK_SHIFT | KEY_F), VIEW_FRAME_TO_SELECTION); p->add_shortcut(ED_SHORTCUT("canvas_item_editor/frame_selection", TTR("Frame Selection"), KEY_MASK_SHIFT | KEY_F), VIEW_FRAME_TO_SELECTION);
@ -4633,6 +4648,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
show_helpers = false; show_helpers = false;
show_rulers = true; show_rulers = true;
show_guides = true; show_guides = true;
show_edit_locks = true;
zoom = 1; zoom = 1;
view_offset = Point2(-150 - RULER_WIDTH, -95 - RULER_WIDTH); view_offset = Point2(-150 - RULER_WIDTH, -95 - RULER_WIDTH);
previous_update_view_offset = view_offset; // Moves the view a little bit to the left so that (0,0) is visible. The values a relative to a 16/10 screen previous_update_view_offset = view_offset; // Moves the view a little bit to the left so that (0,0) is visible. The values a relative to a 16/10 screen

2
editor/plugins/canvas_item_editor_plugin.h
View file

@ -105,6 +105,7 @@ private:
SHOW_GUIDES, SHOW_GUIDES,
SHOW_ORIGIN, SHOW_ORIGIN,
SHOW_VIEWPORT, SHOW_VIEWPORT,
SHOW_EDIT_LOCKS,
LOCK_SELECTED, LOCK_SELECTED,
UNLOCK_SELECTED, UNLOCK_SELECTED,
GROUP_SELECTED, GROUP_SELECTED,
@ -225,6 +226,7 @@ private:
bool show_origin; bool show_origin;
bool show_viewport; bool show_viewport;
bool show_helpers; bool show_helpers;
bool show_edit_locks;
float zoom; float zoom;
Point2 view_offset; Point2 view_offset;
Point2 previous_update_view_offset; Point2 previous_update_view_offset;