r3065 - trunk/data/qcsrc/menu-div0test/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Dec 31 08:16:25 EST 2007
Author: div0
Date: 2007-12-31 08:16:22 -0500 (Mon, 31 Dec 2007)
New Revision: 3065
Modified:
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c
trunk/data/qcsrc/menu-div0test/nexuiz/keybinder.c
Log:
highlight the key grab button when the keyboard is grabbed
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c 2007-12-31 13:04:38 UTC (rev 3064)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c 2007-12-31 13:16:22 UTC (rev 3065)
@@ -31,6 +31,7 @@
me.TD(me, 1, 1, e = makeNexuizButton("Change key...", '0 0 0'));
e.onClick = KeyBinder_Bind_Change;
e.onClickEntity = kb;
+ kb.keyGrabButton = e;
me.TD(me, 1, 1, e = makeNexuizButton("Edit...", '0 0 0'));
e.onClick = KeyBinder_Bind_Edit;
e.onClickEntity = kb;
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/keybinder.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/keybinder.c 2007-12-31 13:04:38 UTC (rev 3064)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/keybinder.c 2007-12-31 13:16:22 UTC (rev 3065)
@@ -21,6 +21,7 @@
ATTRIB(NexuizKeyBinder, previouslySelected, float, -1)
ATTRIB(NexuizKeyBinder, inMouseHandler, float, 0)
ATTRIB(NexuizKeyBinder, userbindEditButton, entity, NULL)
+ ATTRIB(NexuizKeyBinder, keyGrabButton, entity, NULL)
ATTRIB(NexuizKeyBinder, userbindEditDialog, entity, NULL)
METHOD(NexuizKeyBinder, editUserbind, void(entity, string, string, string))
ENDCLASS(NexuizKeyBinder)
@@ -73,6 +74,7 @@
if(Nexuiz_KeyBinds_Count < 0)
Nexuiz_KeyBinds_Read();
me.nItems = Nexuiz_KeyBinds_Count;
+ me.setSelected(me, 0);
}
void resizeNotifyNexuizKeyBinder(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
{
@@ -98,6 +100,7 @@
if(func == "")
return;
+ me.keyGrabButton.forcePressed = 1;
keyGrabber = me;
}
void keyGrabbedNexuizKeyBinder(entity me, float key, float ascii)
@@ -105,6 +108,7 @@
float n, j, k, nvalid;
string func;
+ me.keyGrabButton.forcePressed = 0;
if(key == K_ESCAPE)
return;
More information about the nexuiz-commits
mailing list