godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Removal of InputEvent as built-in Variant type..

Browse Source 
this might cause bugs I haven't found yet..
This commit is contained in:
Juan Linietsky
2017-05-20 12:38:03 -03:00
parent 93f9a83062
commit 5b3709d309
206 changed files with 9547 additions and 10167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
editor/code_editor.cpp
View File

@@ -94,17 +94,16 @@ void FindReplaceBar::_notification(int p_what) {
}
}
void FindReplaceBar::_unhandled_input(const InputEvent &p_event) {
void FindReplaceBar::_unhandled_input(const Ref<InputEvent> &p_event) {
if (p_event.type == InputEvent::KEY) {
Ref<InputEventKey> k = p_event;
if (k.is_valid()) {
const InputEventKey &k = p_event.key;
if (k.pressed && (text_edit->has_focus() || text_vbc->is_a_parent_of(get_focus_owner()))) {
if (k->is_pressed() && (text_edit->has_focus() || text_vbc->is_a_parent_of(get_focus_owner()))) {
bool accepted = true;
switch (k.scancode) {
switch (k->get_scancode()) {
case KEY_ESCAPE: {
@@ -957,23 +956,27 @@ FindReplaceDialog::FindReplaceDialog() {
/*** CODE EDITOR ****/
void CodeTextEditor::_text_editor_gui_input(const InputEvent &p_event) {
void CodeTextEditor::_text_editor_gui_input(const Ref<InputEvent> &p_event) {
if (p_event.type == InputEvent::MOUSE_BUTTON) {
Ref<InputEventMouseButton> mb = p_event;
const InputEventMouseButton &mb = p_event.mouse_button;
if (mb.is_valid()) {
if (mb.pressed && mb.mod.command) {
if (mb->is_pressed() && mb->get_command()) {
if (mb.button_index == BUTTON_WHEEL_UP) {
if (mb->get_button_index() == BUTTON_WHEEL_UP) {
_zoom_in();
} else if (mb.button_index == BUTTON_WHEEL_DOWN) {
} else if (mb->get_button_index() == BUTTON_WHEEL_DOWN) {
_zoom_out();
}
}
} else if (p_event.type == InputEvent::KEY) {
}
if (p_event.key.pressed) {
Ref<InputEventKey> k = p_event;
if (k.is_valid()) {
if (k->is_pressed()) {
if (ED_IS_SHORTCUT("script_editor/zoom_in", p_event)) {
_zoom_in();
}