diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-09-24 18:06:15 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-09-24 18:06:15 -0300 |
| commit | 82a3304458738b410a5aff8994ce587413aeb464 (patch) | |
| tree | b54672bc649a80ebbe1e11b0488c7dfdc6c109e7 /tools | |
| parent | 59e1ad27731e66c58a3d5ee9d783eac74a1d48d9 (diff) | |
Added ability to set custom mouse cursors. Not hardware accelerated yet.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/editor_import_export.cpp | 13 | ||||
| -rw-r--r-- | tools/editor/editor_node.cpp | 14 |
2 files changed, 21 insertions, 6 deletions
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 84fc14d2ec..0f7b4a5e09 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -842,6 +842,17 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func boot_splash=splash; } } + StringName custom_cursor; + { + String splash=Globals::get_singleton()->get("display/custom_mouse_cursor"); //avoid splash from being converted + splash=splash.strip_edges(); + if (splash!=String()) { + if (!splash.begins_with("res://")) + splash="res://"+splash; + splash=splash.simplify_path(); + custom_cursor=splash; + } + } @@ -853,7 +864,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func String src=files[i]; Vector<uint8_t> buf; - if (src==boot_splash) + if (src==boot_splash || src==custom_cursor) buf = get_exported_file_default(src); //bootsplash must be kept if used else buf = get_exported_file(src); diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 63684dcc93..14ed75d1ab 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -93,7 +93,7 @@ #include "plugins/light_occluder_2d_editor_plugin.h" #include "plugins/color_ramp_editor_plugin.h" #include "plugins/collision_shape_2d_editor_plugin.h" -#include "os/input.h" +#include "main/input_default.h" // end #include "tools/editor/io_plugins/editor_texture_import_plugin.h" #include "tools/editor/io_plugins/editor_scene_import_plugin.h" @@ -4390,11 +4390,15 @@ EditorNode::EditorNode() { EditorHelp::generate_doc(); //before any editor classes are crated - if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) { - //only if no touchscreen ui hint, set emulation - InputDefault *id = Input::get_singleton()->cast_to<InputDefault>(); - if (id) + InputDefault *id = Input::get_singleton()->cast_to<InputDefault>(); + + if (id) { + + if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) { + //only if no touchscreen ui hint, set emulation id->set_emulate_touch(false); //just disable just in case + } + id->set_custom_mouse_cursor(RES()); } |