Merge pull request #24057 from allkhor/redo_menu_option

TextEdit: added redo option to the context menu
This commit is contained in:
Rémi Verschelde 2018-12-02 17:07:10 +01:00 committed by GitHub
commit bc269451e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View file

@ -6045,7 +6045,10 @@ void TextEdit::menu_option(int p_option) {
case MENU_UNDO: { case MENU_UNDO: {
undo(); undo();
} break; } break;
}; case MENU_REDO: {
redo();
}
}
} }
void TextEdit::set_select_identifiers_on_hover(bool p_enable) { void TextEdit::set_select_identifiers_on_hover(bool p_enable) {
@ -6221,6 +6224,7 @@ void TextEdit::_bind_methods() {
BIND_ENUM_CONSTANT(MENU_CLEAR); BIND_ENUM_CONSTANT(MENU_CLEAR);
BIND_ENUM_CONSTANT(MENU_SELECT_ALL); BIND_ENUM_CONSTANT(MENU_SELECT_ALL);
BIND_ENUM_CONSTANT(MENU_UNDO); BIND_ENUM_CONSTANT(MENU_UNDO);
BIND_ENUM_CONSTANT(MENU_REDO);
BIND_ENUM_CONSTANT(MENU_MAX); BIND_ENUM_CONSTANT(MENU_MAX);
GLOBAL_DEF("gui/timers/text_edit_idle_detect_sec", 3); GLOBAL_DEF("gui/timers/text_edit_idle_detect_sec", 3);
@ -6349,6 +6353,7 @@ TextEdit::TextEdit() {
menu->add_item(RTR("Clear"), MENU_CLEAR); menu->add_item(RTR("Clear"), MENU_CLEAR);
menu->add_separator(); menu->add_separator();
menu->add_item(RTR("Undo"), MENU_UNDO, KEY_MASK_CMD | KEY_Z); menu->add_item(RTR("Undo"), MENU_UNDO, KEY_MASK_CMD | KEY_Z);
menu->add_item(RTR("Redo"), MENU_REDO, KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_Z);
menu->connect("id_pressed", this, "menu_option"); menu->connect("id_pressed", this, "menu_option");
} }

View file

@ -444,6 +444,7 @@ public:
MENU_CLEAR, MENU_CLEAR,
MENU_SELECT_ALL, MENU_SELECT_ALL,
MENU_UNDO, MENU_UNDO,
MENU_REDO,
MENU_MAX MENU_MAX
}; };