godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #189 from sanikoyes/hotfix-ime

Browse Source 
Merging!
This commit is contained in:
reduz 2014-03-12 08:45:07 -07:00
commit 777c045bfc
5 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/memory_pool_dynamic_static.h
View File

@ -38,7 +38,7 @@ class MemoryPoolDynamicStatic : public MemoryPoolDynamic {
_THREAD_SAFE_CLASS_ _THREAD_SAFE_CLASS_
enum { enum {
MAX_CHUNKS=16384 MAX_CHUNKS=65536
}; };

1
modules/gdscript/gd_parser.cpp
View File

@ -215,6 +215,7 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
String path = tokenizer->get_token_constant(); String path = tokenizer->get_token_constant();
if (!path.is_abs_path() && base_path!="") if (!path.is_abs_path() && base_path!="")
path=base_path+"/"+path; path=base_path+"/"+path;
path = path.replace("///","//");
Ref<Resource> res = ResourceLoader::load(path); Ref<Resource> res = ResourceLoader::load(path);
if (!res.is_valid()) { if (!res.is_valid()) {

22
platform/windows/os_windows.cpp
View File

@ -608,6 +608,28 @@ void OS_Windows::process_key_events() {
switch(ke.uMsg) { switch(ke.uMsg) {
case WM_CHAR: { case WM_CHAR: {
if ((i==0 && ke.uMsg==WM_CHAR) || (i>0 && key_event_buffer[i-1].uMsg==WM_CHAR))
{
InputEvent event;
event.type=InputEvent::KEY;
event.ID=++last_id;
InputEventKey &k=event.key;
k.mod=ke.mod_state;
k.pressed=true;
k.scancode=KeyMappingWindows::get_keysym(ke.wParam);
k.unicode=ke.wParam;
if (k.unicode && gr_mem) {
k.mod.alt=false;
k.mod.control=false;
}
if (k.unicode<32)
k.unicode=0;
input->parse_input_event(event);
}
//do nothing //do nothing
} break; } break;

2
tools/editor/editor_node.h
View File

@ -410,6 +410,8 @@ public:
static void add_editor_plugin(EditorPlugin *p_editor); static void add_editor_plugin(EditorPlugin *p_editor);
static void remove_editor_plugin(EditorPlugin *p_editor); static void remove_editor_plugin(EditorPlugin *p_editor);
static EditorNode * get_singleton() { return singleton; }
void edit_node(Node *p_node); void edit_node(Node *p_node);
void edit_resource(const Ref<Resource>& p_resource); void edit_resource(const Ref<Resource>& p_resource);

3
tools/editor/scene_tree_editor.cpp
View File

@ -706,7 +706,8 @@ void SceneTreeDialog::_cancel() {
void SceneTreeDialog::_select() { void SceneTreeDialog::_select() {
if (tree->get_selected()) { if (tree->get_selected()) {
emit_signal("selected",tree->get_selected()->get_path()); Node *scene = EditorNode::get_singleton()->get_edited_scene();
emit_signal("selected","/root/" + scene->get_parent()->get_path_to(tree->get_selected()));
hide(); hide();
} }
} }