diff options
Diffstat (limited to 'tools/editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 977fa55e4..c161e3cfa 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -209,7 +209,7 @@ void CanvasItemEditor::_edit_set_pivot(const Vector2& mouse_pos) { void CanvasItemEditor::_unhandled_key_input(const InputEvent& p_ev) { - if (!is_visible() || get_viewport()->gui_has_modal_stack()) + if (!is_visible_in_tree() || get_viewport()->gui_has_modal_stack()) return; if (p_ev.key.mod.control) @@ -425,7 +425,7 @@ void CanvasItemEditor::_node_removed(Node *p_node) { void CanvasItemEditor::_keying_changed() { - if (AnimationPlayerEditor::singleton->get_key_editor()->is_visible()) + if (AnimationPlayerEditor::singleton->get_key_editor()->is_visible_in_tree()) animation_hb->show(); else animation_hb->hide(); @@ -465,7 +465,7 @@ CanvasItem* CanvasItemEditor::_select_canvas_item_at_pos(const Point2& p_pos,Nod return r; } - if (c && c->is_visible() && !c->has_meta("_edit_lock_") && !_is_part_of_subscene(c) && !c->cast_to<CanvasLayer>()) { + if (c && c->is_visible_in_tree() && !c->has_meta("_edit_lock_") && !_is_part_of_subscene(c) && !c->cast_to<CanvasLayer>()) { Rect2 rect = c->get_item_rect(); Point2 local_pos = (p_parent_xform * p_canvas_xform * c->get_transform()).affine_inverse().xform(p_pos); @@ -498,7 +498,7 @@ void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos,Node* p_nod } - if (c && c->is_visible() && !c->has_meta("_edit_lock_") && !c->cast_to<CanvasLayer>()) { + if (c && c->is_visible_in_tree() && !c->has_meta("_edit_lock_") && !c->cast_to<CanvasLayer>()) { Rect2 rect = c->get_item_rect(); Point2 local_pos = (p_parent_xform * p_canvas_xform * c->get_transform()).affine_inverse().xform(p_pos); @@ -547,7 +547,7 @@ void CanvasItemEditor::_find_canvas_items_at_rect(const Rect2& p_rect,Node* p_no } } - if (c && c->is_visible() && !c->has_meta("_edit_lock_") && !c->cast_to<CanvasLayer>()) { + if (c && c->is_visible_in_tree() && !c->has_meta("_edit_lock_") && !c->cast_to<CanvasLayer>()) { Rect2 rect = c->get_item_rect(); Transform2D xform = p_parent_xform * p_canvas_xform * c->get_transform(); @@ -633,7 +633,7 @@ bool CanvasItemEditor::_select(CanvasItem *item, Point2 p_click_pos, bool p_appe for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -676,7 +676,7 @@ void CanvasItemEditor::_key_move(const Vector2& p_dir, bool p_snap, KeyMoveMODE for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -738,7 +738,7 @@ Point2 CanvasItemEditor::_find_topleftmost_point() { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -769,7 +769,7 @@ int CanvasItemEditor::get_item_count() { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -791,7 +791,7 @@ CanvasItem *CanvasItemEditor::get_single_item() { for(Map<Node*,Object*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->key()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -1152,7 +1152,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -1247,7 +1247,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -1458,7 +1458,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -1568,7 +1568,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -1947,9 +1947,9 @@ void CanvasItemEditor::_viewport_draw() { if (viewport->has_focus()) { Size2 size = viewport->get_size(); - if (v_scroll->is_visible()) + if (v_scroll->is_visible_in_tree()) size.width-=v_scroll->get_size().width; - if (h_scroll->is_visible()) + if (h_scroll->is_visible_in_tree()) size.height-=h_scroll->get_size().height; get_stylebox("EditorFocus","EditorStyles")->draw(ci,Rect2(Point2(),size)); @@ -1969,7 +1969,7 @@ void CanvasItemEditor::_viewport_draw() { CanvasItem *canvas_item = E->key()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) continue; @@ -2198,7 +2198,7 @@ void CanvasItemEditor::_notification(int p_what) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2226,7 +2226,7 @@ void CanvasItemEditor::_notification(int p_what) { } bool show_anchor = all_control && has_control; - if (show_anchor != !anchor_menu->is_hidden()) { + if (show_anchor != anchor_menu->is_visible()) { if (show_anchor) anchor_menu->show(); else @@ -2619,7 +2619,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2637,7 +2637,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2658,7 +2658,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2676,7 +2676,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2697,7 +2697,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2818,7 +2818,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(Map<Node*,Object*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->key()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2931,7 +2931,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(Map<Node*,Object*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->key()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -2983,7 +2983,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(Map<Node*,Object*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->key()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -3029,7 +3029,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { Node2D *n2d = E->key()->cast_to<Node2D>(); if (!n2d) continue; - if (!n2d->is_visible()) + if (!n2d->is_visible_in_tree()) continue; if (!n2d->get_parent_item()) continue; @@ -3051,7 +3051,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { Node2D *n2d = E->key()->cast_to<Node2D>(); if (!n2d) continue; - if (!n2d->is_visible()) + if (!n2d->is_visible_in_tree()) continue; n2d->set_meta("_edit_bone_",Variant()); @@ -3069,7 +3069,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { for(List<Node*>::Element *E=selection.front();E;E=E->next()) { CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>(); - if (!canvas_item || !canvas_item->is_visible()) + if (!canvas_item || !canvas_item->is_visible_in_tree()) continue; if (canvas_item->get_viewport()!=EditorNode::get_singleton()->get_scene_root()) @@ -3093,7 +3093,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { CanvasItem *n2d = E->key()->cast_to<CanvasItem>(); if (!n2d) continue; - if (!n2d->is_visible()) + if (!n2d->is_visible_in_tree()) continue; n2d->set_meta("_edit_ik_",Variant()); @@ -3151,7 +3151,7 @@ void CanvasItemEditor::_focus_selection(int p_op) { // counting invisible items, for now - //if (!canvas_item->is_visible()) continue; + //if (!canvas_item->is_visible_in_tree()) continue; ++count; Rect2 item_rect = canvas_item->get_item_rect(); @@ -3654,7 +3654,7 @@ CanvasItemEditorPlugin::~CanvasItemEditorPlugin() void CanvasItemEditorViewport::_on_mouse_exit() { - if (selector->is_hidden()){ + if (!selector->is_visible()){ _remove_preview(); } } |
