Fixed double tap

Author: F1F7Y

mod/resource/ui/menus/server_browser.menu

@@ -319,7 +319,7 @@ resource/ui/menus/mods_browse.menu
 			xpos -4
 			ypos -1
 
-			scriptID		999
+			scriptID		1
 
 			pin_to_sibling				BtnServerPasswordProtectedTab
 			pin_corner_to_sibling		TOP_LEFT
@@ -564,7 +564,7 @@ resource/ui/menus/mods_browse.menu
 			wide 104
 			xpos 4
 
-			scriptID		999
+			scriptID		1
 
 			pin_to_sibling				BtnServerNameTab
 			pin_corner_to_sibling		TOP_LEFT
@@ -795,7 +795,7 @@ resource/ui/menus/mods_browse.menu
 			wide 										140
 			xpos 										4
 
-			scriptID		999
+			scriptID		1
 
 			pin_to_sibling					BtnServerPlayersTab
 			pin_corner_to_sibling		TOP_LEFT
@@ -1025,7 +1025,7 @@ resource/ui/menus/mods_browse.menu
 			wide 										150
 			xpos 										4
 
-			scriptID		999
+			scriptID		1
 
 			pin_to_sibling					BtnServerMapTab
 			pin_corner_to_sibling		TOP_LEFT
@@ -1255,7 +1255,7 @@ resource/ui/menus/mods_browse.menu
 			wide 										110
 			xpos 										4
 
-			scriptID		999
+			scriptID		1
 
 			pin_to_sibling					BtnServerGamemodeTab
 			pin_corner_to_sibling		TOP_LEFT
@@ -1597,7 +1597,6 @@ 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
@@ -2319,7 +2318,7 @@ resource/ui/menus/mods_browse.menu
 			ypos -57
 			zpos 999
 
-			scriptID		999
+			scriptID		1
 
 			pin_to_sibling			ServerDetailsPanel
 			pin_corner_to_sibling	TOP_RIGHT

mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut

@@ -21,7 +21,7 @@ global function UpdateMouseDeltaBuffer
 // Follow pointer, let scrollOffset be it's own thing -> will look more fluid; fix the sync issue?
 
 const int BUTTONS_PER_PAGE = 15
-const int DOUBLE_CLICK_TIME_MS = 20 // unsure what the ideal value is
+const float DOUBLE_CLICK_TIME_MS = 0.2 // unsure what the ideal value is
 
 
 struct {
@@ -67,14 +67,15 @@ array<serverStruct> serversArrayFiltered
 
 struct {
 	var menu
-	int lastSelectedServer = 0
+	int lastSelectedServer = 1
 	int focusedServerIndex = 0
 	int scrollOffset = 0
 	bool serverListRequestFailed = false
 	float serverSelectedTime = 0
 	float serverSelectedTimeLast = 0
 	//array<string> serverButtons
 	int serverButtonFocusedID = 0
+	bool shouldFocus = true
 } file
 
 
@@ -127,7 +128,6 @@ void function SliderBarUpdate()
 	Hud_SetPos( sliderPanel , 2, newPos )
 	Hud_SetPos( movementCapture , 2, newPos )
 
-	printt("scrollOffset: ", -int( ( (newPos - minYPos) / useableSpace ) * (serversArrayFiltered.len() - 15) ), "max: ", serversArrayFiltered.len() - 15)
 	file.scrollOffset = -int( ( (newPos - minYPos) / useableSpace ) * (serversArrayFiltered.len() - 15) )
 	UpdateShownPage()
 }
@@ -403,8 +403,6 @@ void function UpdateListSliderPosition( int servers )
 	Hud_SetPos( sliderButton , 2, jump )
 	Hud_SetPos( sliderPanel , 2, jump )
 	Hud_SetPos( movementCapture , 2, jump )
-
-	printt("scrollOffset: ", file.scrollOffset)
 }
 
 
@@ -633,7 +631,11 @@ void function FilterAndUpdateList( var n )
 			printt( "How the f did you get here" )
 	}
 
-	//Hud_SetFocused( Hud_GetChild( file.menu, "BtnServer1" ) )
+	if ( file.shouldFocus )
+	{
+		file.shouldFocus = false
+		Hud_SetFocused( Hud_GetChild( file.menu, "BtnServer1" ) )
+	}
 }
 
 
@@ -820,26 +822,10 @@ void function OnServerButtonFocused( var button )
 void function OnServerFocused( var button )
 {
 	DisplayFocusedServerInfo(int ( Hud_GetScriptID( button ) ))
-
-	file.focusedServerIndex = serversArrayFiltered[ file.scrollOffset + int ( Hud_GetScriptID( button ) ) ].serverIndex
-	int serverIndex = file.scrollOffset + int ( Hud_GetScriptID( button ) )
-
-	bool sameServer = false
-	if (file.lastSelectedServer == serverIndex) sameServer = true
-
-
-	file.lastSelectedServer = serverIndex
-
-	file.serverSelectedTimeLast = file.serverSelectedTime
-	file.serverSelectedTime = Time()
-
-	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
 
 
@@ -851,6 +837,20 @@ void function DisplayFocusedServerInfo( int scriptID )
 	file.focusedServerIndex = serversArrayFiltered[ file.scrollOffset + scriptID ].serverIndex
 	int serverIndex = file.scrollOffset + scriptID
 
+	bool sameServer = false
+	if (file.lastSelectedServer == serverIndex) sameServer = true
+
+
+	file.lastSelectedServer = serverIndex
+
+	file.serverSelectedTimeLast = file.serverSelectedTime
+	file.serverSelectedTime = Time()
+
+	printt(file.serverSelectedTime - file.serverSelectedTimeLast,";", file.lastSelectedServer,";", serverIndex, ";",sameServer)
+
+	if ((file.serverSelectedTime - file.serverSelectedTimeLast < DOUBLE_CLICK_TIME_MS) && sameServer )
+		OnServerSelected(0)
+