diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/export/export.cpp | 6 | ||||
| -rw-r--r-- | platform/osx/os_osx.h | 6 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 17 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 |
4 files changed, 18 insertions, 13 deletions
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 905bb9ae24..d81aa25c32 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -114,9 +114,9 @@ void EditorExportPlatformJavaScript::get_preset_features(const Ref<EditorExportP void EditorExportPlatformJavaScript::get_export_options(List<ExportOption> *r_options) { - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), false)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), true)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), true)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/custom_html_shell", PROPERTY_HINT_GLOBAL_FILE, "html"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/head_include", PROPERTY_HINT_MULTILINE_TEXT), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "zip"), "")); diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index c422eb9223..d9ad0a7db8 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -52,10 +52,6 @@ class OS_OSX : public OS_Unix { public: - enum { - KEY_EVENT_BUFFER_SIZE = 512 - }; - struct KeyEvent { unsigned int osx_state; bool pressed; @@ -64,7 +60,7 @@ public: uint32_t unicode; }; - KeyEvent key_event_buffer[KEY_EVENT_BUFFER_SIZE]; + Vector<KeyEvent> key_event_buffer; int key_event_pos; bool force_quit; diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 8369adbb5f..ab54f62045 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -88,6 +88,15 @@ static void get_key_modifier_state(unsigned int p_osx_state, Ref<InputEventWithM state->set_metakey((p_osx_state & NSEventModifierFlagCommand)); } +static void push_to_key_event_buffer(const OS_OSX::KeyEvent &p_event) { + + Vector<OS_OSX::KeyEvent> &buffer = OS_OSX::singleton->key_event_buffer; + if (OS_OSX::singleton->key_event_pos >= buffer.size()) { + buffer.resize(1 + OS_OSX::singleton->key_event_pos); + } + buffer[OS_OSX::singleton->key_event_pos++] = p_event; +} + static int mouse_x = 0; static int mouse_y = 0; static int prev_mouse_x = 0; @@ -446,7 +455,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 }; ke.scancode = 0; ke.unicode = codepoint; - OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke; + push_to_key_event_buffer(ke); } [self cancelComposition]; } @@ -805,7 +814,7 @@ static int translateKey(unsigned int key) { ke.scancode = latin_keyboard_keycode_convert(translateKey([event keyCode])); ke.unicode = 0; - OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke; + push_to_key_event_buffer(ke); } if ((OS_OSX::singleton->im_position.x != 0) && (OS_OSX::singleton->im_position.y != 0)) @@ -858,7 +867,7 @@ static int translateKey(unsigned int key) { ke.scancode = latin_keyboard_keycode_convert(translateKey(key)); ke.unicode = 0; - OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke; + push_to_key_event_buffer(ke); } } @@ -874,7 +883,7 @@ static int translateKey(unsigned int key) { ke.scancode = latin_keyboard_keycode_convert(translateKey([event keyCode])); ke.unicode = 0; - OS_OSX::singleton->key_event_buffer[OS_OSX::singleton->key_event_pos++] = ke; + push_to_key_event_buffer(ke); } } diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 5736ae1585..9e22e8aaac 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -588,7 +588,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) mb->set_position(Vector2(old_x, old_y)); } - if (uMsg != WM_MOUSEWHEEL) { + if (uMsg != WM_MOUSEWHEEL && uMsg != WM_MOUSEHWHEEL) { if (mb->is_pressed()) { if (++pressrc > 0) |