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

Merge pull request #18921 from volzhs/margin-find-replace-bar

Browse Source 
Add margin bottom with find/replace bar on script editor
This commit is contained in:
Rémi Verschelde 2018-05-16 10:57:11 +02:00 committed by GitHub
commit fcc321f75f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/code_editor.cpp
View File

@ -373,7 +373,6 @@ void FindReplaceBar::_hide_bar() {
void FindReplaceBar::_show_search() { void FindReplaceBar::_show_search() {
hide(); // to update size correctly
show(); show();
search_text->grab_focus(); search_text->grab_focus();
@ -481,7 +480,7 @@ void FindReplaceBar::set_text_edit(TextEdit *p_text_edit) {
void FindReplaceBar::_update_size() { void FindReplaceBar::_update_size() {
container->set_custom_minimum_size(Size2(0, hbc->get_size().height)); container->set_size(Size2(hbc->get_size().width, 1));
} }
void FindReplaceBar::_bind_methods() { void FindReplaceBar::_bind_methods() {
@ -507,7 +506,8 @@ void FindReplaceBar::_bind_methods() {
FindReplaceBar::FindReplaceBar() { FindReplaceBar::FindReplaceBar() {
container = memnew(Control); container = memnew(MarginContainer);
container->add_constant_override("margin_bottom", 5 * EDSCALE);
add_child(container); add_child(container);
container->set_clip_contents(true); container->set_clip_contents(true);
container->set_h_size_flags(SIZE_EXPAND_FILL); container->set_h_size_flags(SIZE_EXPAND_FILL);
@ -592,8 +592,7 @@ FindReplaceBar::FindReplaceBar() {
add_child(hide_button); add_child(hide_button);
hide_button->set_focus_mode(FOCUS_NONE); hide_button->set_focus_mode(FOCUS_NONE);
hide_button->connect("pressed", this, "_hide_pressed"); hide_button->connect("pressed", this, "_hide_pressed");
hide_button->set_expand(true); hide_button->set_v_size_flags(SIZE_SHRINK_CENTER);
hide_button->set_stretch_mode(TextureButton::STRETCH_KEEP_CENTERED);
} }
/*** CODE EDITOR ****/ /*** CODE EDITOR ****/

2
editor/code_editor.h
View File

@ -63,7 +63,7 @@ class FindReplaceBar : public HBoxContainer {
GDCLASS(FindReplaceBar, HBoxContainer); GDCLASS(FindReplaceBar, HBoxContainer);
Control *container; MarginContainer *container;
LineEdit *search_text; LineEdit *search_text;
ToolButton *find_prev; ToolButton *find_prev;
ToolButton *find_next; ToolButton *find_next;