r5041 - in trunk/data/qcsrc/menu: item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Nov 12 11:54:55 EST 2008
Author: div0
Date: 2008-11-12 11:54:55 -0500 (Wed, 12 Nov 2008)
New Revision: 5041
Modified:
trunk/data/qcsrc/menu/item/listbox.c
trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c
trunk/data/qcsrc/menu/nexuiz/serverlist.c
Log:
improved server info dialog
Modified: trunk/data/qcsrc/menu/item/listbox.c
===================================================================
--- trunk/data/qcsrc/menu/item/listbox.c 2008-11-12 13:38:46 UTC (rev 5040)
+++ trunk/data/qcsrc/menu/item/listbox.c 2008-11-12 16:54:55 UTC (rev 5041)
@@ -10,6 +10,7 @@
ATTRIB(ListBox, focusable, float, 1)
ATTRIB(ListBox, selectedItem, float, 0)
ATTRIB(ListBox, size, vector, '0 0 0')
+ ATTRIB(ListBox, origin, vector, '0 0 0')
ATTRIB(ListBox, scrollPos, float, 0) // measured in window heights, fixed when needed
ATTRIB(ListBox, previousValue, float, 0)
ATTRIB(ListBox, pressed, float, 0) // 0 = normal, 1 = scrollbar dragging, 2 = item dragging, 3 = released
@@ -45,6 +46,7 @@
void resizeNotifyListBox(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
{
me.size = absSize;
+ me.origin = absOrigin;
me.controlWidth = me.scrollbarWidth / absSize_x;
}
void configureListBoxListBox(entity me, float theScrollbarWidth, float theItemHeight)
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c 2008-11-12 13:38:46 UTC (rev 5040)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join_serverinfo.c 2008-11-12 16:54:55 UTC (rev 5041)
@@ -29,9 +29,8 @@
ATTRIB(NexuizServerInfoDialog, modLabel, entity, NULL)
ATTRIB(NexuizServerInfoDialog, versionLabel, entity, NULL)
ATTRIB(NexuizServerInfoDialog, pingLabel, entity, NULL)
-
ENDCLASS(NexuizServerInfoDialog)
-#endif
+
float SLIST_FIELD_NAME;
float SLIST_FIELD_CNAME;
float SLIST_FIELD_QCSTATUS;
@@ -44,6 +43,8 @@
float SLIST_FIELD_PING;
string CURRENT_IP; //used by join button
void Join_Click(entity me);
+#endif
+
#ifdef IMPLEMENTATION
void loadServerInfoNexuizServerInfoDialog(entity me, float i)
{
@@ -114,20 +115,17 @@
entity e;
me.TR(me);
me.TD(me, 1, me.columns, e = makeNexuizTextLabel(0.5, ""));
- e.alpha = 1;
e.colorL = SKINCOLOR_SERVERINFO_NAME;
e.allowCut = 1;
me.nameLabel = e;
me.TR(me);
me.TD(me, 1, me.columns, e = makeNexuizTextLabel(0.5, ""));
- e.alpha = 1;
e.colorL = SKINCOLOR_SERVERINFO_IP;
e.allowCut = 1;
me.cnameLabel = e;
me.TR(me);
- me.TD(me, 1, 6, e = makeNexuizTextLabel(0, "Players :"));
- e.alpha = 1;
+ me.TD(me, 1, 6, e = makeNexuizTextLabel(0, "Players:"));
me.TR(me);
me.TD(me, me.rows - 4, 5.5, e = makeNexuizPlayerList());
me.rawPlayerList = e;
@@ -135,44 +133,37 @@
me.gotoRC(me, 1, 6); me.setFirstColumn(me, me.currentColumn);
me.TR(me);
- me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Type :"));
- e.alpha = 1;
+ me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Type:"));
me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, ""));
e.allowCut = 1;
me.typeLabel = e;
me.TR(me);
- me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Map :"));
- e.alpha = 1;
+ me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Map:"));
me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, ""));
e.allowCut = 1;
me.mapLabel = e;
me.TR(me);
- me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Players :"));
- e.alpha = 1;
+ me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Players:"));
me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, ""));
e.allowCut = 1;
me.numPlayersLabel = e;
me.TR(me);
- me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Bots :"));
- e.alpha = 1;
+ me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Bots:"));
me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, ""));
e.allowCut = 1;
me.numBotsLabel = e;
me.TR(me);
- me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Mod :"));
- e.alpha = 1;
+ me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Mod:"));
me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, ""));
e.allowCut = 1;
me.modLabel = e;
me.TR(me);
- me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Version :"));
- e.alpha = 1;
+ me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Version:"));
me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, ""));
e.allowCut = 1;
me.versionLabel = e;
me.TR(me);
- me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Ping :"));
- e.alpha = 1;
+ me.TD(me, 1, 1.75, e = makeNexuizTextLabel(0, "Ping:"));
me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, ""));
e.allowCut = 1;
me.pingLabel = e;
Modified: trunk/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/serverlist.c 2008-11-12 13:38:46 UTC (rev 5040)
+++ trunk/data/qcsrc/menu/nexuiz/serverlist.c 2008-11-12 16:54:55 UTC (rev 5041)
@@ -533,7 +533,11 @@
float keyDownNexuizServerList(entity me, float scan, float ascii, float shift)
{
float i;
+ vector org, sz;
+ org = boxToGlobal(eY * (me.selectedItem * me.itemHeight - me.scrollPos), me.origin, me.size);
+ sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
+
if(scan == K_ENTER)
{
ServerList_Connect_Click(NULL, me);
@@ -552,7 +556,7 @@
{
// DOUBLE CLICK!
main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
- DialogOpenButton_Click(NULL, main.serverInfoDialog);
+ DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
}
me.lastClickedServer = i;
me.lastClickedTime = time;
@@ -560,7 +564,7 @@
else if(scan == K_MOUSE3 || scan == K_SPACE)
{
main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
- DialogOpenButton_Click(NULL, main.serverInfoDialog);
+ DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
}
else if(keyDownListBox(me, scan, ascii, shift))
return 1;
More information about the nexuiz-commits
mailing list