[nexuiz-commits] r7366 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-06 09:46:00 -0400 (Thu, 06 Aug 2009)
New Revision: 7366

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
   trunk/data/qcsrc/menu/nexuiz/serverlist.c
Log:
also update DNS better


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c	2009-08-06 13:41:33 UTC (rev 7365)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c	2009-08-06 13:46:00 UTC (rev 7366)
@@ -58,7 +58,7 @@
 			e.onEnter = ServerList_Connect_Click;
 			e.onEnterEntity = slist;
 			slist.ipAddressBox = e;
-		me.TD(me, 1, 1.5, e = makeNexuizButton("Bookmark", '0 0 0'));
+		me.TD(me, 1, 1.5, e = makeNexuizButton("", '0 0 0'));
 			e.onClick = ServerList_Favorite_Click;
 			e.onClickEntity = slist;
 			slist.favoriteButton = e;

Modified: trunk/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/serverlist.c	2009-08-06 13:41:33 UTC (rev 7365)
+++ trunk/data/qcsrc/menu/nexuiz/serverlist.c	2009-08-06 13:46:00 UTC (rev 7366)
@@ -169,6 +169,7 @@
 
 	me.ipAddressBox.setText(me.ipAddressBox, me.selectedServer);
 	me.ipAddressBox.cursorPos = strlen(me.selectedServer);
+	me.ipAddressBoxFocused = -1;
 }
 void refreshServerListNexuizServerList(entity me, float mode)
 {
@@ -296,20 +297,24 @@
 
 	if(owned)
 	{
-		me.ipAddressBox.setText(me.ipAddressBox, me.selectedServer);
-		me.ipAddressBox.cursorPos = strlen(me.selectedServer);
+		if(me.selectedServer != me.ipAddressBox.text)
+		{
+			me.ipAddressBox.setText(me.ipAddressBox, me.selectedServer);
+			me.ipAddressBox.cursorPos = strlen(me.selectedServer);
+			me.ipAddressBoxFocused = -1;
+		}
 	}
 
 	if(me.ipAddressBoxFocused != me.ipAddressBox.focused)
 	{
-		me.ipAddressBoxFocused = me.ipAddressBox.focused;
-		if(me.ipAddressBoxFocused)
+		if(me.ipAddressBox.focused || me.ipAddressBoxFocused < 0)
 		{
 			if(IsFavorite(me.ipAddressBox.text))
 				me.favoriteButton.setText(me.favoriteButton, "Remove");
 			else
 				me.favoriteButton.setText(me.favoriteButton, "Bookmark");
 		}
+		me.ipAddressBoxFocused = me.ipAddressBox.focused;
 	}
 
 	drawListBox(me);
@@ -388,6 +393,7 @@
 
 	me.ipAddressBox.setText(me.ipAddressBox, "");
 	me.ipAddressBox.cursorPos = 0;
+	me.ipAddressBoxFocused = -1;
 }
 void ServerList_ShowEmpty_Click(entity box, entity me)
 {
@@ -396,6 +402,7 @@
 
 	me.ipAddressBox.setText(me.ipAddressBox, "");
 	me.ipAddressBox.cursorPos = 0;
+	me.ipAddressBoxFocused = -1;
 }
 void ServerList_ShowFull_Click(entity box, entity me)
 {
@@ -404,6 +411,7 @@
 
 	me.ipAddressBox.setText(me.ipAddressBox, "");
 	me.ipAddressBox.cursorPos = 0;
+	me.ipAddressBoxFocused = -1;
 }
 void setSortOrderNexuizServerList(entity me, float field, float direction)
 {