summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-08 19:54:19 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-08 19:54:19 -0300
commit94ee7798ced5bc79196c971921c3109e299f8306 (patch)
treee74a933ee4879a742f90aead5fb1001c6531d07a /tools
parent4fd464a4c5fc83c34377450935671b7be868333c (diff)
-removed stop mouse and ignore mouse from control, which were confusing, replaced by mouse filter
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/animation_editor.cpp2
-rw-r--r--tools/editor/asset_library_editor_plugin.cpp4
-rw-r--r--tools/editor/editor_node.cpp2
-rw-r--r--tools/editor/editor_profiler.cpp4
-rw-r--r--tools/editor/plugins/shader_graph_editor_plugin.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index 54ef21e681..4b918d75bc 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -4090,7 +4090,7 @@ AnimationKeyEditor::AnimationKeyEditor() {
track_pos = memnew( Control );
track_pos->set_area_as_parent_rect();
- track_pos->set_ignore_mouse(true);
+ track_pos->set_mouse_filter(MOUSE_FILTER_IGNORE);
track_editor->add_child(track_pos);
track_pos->connect("draw",this,"_track_pos_draw");
diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp
index b4f9337d86..986f235499 100644
--- a/tools/editor/asset_library_editor_plugin.cpp
+++ b/tools/editor/asset_library_editor_plugin.cpp
@@ -157,7 +157,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() {
set_custom_minimum_size(Size2(250,100));
set_h_size_flags(SIZE_EXPAND_FILL);
- set_stop_mouse(false);
+ set_mouse_filter(MOUSE_FILTER_PASS);
}
//////////////////////////////////////////////////////////////////////////////
@@ -1446,7 +1446,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
library_scroll->add_child(library_vb_border);
library_vb_border->add_style_override("panel",border2);
library_vb_border->set_h_size_flags(SIZE_EXPAND_FILL);
- library_vb_border->set_stop_mouse(false);
+ library_vb_border->set_mouse_filter(MOUSE_FILTER_PASS);
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 6961d25d76..5eb5f42001 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -5873,7 +5873,7 @@ EditorNode::EditorNode() {
play_cc = memnew( CenterContainer );
- play_cc->set_ignore_mouse(true);
+ play_cc->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
gui_base->add_child( play_cc );
play_cc->set_area_as_parent_rect();
play_cc->set_anchor_and_margin(MARGIN_BOTTOM,Control::ANCHOR_BEGIN,10);
diff --git a/tools/editor/editor_profiler.cpp b/tools/editor/editor_profiler.cpp
index 54b9de7622..162e1d05f5 100644
--- a/tools/editor/editor_profiler.cpp
+++ b/tools/editor/editor_profiler.cpp
@@ -710,8 +710,8 @@ EditorProfiler::EditorProfiler()
graph = memnew( TextureFrame );
graph->set_expand(true);
- graph->set_stop_mouse(true);
- graph->set_ignore_mouse(false);
+ graph->set_mouse_filter(MOUSE_FILTER_STOP);
+ //graph->set_ignore_mouse(false);
graph->connect("draw",this,"_graph_tex_draw");
graph->connect("gui_input",this,"_graph_tex_input");
graph->connect("mouse_exit",this,"_graph_tex_mouse_exit");
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp
index fa702fc9bb..3ba405cdbd 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp
@@ -2320,7 +2320,7 @@ void ShaderGraphView::_create_node(int p_id) {
tex->set_custom_minimum_size(Size2(80,80));
tex->set_drag_forwarding(this);
gn->add_child(tex);
- tex->set_ignore_mouse(false);
+ tex->set_mouse_filter(MOUSE_FILTER_PASS);
tex->set_texture(graph->texture_input_node_get_value(type,p_id));
ToolButton *edit = memnew( ToolButton );
edit->set_text("edit..");