mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2025-03-20 19:42:28 +01:00
Fixed the editor's code editor handling some shortcut events twice.
This commit is contained in:
parent
e3998417e7
commit
a7cf92860a
@ -69,36 +69,6 @@
|
||||
|
||||
#include "editor_script_editor.h"
|
||||
|
||||
// This function should be used to handle shortcuts that could otherwise
|
||||
// be handled too late if they weren't handled here.
|
||||
void EditorCodeTextEditor::_shortcut_input(const Ref<InputEvent> &event) {
|
||||
const Ref<InputEventKey> key_event = event;
|
||||
if (!key_event.is_valid() || !key_event->is_pressed()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (ED_IS_SHORTCUT("script_text_editor/move_up", key_event)) {
|
||||
move_lines_up();
|
||||
accept_event();
|
||||
return;
|
||||
}
|
||||
if (ED_IS_SHORTCUT("script_text_editor/move_down", key_event)) {
|
||||
move_lines_down();
|
||||
accept_event();
|
||||
return;
|
||||
}
|
||||
if (ED_IS_SHORTCUT("script_text_editor/delete_line", key_event)) {
|
||||
delete_lines();
|
||||
accept_event();
|
||||
return;
|
||||
}
|
||||
if (ED_IS_SHORTCUT("script_text_editor/duplicate_selection", key_event)) {
|
||||
duplicate_selection();
|
||||
accept_event();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void EditorCodeTextEditor::_text_editor_gui_input(const Ref<InputEvent> &p_event) {
|
||||
Ref<InputEventMouseButton> mb = p_event;
|
||||
|
||||
@ -1045,7 +1015,6 @@ void EditorCodeTextEditor::remove_all_bookmarks() {
|
||||
}
|
||||
|
||||
void EditorCodeTextEditor::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("_shortcut_input"), &EditorCodeTextEditor::_shortcut_input);
|
||||
ClassDB::bind_method("_text_editor_gui_input", &EditorCodeTextEditor::_text_editor_gui_input);
|
||||
ClassDB::bind_method("_line_col_changed", &EditorCodeTextEditor::_line_col_changed);
|
||||
ClassDB::bind_method("_text_changed", &EditorCodeTextEditor::_text_changed);
|
||||
|
@ -90,7 +90,6 @@ class EditorCodeTextEditor : public VBoxContainer {
|
||||
void _font_resize_timeout();
|
||||
bool _add_font_size(int p_delta);
|
||||
|
||||
void _shortcut_input(const Ref<InputEvent> &event);
|
||||
void _text_editor_gui_input(const Ref<InputEvent> &p_event);
|
||||
void _zoom_in();
|
||||
void _zoom_out();
|
||||
|
@ -30,9 +30,9 @@
|
||||
|
||||
#include "menu_button.h"
|
||||
#include "core/input/input.h"
|
||||
#include "core/input/shortcut.h"
|
||||
#include "core/os/keyboard.h"
|
||||
#include "scene/gui/popup_menu.h"
|
||||
#include "core/input/shortcut.h"
|
||||
#include "scene/main/viewport.h"
|
||||
|
||||
void MenuButton::_shortcut_input(Ref<InputEvent> p_event) {
|
||||
@ -42,8 +42,6 @@ void MenuButton::_shortcut_input(Ref<InputEvent> p_event) {
|
||||
return;
|
||||
}
|
||||
|
||||
BaseButton::_shortcut_input(p_event);
|
||||
|
||||
if (p_event->is_pressed() && !p_event->is_echo() && (Object::cast_to<InputEventKey>(p_event.ptr()) || Object::cast_to<InputEventJoypadButton>(p_event.ptr()) || Object::cast_to<InputEventAction>(*p_event))) {
|
||||
if (!get_parent() || !is_visible_in_tree() || is_disabled()) {
|
||||
return;
|
||||
@ -53,8 +51,11 @@ void MenuButton::_shortcut_input(Ref<InputEvent> p_event) {
|
||||
|
||||
if (popup->activate_item_by_event(p_event, global_only)) {
|
||||
accept_event();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
BaseButton::_shortcut_input(p_event);
|
||||
}
|
||||
|
||||
void MenuButton::pressed() {
|
||||
|
Loading…
Reference in New Issue
Block a user