diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-08 11:23:23 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-08 11:23:23 -0300 |
| commit | 9637460331b768fdcb3b1d7bb81740c109b009d5 (patch) | |
| tree | 74c316b2ca189ceb835a5b84a7371516a819a469 /scene | |
| parent | 3c33b705d1348aab082317126b94fc445960b8ae (diff) | |
| parent | 2cc60386d83d06e3b2005f0d2e3094eebfb9e382 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/file_dialog.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/line_edit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 75a1cb92ee..22e3a81e52 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -623,7 +623,7 @@ void FileDialog::_update_drives() { } } -bool FileDialog::default_show_hidden_files=true; +bool FileDialog::default_show_hidden_files=false; void FileDialog::_bind_methods() { diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 18de8ed568..10ba20a833 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -568,7 +568,7 @@ void LineEdit::set_cursor_at_pixel_pos(int p_x) { int char_w = 0; if (font != NULL) { - int char_w = font->get_char_size(text[ofs]).width; + char_w = font->get_char_size(text[ofs]).width; } pixel_ofs+=char_w; |