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

More Fixes

Browse source 
-=-=-=-=-=

-Bug in saving multinline text in xml fixed. #925
-typo in android export fixed. #930
This commit is contained in:
Juan Linietsky 2014-12-07 11:33:57 -03:00
parent da91ca7164
commit 10b371516b
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/io/resource_format_xml.cpp
View file

@ -193,6 +193,7 @@ Error ResourceInteractiveLoaderXML::close_tag(const String& p_name) {
void ResourceInteractiveLoaderXML::unquote(String& p_str) { void ResourceInteractiveLoaderXML::unquote(String& p_str) {
p_str=p_str.strip_edges().replace("\"","").xml_unescape(); p_str=p_str.strip_edges().replace("\"","").xml_unescape();
/*p_str=p_str.strip_edges(); /*p_str=p_str.strip_edges();
@ -1851,7 +1852,10 @@ void ResourceFormatSaverXMLInstance::escape(String& p_str) {
for (int i=1;i<32;i++) { for (int i=1;i<32;i++) {
char chr[2]={i,0}; 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);
} }

2
platform/android/export/export.cpp
View file

@ -1229,7 +1229,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
} }
if (!FileAccess::exists(keystore)) { 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; return ERR_FILE_CANT_OPEN;
} }

12
scene/gui/text_edit.cpp
View file

@ -1747,16 +1747,16 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
} }
break;} break;}
default: { default: {
scancode_handled=false; scancode_handled=false;
} break; } break;
} }
if (scancode_handled) if (scancode_handled)
accept_event(); accept_event();
/*
if (!scancode_handled && !k.mod.command && !k.mod.alt) { if (!scancode_handled && !k.mod.command && !k.mod.alt) {
if (k.unicode>=32) { if (k.unicode>=32) {
@ -1770,8 +1770,8 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
break; 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) { if (k.unicode>=32) {