mirror of
https://github.com/godotengine/godot.git
synced 2024-11-22 12:12:28 +00:00
More Fixes
-=-=-=-=-= -Bug in saving multinline text in xml fixed. #925 -typo in android export fixed. #930
This commit is contained in:
parent
da91ca7164
commit
10b371516b
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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) {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user