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

Merge pull request #19498 from guilhermefelipecgs/fix_regression

Browse Source 
Fix "find and replace" initializing with wrong size
This commit is contained in:
Max Hilbrunner
2018-07-05 04:23:18 +02:00
committed by GitHub
parent 073e77454d 5bae3693bf
commit c488a74e0c
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/code_editor.cpp
View File

@@ -95,7 +95,7 @@ void FindReplaceBar::_notification(int p_what) {
set_process_unhandled_input(is_visible_in_tree()); set_process_unhandled_input(is_visible_in_tree());
if (is_visible_in_tree()) { if (is_visible_in_tree()) {
call_deferred("_update_size"); _update_size();
} }
} else if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { } else if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {

4
editor/plugins/script_editor_plugin.h
View File

@@ -72,9 +72,9 @@ public:
class ScriptEditorDebugger; class ScriptEditorDebugger;
class ScriptEditorBase : public Control { class ScriptEditorBase : public VBoxContainer {
GDCLASS(ScriptEditorBase, Control); GDCLASS(ScriptEditorBase, VBoxContainer);
protected: protected:
static void _bind_methods(); static void _bind_methods();

1
editor/plugins/script_text_editor.cpp
View File

@@ -1619,6 +1619,7 @@ ScriptTextEditor::ScriptTextEditor() {
code_editor->set_code_complete_func(_code_complete_scripts, this); 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("breakpoint_toggled", this, "_breakpoint_toggled");
code_editor->get_text_edit()->connect("symbol_lookup", this, "_lookup_symbol"); code_editor->get_text_edit()->connect("symbol_lookup", this, "_lookup_symbol");
code_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
update_settings(); update_settings();

4
scene/gui/tab_container.cpp
View File

@@ -407,7 +407,7 @@ void TabContainer::_child_renamed_callback() {
void TabContainer::add_child_notify(Node *p_child) { 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); Control *c = Object::cast_to<Control>(p_child);
if (!c) if (!c)
@@ -515,7 +515,7 @@ Control *TabContainer::get_current_tab_control() const {
void TabContainer::remove_child_notify(Node *p_child) { 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"); call_deferred("_update_current_tab");

6
scene/gui/tab_container.h
View File

@@ -31,11 +31,11 @@
#ifndef TAB_CONTAINER_H #ifndef TAB_CONTAINER_H
#define TAB_CONTAINER_H #define TAB_CONTAINER_H
#include "scene/gui/control.h" #include "scene/gui/container.h"
#include "scene/gui/popup.h" #include "scene/gui/popup.h"
class TabContainer : public Control { class TabContainer : public Container {
GDCLASS(TabContainer, Control); GDCLASS(TabContainer, Container);
public: public:
enum TabAlign { enum TabAlign {