Sfoglia il codice sorgente

Fix "find and replace" initializing with wrong size

Fix the code editor outside the allowed limits.
Guilherme Felipe 7 anni fa
parent
commit
5bae3693bf

+ 1 - 1
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) {
 

+ 2 - 2
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();

+ 1 - 0
editor/plugins/script_text_editor.cpp

@@ -1609,6 +1609,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();
 

+ 2 - 2
scene/gui/tab_container.cpp

@@ -367,7 +367,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)
@@ -475,7 +475,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");
 

+ 3 - 3
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 {