godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #23327 from YeldhamDev/search_shaders

Browse Source 
Added "shader" filter to "Find in Files"
This commit is contained in:
Rémi Verschelde
2018-12-07 15:11:32 +01:00
committed by GitHub
parent e4a2003b98 f6d137d3d0
commit c2e96c65b3
5 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/plugins/shader_editor_plugin.cpp
View File

@@ -350,9 +350,9 @@ void ShaderEditor::_menu_option(int p_option) {
void ShaderEditor::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE) {
}
if (p_what == NOTIFICATION_DRAW) {
if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
if (is_visible_in_tree())
shader_editor->get_text_edit()->grab_focus();
}
}
@@ -389,7 +389,6 @@ void ShaderEditor::_bind_methods() {
ClassDB::bind_method("_menu_option", &ShaderEditor::_menu_option);
ClassDB::bind_method("_params_changed", &ShaderEditor::_params_changed);
ClassDB::bind_method("apply_shaders", &ShaderEditor::apply_shaders);
//ClassDB::bind_method("_close_current_tab",&ShaderEditor::_close_current_tab);
}
void ShaderEditor::ensure_select_current() {
@@ -405,6 +404,11 @@ void ShaderEditor::ensure_select_current() {
}*/
}
void ShaderEditor::goto_line_selection(int p_line, int p_begin, int p_end) {
shader_editor->goto_line_selection(p_line, p_begin, p_end);
}
void ShaderEditor::edit(const Ref<Shader> &p_shader) {
if (p_shader.is_null() || !p_shader->is_text_shader())