zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-23 04:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed the internal InpuEvent to deconflict from the version in the event system.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-14 19:32:44 +01:00
parent 2234d36c7a
commit 6e2b0bc961
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wadsrc/static/zscript/base.txt
View file

@ -1,4 +1,4 @@
struct InputEvent native struct InputEventData native
{ {
native uint8 type; native uint8 type;
native uint8 subtype; native uint8 subtype;

2
wadsrc/static/zscript/menu/listmenu.txt
View file

@ -86,7 +86,7 @@ class ListMenu : Menu native
return NULL; return NULL;
} }
//bool Responder (InputEvent ev); //bool Responder (InputEventData ev);
//bool MenuEvent (int mkey, bool fromcontroller); //bool MenuEvent (int mkey, bool fromcontroller);
//bool MouseEvent(int type, int x, int y); //bool MouseEvent(int type, int x, int y);
//void Ticker (); //void Ticker ();

2
wadsrc/static/zscript/menu/menu.txt
View file

@ -105,7 +105,7 @@ class Menu : Object native
virtual void ReleaseFocus() {} virtual void ReleaseFocus() {}
virtual void ResetColor() {} virtual void ResetColor() {}
native virtual bool Responder(InputEvent ev); native virtual bool Responder(InputEventData ev);
native virtual bool MenuEvent (int mkey, bool fromcontroller); native virtual bool MenuEvent (int mkey, bool fromcontroller);
native virtual bool MouseEvent(int type, int mx, int my); native virtual bool MouseEvent(int type, int mx, int my);
native virtual void Ticker(); native virtual void Ticker();

8
wadsrc/static/zscript/menu/optionmenu.txt
View file

@ -120,17 +120,17 @@ class OptionMenu : Menu
// //
//============================================================================= //=============================================================================
override bool Responder (InputEvent ev) override bool Responder (InputEventData ev)
{ {
if (ev.type == InputEvent.GUI_Event) if (ev.type == InputEventData.GUI_Event)
{ {
if (ev.subtype == InputEvent.GUI_WheelUp) if (ev.subtype == InputEventData.GUI_WheelUp)
{ {
int scrollamt = MIN(2, mDesc.mScrollPos); int scrollamt = MIN(2, mDesc.mScrollPos);
mDesc.mScrollPos -= scrollamt; mDesc.mScrollPos -= scrollamt;
return true; return true;
} }
else if (ev.subtype == InputEvent.GUI_WheelDown) else if (ev.subtype == InputEventData.GUI_WheelDown)
{ {
if (CanScrollDown) if (CanScrollDown)
{ {

6
wadsrc/static/zscript/menu/optionmenuitems.txt
View file

@ -396,16 +396,16 @@ class EnterKey : Menu
} }
} }
override bool Responder(InputEvent ev) override bool Responder(InputEventData ev)
{ {
// This checks raw keys, not GUI keys. // This checks raw keys, not GUI keys.
if (ev.type == InputEvent.KeyDown) if (ev.type == InputEventData.KeyDown)
{ {
mOwner.SendKey(ev.data1); mOwner.SendKey(ev.data1);
menuactive = Menu.On; menuactive = Menu.On;
SetMenuMessage(0); SetMenuMessage(0);
Close(); Close();
mParentMenu.MenuEvent((ev.data1 == InputEvent.KEY_ESCAPE)? Menu.MKEY_Abort : Menu.MKEY_Input, 0); mParentMenu.MenuEvent((ev.data1 == InputEventData.KEY_ESCAPE)? Menu.MKEY_Abort : Menu.MKEY_Input, 0);
return true; return true;
} }
return false; return false;

4
wadsrc/static/zscript/menu/videomenu.txt
View file

@ -57,9 +57,9 @@ class VideoModeMenu : OptionMenu
return Super.MenuEvent(mkey, fromcontroller); return Super.MenuEvent(mkey, fromcontroller);
} }
override bool Responder(InputEvent ev) override bool Responder(InputEventData ev)
{ {
if (ev.type == InputEvent.GUI_Event && ev.subtype == InputEvent.GUI_KeyDown && (ev.data1 == 0x54 || ev.data1 == 0x74)) if (ev.type == InputEventData.GUI_Event && ev.subtype == InputEventData.GUI_KeyDown && (ev.data1 == 0x54 || ev.data1 == 0x74))
{ {
if (SetSelectedSize()) if (SetSelectedSize())
{ {