diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-12-07 11:33:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-12-07 11:33:57 -0300 |
| commit | 10b371516bfd88f354acde9a2b37cf854eb92780 (patch) | |
| tree | a064a5c4fa57b42184b928fc2dc825d88a1206d8 | |
| parent | da91ca71645cccf38dc593ef790d09d4610c2aef (diff) | |
More Fixes
-=-=-=-=-=
-Bug in saving multinline text in xml fixed. #925
-typo in android export fixed. #930
| -rw-r--r-- | core/io/resource_format_xml.cpp | 6 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 12 |
3 files changed, 12 insertions, 8 deletions
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp index 2a79e6647d..75384d4ab6 100644 --- a/core/io/resource_format_xml.cpp +++ b/core/io/resource_format_xml.cpp @@ -193,6 +193,7 @@ Error ResourceInteractiveLoaderXML::close_tag(const String& p_name) { void ResourceInteractiveLoaderXML::unquote(String& p_str) { + p_str=p_str.strip_edges().replace("\"","").xml_unescape(); /*p_str=p_str.strip_edges(); @@ -1851,7 +1852,10 @@ void ResourceFormatSaverXMLInstance::escape(String& p_str) { for (int i=1;i<32;i++) { char chr[2]={i,0}; - p_str=p_str.replace(chr,"&#"+String::num(i)+";"); + const char hexn[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; + const char hex[8]={'&','#','0','0',hexn[i>>4],hexn[i&0xf],';',0}; + + p_str=p_str.replace(chr,hex); } diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 89f121c3f6..3e4ea8a4e0 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1229,7 +1229,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d } if (!FileAccess::exists(keystore)) { - EditorNode::add_io_error("Could not find keytore, unable to export."); + EditorNode::add_io_error("Could not find keystore, unable to export."); return ERR_FILE_CANT_OPEN; } diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index f1100c7c20..ba68948e6b 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -1747,16 +1747,16 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { } break;} - default: { + default: { - scancode_handled=false; - } break; + scancode_handled=false; + } break; } if (scancode_handled) accept_event(); - +/* if (!scancode_handled && !k.mod.command && !k.mod.alt) { if (k.unicode>=32) { @@ -1770,8 +1770,8 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { break; } } - - if (!scancode_handled && !k.mod.command && !k.mod.alt) { +*/ + if (!scancode_handled && !k.mod.command && !k.mod.alt) { //for german kbds if (k.unicode>=32) { |