From 13938b87370367c19f98789aa0f4388f1397c172 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 6 Aug 2009 13:46:00 +0000 Subject: [PATCH] also update DNS better git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7366 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c | 2 +- data/qcsrc/menu/nexuiz/serverlist.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c index 59c0011a4..3eafd4835 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c @@ -58,7 +58,7 @@ void fillNexuizServerListTab(entity me) 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; diff --git a/data/qcsrc/menu/nexuiz/serverlist.c b/data/qcsrc/menu/nexuiz/serverlist.c index 149b29e4a..1d9721773 100644 --- a/data/qcsrc/menu/nexuiz/serverlist.c +++ b/data/qcsrc/menu/nexuiz/serverlist.c @@ -169,6 +169,7 @@ void setSelectedNexuizServerList(entity me, float i) 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 @@ void drawNexuizServerList(entity me) 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 @@ void ServerList_Filter_Change(entity box, entity me) me.ipAddressBox.setText(me.ipAddressBox, ""); me.ipAddressBox.cursorPos = 0; + me.ipAddressBoxFocused = -1; } void ServerList_ShowEmpty_Click(entity box, entity me) { @@ -396,6 +402,7 @@ void ServerList_ShowEmpty_Click(entity box, entity me) me.ipAddressBox.setText(me.ipAddressBox, ""); me.ipAddressBox.cursorPos = 0; + me.ipAddressBoxFocused = -1; } void ServerList_ShowFull_Click(entity box, entity me) { @@ -404,6 +411,7 @@ void ServerList_ShowFull_Click(entity box, entity me) me.ipAddressBox.setText(me.ipAddressBox, ""); me.ipAddressBox.cursorPos = 0; + me.ipAddressBoxFocused = -1; } void setSortOrderNexuizServerList(entity me, float field, float direction) { -- 2.39.2