From 8dad6415b1acf4e2e4bd083eb95aacfc818ee339 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 31 Dec 2015 10:50:39 -0300 Subject: [PATCH] -Fixed focus for shader editor when switching tab, closes #2551 --- tools/editor/plugins/shader_editor_plugin.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp index 848073af3e6..d797e64af34 100644 --- a/tools/editor/plugins/shader_editor_plugin.cpp +++ b/tools/editor/plugins/shader_editor_plugin.cpp @@ -172,11 +172,8 @@ ShaderTextEditor::ShaderTextEditor() { void ShaderEditor::_menu_option(int p_option) { - int selected = tab_container->get_current_tab(); - if (selected<0 || selected>=tab_container->get_child_count()) - return; - ShaderTextEditor *current = tab_container->get_child(selected)->cast_to(); + ShaderTextEditor *current = tab_container->get_current_tab_control()->cast_to(); if (!current) return; @@ -235,7 +232,7 @@ void ShaderEditor::_menu_option(int p_option) { void ShaderEditor::_tab_changed(int p_which) { - ShaderTextEditor *shader_editor = tab_container->get_child(p_which)->cast_to(); + ShaderTextEditor *shader_editor = tab_container->get_tab_control(p_which)->cast_to(); if (shader_editor) shader_editor->get_text_edit()->grab_focus();