UI improvements; updated arrow controls; fixes

Author: F1F7Y

mod.json

@@ -1,6 +1,6 @@
 {
 	"Name" : "Better.Serverbrowser",
-	"Description" : "Improves the northstar serverbrowser\n\nContributors:\n  - Fifty#8113\n  - Meelo#6036\n\nReport issues at: https://github.com/F1F7Y/Better.Serverbrowser/issues\nor on discord: Fifty#8113",
+	"Description" : "Improves the northstar serverbrowser\n\nContributors:\n  - Fifty#8113\n  - Meelo#6036\n  - Kami-Kaze#0001\n\nReport issues at: https://github.com/F1F7Y/Better.Serverbrowser/issues\nor on discord: Fifty#8113",
 	"Version": "1.2.2",
 	"LoadPriority": 1,
 	"ConVars": [

mod/resource/ui/menus/server_browser.menu

@@ -319,9 +319,13 @@ resource/ui/menus/mods_browse.menu
 			xpos -4
 			ypos -1
 
+			scriptID		999
+
 			pin_to_sibling				BtnServerPasswordProtectedTab
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		TOP_RIGHT
+			navDown						BtnServer1
+			navRight 					BtnServerPlayersTab
 		}
 
 		BtnServerName0
@@ -560,9 +564,14 @@ resource/ui/menus/mods_browse.menu
 			wide 104
 			xpos 4
 
+			scriptID		999
+
 			pin_to_sibling				BtnServerNameTab
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		TOP_RIGHT
+			navDown						BtnServer1
+			navLeft 		BtnServerNameTab
+			navRight 		BtnServerMapTab
 		}
 
 		BtnServerPlayers1
@@ -786,9 +795,14 @@ resource/ui/menus/mods_browse.menu
 			wide 										140
 			xpos 										4
 
+			scriptID		999
+
 			pin_to_sibling					BtnServerPlayersTab
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		TOP_RIGHT
+			navDown						BtnServer1
+			navLeft BtnServerPlayersTab
+			navRight BtnServerGamemodeTab
 		}
 
 		BtnServerMap1
@@ -1011,9 +1025,14 @@ resource/ui/menus/mods_browse.menu
 			wide 										150
 			xpos 										4
 
+			scriptID		999
+
 			pin_to_sibling					BtnServerMapTab
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		TOP_RIGHT
+			navDown						BtnServer1
+			navLeft BtnServerMapTab
+			navRight BtnServerLatencyTab
 		}
 
 		BtnServerGamemode1
@@ -1236,9 +1255,14 @@ resource/ui/menus/mods_browse.menu
 			wide 										110
 			xpos 										4
 
+			scriptID		999
+
 			pin_to_sibling					BtnServerGamemodeTab
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		TOP_RIGHT
+			navDown						BtnServer1
+			navLeft BtnServerGamemodeTab
+			navLeft BtnServerJoin
 		}
 
 		BtnServerLatency1
@@ -1573,6 +1597,7 @@ resource/ui/menus/mods_browse.menu
 			pin_to_sibling				ButtonRowAnchor
 			pin_corner_to_sibling		TOP_LEFT
 			pin_to_sibling_corner		TOP_LEFT
+			navUp						BtnServerNameTab
 			navRight 				BtnServerJoin
 		}
 		BtnServer2
@@ -2170,7 +2195,7 @@ resource/ui/menus/mods_browse.menu
 			tall					288
 			wide 					500
 			rui 					"ui/control_options_description.rpak"
-			wrap					1
+			visible 0
 			zpos					1
 
 			pin_to_sibling				ServerDetailsPanel
@@ -2295,6 +2320,8 @@ resource/ui/menus/mods_browse.menu
 			ypos -57
 			zpos 999
 
+			scriptID		999
+
 			pin_to_sibling			ServerDetailsPanel
 			pin_corner_to_sibling	TOP_RIGHT
 			pin_to_sibling_corner	BOTTOM_RIGHT

mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut

@@ -133,32 +133,6 @@ void function SliderBarUpdate()
 }
 
 
-// string.find() works like 10% of the time
-// https://www.csestack.org/implement-strstr-function-in-c/
-bool function strstr(string str, string strSub)
-{
-    int i = 0
-		int j = 0
-    int nTemp = i
-    int nStrLen = str.len()
-    int nStrSubLen = strSub.len()
-    for(i = 0; i < nStrLen - nStrSubLen; i++)
-    {
-        nTemp = i
-        for(j = 0; j < nStrSubLen; j++)
-        {
-
-            if ( str [ nTemp ] == strSub[ j ] )
-            {
-                if ( j == nStrSubLen - 1 ) return true
-                nTemp++
-            }
-            else
-                break
-        }
-    }
-    return false
-}
 
 bool function floatCompareInRange(float arg1, float arg2, float tolerance)
 {
@@ -213,7 +187,7 @@ void function InitServerBrowserMenu()
 	//UpdateServerInfoBasedOnRes()
 
 
-	filterArguments.filterMaps = GetPrivateMatchMaps()
+	filterArguments.filterMaps.extend(GetPrivateMatchMaps())
 	filterArguments.filterMaps.insert(0, "SWITCH_ANY")
 	filterArguments.filterMaps.append("mp_lobby")
 
@@ -328,27 +302,34 @@ void function OnCloseServerBrowserMenu()
 
 void function OnKeyUpArrowSelected( var button )
 {
+	DisplayFocusedServerInfo(file.serverButtonFocusedID)
+
 	if ( file.serverButtonFocusedID != 0) return
 	file.scrollOffset -= 1
 	if (file.scrollOffset < 0) file.scrollOffset = 0
+
+		//printt("Up arrow ", scriptID)
+
 	UpdateShownPage()
 	UpdateListSliderPosition( serversArrayFiltered.len() )
 }
 
 void function OnKeyDownArrowSelected( var button )
 {
+	DisplayFocusedServerInfo(file.serverButtonFocusedID)
+
 	if ( file.serverButtonFocusedID != 14) return
-	if (serversArrayFiltered.len() <= 15) return
 	file.scrollOffset += 1
 	if (file.scrollOffset + BUTTONS_PER_PAGE > serversArrayFiltered.len()) file.scrollOffset = serversArrayFiltered.len() - BUTTONS_PER_PAGE
+		//printt("Down arrow ", scriptID)
+
 	UpdateShownPage()
 	UpdateListSliderPosition( serversArrayFiltered.len() )
 }
 
 
 void function OnDownArrowSelected( var button )
 {
-	if (serversArrayFiltered.len() <= 15) return
 	file.scrollOffset += 1
 	if (file.scrollOffset + BUTTONS_PER_PAGE > serversArrayFiltered.len()) file.scrollOffset = serversArrayFiltered.len() - BUTTONS_PER_PAGE
 	UpdateShownPage()
@@ -648,6 +629,8 @@ void function FilterAndUpdateList( var n )
 		default:
 			printt( "How the f did you get here" )
 	}
+
+	Hud_SetFocused( Hud_GetChild( file.menu, "BtnServer1" ) )
 }
 
 
@@ -679,6 +662,7 @@ void function WaitForServerListRequest()
 	Hud_SetVisible( Hud_GetChild( menu, "LabelDescription" ), false )
 	Hud_SetVisible( Hud_GetChild( menu, "LabelMods" ), false )
 	Hud_SetVisible( Hud_GetChild( menu, "NextMapImage" ), false )
+	Hud_SetVisible( Hud_GetChild( menu, "NextMapBack" ), false )
 	Hud_SetVisible( Hud_GetChild( menu, "NextMapName" ), false )
 	Hud_SetVisible( Hud_GetChild( menu, "NextModeIcon" ), false )
 	Hud_SetVisible( Hud_GetChild( menu, "NextGameModeName" ), false )
@@ -732,7 +716,7 @@ void function FilterServerList()
 				string sName = tempServer.serverName.tolower()
 				string sTerm = filterArguments.searchTerm.tolower()
 
-				if ( strstr(sName, sTerm) )
+				if ( sName.find(sTerm) != null)
 				{
 					if (filterArguments.filterMap != "SWITCH_ANY" && filterArguments.filterMap == tempServer.serverMap)
 					{
@@ -832,10 +816,7 @@ void function OnServerButtonFocused( var button )
 
 void function OnServerFocused( var button )
 {
-	if ( NSIsRequestingServerList() || NSGetServerCount() == 0 || file.serverListRequestFailed )
-		return
-
-	var menu = GetMenu( "ServerBrowserMenu" )
+	DisplayFocusedServerInfo(int ( Hud_GetScriptID( button ) ))
 
 	file.focusedServerIndex = serversArrayFiltered[ file.scrollOffset + int ( Hud_GetScriptID( button ) ) ].serverIndex
 	int serverIndex = file.scrollOffset + int ( Hud_GetScriptID( button ) )
@@ -849,8 +830,25 @@ void function OnServerFocused( var button )
 	file.serverSelectedTimeLast = file.serverSelectedTime
 	file.serverSelectedTime = Time()
 
-	if ((file.serverSelectedTime - file.serverSelectedTimeLast < DOUBLE_CLICK_TIME_MS) && sameServer)
+	if ((file.serverSelectedTime - file.serverSelectedTimeLast < DOUBLE_CLICK_TIME_MS) && sameServer && ( serverIndex >= 0 && serverIndex <= 14 ) )
 		OnServerSelected(0)
+}
+
+void function DisplayFocusedServerInfo( int scriptID )
+{
+	printt( scriptID )
+	if ( scriptID == 999 ) return
+
+
+	if ( NSIsRequestingServerList() || NSGetServerCount() == 0 || file.serverListRequestFailed )
+		return
+
+	var menu = GetMenu( "ServerBrowserMenu" )
+
+	file.focusedServerIndex = serversArrayFiltered[ file.scrollOffset + scriptID ].serverIndex
+	int serverIndex = file.scrollOffset + scriptID
+
+
 
 
 	Hud_SetVisible( Hud_GetChild( menu, "BtnServerDescription" ), true )
@@ -866,6 +864,7 @@ void function OnServerFocused( var button )
 	// map name/image/server name
 	string map = serversArrayFiltered[ serverIndex ].serverMap
 	Hud_SetVisible( Hud_GetChild( menu, "NextMapImage" ), true )
+	Hud_SetVisible( Hud_GetChild( menu, "NextMapBack" ), true )
 	RuiSetImage( Hud_GetRui( Hud_GetChild( menu, "NextMapImage" ) ), "basicImage", GetMapImageForMapName( map ) )
 	Hud_SetVisible( Hud_GetChild( menu, "NextMapName" ), true )
 	Hud_SetText( Hud_GetChild( menu, "NextMapName" ), GetMapDisplayName( map ) )
@@ -884,7 +883,6 @@ void function OnServerFocused( var button )
 		Hud_SetText( Hud_GetChild( menu, "NextGameModeName" ), "#NS_SERVERBROWSER_UNKNOWNMODE" )
 }
 
-
 string function FillInServerModsLabel( int server )
 {
 	string ret