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

Reverted a PR i don't understand how to find but fixes #5097

Browse Source
This commit is contained in:
Juan Linietsky
2016-06-09 22:05:41 -03:00
parent f4ff30dff0
commit 8266cf46b5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/line_edit.cpp
View File

@@ -454,7 +454,7 @@ void LineEdit::_notification(int p_what) {
} break; } break;
} }
int ofs_max=width-style->get_minimum_size().width+x_ofs; int ofs_max=width-style->get_minimum_size().width;
int char_ofs=window_pos; int char_ofs=window_pos;
int y_area=height-style->get_minimum_size().height; int y_area=height-style->get_minimum_size().height;
@@ -799,8 +799,8 @@ Size2 LineEdit::get_minimum_size() const {
Ref<Font> font=get_font("font"); Ref<Font> font=get_font("font");
Size2 min=style->get_minimum_size(); Size2 min=style->get_minimum_size();
min+=font->get_string_size(this->text); min.height+=font->get_height();
min.width+=get_constant("minimum_spaces")*font->get_char_size(' ').x;
return min; return min;
} }