asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix "find and replace" initializing with wrong size

Browse source 
Fix the code editor outside the allowed limits.
This commit is contained in:
Guilherme Felipe 2018-06-10 19:10:32 -03:00
parent acd9646ede
commit 5bae3693bf
5 changed files with 9 additions and 8 deletions
Show stats 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

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

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