seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112766 from syntaxerror247/script-editor-auto-resize

Browse Source 
Android Editor: Adjust script editor size for virtual keyboard
This commit is contained in:
Thaddeus Crews
2025-11-20 11:10:57 -06:00
parent 51c470e410 826f60db62
commit d843374519
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
editor/script/script_editor_plugin.cpp
View File

@ -58,6 +58,7 @@
#include "editor/gui/window_wrapper.h"
#include "editor/inspector/editor_context_menu_plugin.h"
#include "editor/run/editor_run_bar.h"
#include "editor/scene/editor_scene_tabs.h"
#include "editor/script/editor_script.h"
#include "editor/script/find_in_files.h"
#include "editor/settings/editor_command_palette.h"
@ -1864,8 +1865,54 @@ void ScriptEditor::_notification(int p_what) {
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &ScriptEditor::_editor_settings_changed));
EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &ScriptEditor::_filesystem_changed));
#ifdef ANDROID_ENABLED
set_process(true);
#endif
} break;
#ifdef ANDROID_ENABLED
case NOTIFICATION_VISIBILITY_CHANGED: {
set_process(is_visible_in_tree());
} break;
case NOTIFICATION_PROCESS: {
const int kb_height = DisplayServer::get_singleton()->virtual_keyboard_get_height();
if (kb_height == last_kb_height) {
break;
}
last_kb_height = kb_height;
float spacer_height = 0.0f;
const float status_bar_height = 28 * EDSCALE; // Magic number
const bool kb_visible = kb_height > 0;
if (kb_visible) {
if (ScriptEditorBase *editor = _get_current_editor()) {
if (CodeTextEditor *code_editor = editor->get_code_editor()) {
if (CodeEdit *text_editor = code_editor->get_text_editor()) {
if (!text_editor->has_focus()) {
break;
}
text_editor->adjust_viewport_to_caret();
}
}
}
const float control_bottom = get_global_position().y + get_size().y;
const float extra_bottom = get_viewport_rect().size.y - control_bottom;
spacer_height = float(kb_height) - extra_bottom - status_bar_height;
if (spacer_height < 0.0f) {
spacer_height = 0.0f;
}
}
virtual_keyboard_spacer->set_custom_minimum_size(Size2(0, spacer_height));
EditorSceneTabs::get_singleton()->set_visible(!kb_height);
menu_hb->set_visible(!kb_visible);
} break;
#endif
case NOTIFICATION_EXIT_TREE: {
EditorRunBar::get_singleton()->disconnect("stop_pressed", callable_mp(this, &ScriptEditor::_editor_stop));
} break;
@ -4187,6 +4234,12 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
main_container->add_child(script_split);
script_split->set_v_size_flags(SIZE_EXPAND_FILL);
#ifdef ANDROID_ENABLED
virtual_keyboard_spacer = memnew(Control);
virtual_keyboard_spacer->set_h_size_flags(SIZE_EXPAND_FILL);
main_container->add_child(virtual_keyboard_spacer);
#endif
list_split = memnew(VSplitContainer);
script_split->add_child(list_split);
list_split->set_v_size_flags(SIZE_EXPAND_FILL);

5
editor/script/script_editor_plugin.h
View File

@ -372,6 +372,11 @@ class ScriptEditor : public PanelContainer {
WindowWrapper *window_wrapper = nullptr;
#ifdef ANDROID_ENABLED
Control *virtual_keyboard_spacer = nullptr;
int last_kb_height = -1;
#endif
enum {
SCRIPT_EDITOR_FUNC_MAX = 32,
};