diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-05 04:23:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 04:23:18 +0200 |
| commit | c488a74e0c9d56975d5b23e5bff5ca2341f80036 (patch) | |
| tree | d8db15e0c30ab8d9b605894486e094077c0d0c88 | |
| parent | 073e77454dccb08d56f837f809eef43d57f09819 (diff) | |
| parent | 5bae3693bfcd856507a85fded3c23515e4e633c1 (diff) | |
Merge pull request #19498 from guilhermefelipecgs/fix_regression
Fix "find and replace" initializing with wrong size
| -rw-r--r-- | editor/code_editor.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.h | 4 | ||||
| -rw-r--r-- | editor/plugins/script_text_editor.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/tab_container.cpp | 4 | ||||
| -rw-r--r-- | scene/gui/tab_container.h | 6 |
5 files changed, 9 insertions, 8 deletions
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index ce35b655a2..6aec6135f1 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -95,7 +95,7 @@ void FindReplaceBar::_notification(int p_what) { set_process_unhandled_input(is_visible_in_tree()); if (is_visible_in_tree()) { - call_deferred("_update_size"); + _update_size(); } } else if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index 67f506fdda..ad12add53f 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -72,9 +72,9 @@ public: class ScriptEditorDebugger; -class ScriptEditorBase : public Control { +class ScriptEditorBase : public VBoxContainer { - GDCLASS(ScriptEditorBase, Control); + GDCLASS(ScriptEditorBase, VBoxContainer); protected: static void _bind_methods(); diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 345c7c06eb..ffc2203475 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1619,6 +1619,7 @@ ScriptTextEditor::ScriptTextEditor() { code_editor->set_code_complete_func(_code_complete_scripts, this); code_editor->get_text_edit()->connect("breakpoint_toggled", this, "_breakpoint_toggled"); code_editor->get_text_edit()->connect("symbol_lookup", this, "_lookup_symbol"); + code_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL); update_settings(); diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 4f72b5c6ed..c30fa96327 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -407,7 +407,7 @@ void TabContainer::_child_renamed_callback() { void TabContainer::add_child_notify(Node *p_child) { - Control::add_child_notify(p_child); + Container::add_child_notify(p_child); Control *c = Object::cast_to<Control>(p_child); if (!c) @@ -515,7 +515,7 @@ Control *TabContainer::get_current_tab_control() const { void TabContainer::remove_child_notify(Node *p_child) { - Control::remove_child_notify(p_child); + Container::remove_child_notify(p_child); call_deferred("_update_current_tab"); diff --git a/scene/gui/tab_container.h b/scene/gui/tab_container.h index 1afe5f7541..8a3c9d2bb2 100644 --- a/scene/gui/tab_container.h +++ b/scene/gui/tab_container.h @@ -31,11 +31,11 @@ #ifndef TAB_CONTAINER_H #define TAB_CONTAINER_H -#include "scene/gui/control.h" +#include "scene/gui/container.h" #include "scene/gui/popup.h" -class TabContainer : public Control { +class TabContainer : public Container { - GDCLASS(TabContainer, Control); + GDCLASS(TabContainer, Container); public: enum TabAlign { |