diff options
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/text_edit.cpp | 36 | ||||
| -rw-r--r-- | scene/resources/dynamic_font.cpp | 2 |
2 files changed, 37 insertions, 1 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index ac1cf45315..9ab30b1976 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -2596,6 +2596,15 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } FALLTHROUGH; } +#ifdef APPLE_STYLE_KEYS + case KEY_B: { + if (!k->get_control()) { + scancode_handled = false; + break; + } + FALLTHROUGH; + } +#endif case KEY_LEFT: { if (k->get_shift()) @@ -2672,6 +2681,15 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } FALLTHROUGH; } +#ifdef APPLE_STYLE_KEYS + case KEY_F: { + if (!k->get_control()) { + scancode_handled = false; + break; + } + FALLTHROUGH; + } +#endif case KEY_RIGHT: { if (k->get_shift()) @@ -2733,6 +2751,15 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } FALLTHROUGH; } +#ifdef APPLE_STYLE_KEYS + case KEY_P: { + if (!k->get_control()) { + scancode_handled = false; + break; + } + FALLTHROUGH; + } +#endif case KEY_UP: { if (k->get_alt()) { @@ -2786,6 +2813,15 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } FALLTHROUGH; } +#ifdef APPLE_STYLE_KEYS + case KEY_N: { + if (!k->get_control()) { + scancode_handled = false; + break; + } + FALLTHROUGH; + } +#endif case KEY_DOWN: { if (k->get_alt()) { diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp index fd7b67a218..8ee9879055 100644 --- a/scene/resources/dynamic_font.cpp +++ b/scene/resources/dynamic_font.cpp @@ -1008,7 +1008,7 @@ void DynamicFont::_bind_methods() { ClassDB::bind_method(D_METHOD("get_fallback_count"), &DynamicFont::get_fallback_count); ADD_GROUP("Settings", ""); - ADD_PROPERTY(PropertyInfo(Variant::INT, "size"), "set_size", "get_size"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "size", PROPERTY_HINT_RANGE, "1,255,1"), "set_size", "get_size"); ADD_PROPERTY(PropertyInfo(Variant::INT, "outline_size", PROPERTY_HINT_RANGE, "0,255,1"), "set_outline_size", "get_outline_size"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "outline_color"), "set_outline_color", "get_outline_color"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_mipmaps"), "set_use_mipmaps", "get_use_mipmaps"); |