From 974134d142e54f650cfa3c8e46e0d58542a39fb1 Mon Sep 17 00:00:00 2001
From: F1F7Y <64418963+F1F7Y@users.noreply.github.com>
Date: Sun, 9 Jan 2022 15:45:58 +0100
Subject: Improve server browser backend; fix error (#58)

Improves sort backend
Fixes crash when TAB is pressed while console is open
Improves MouseDelta handler logic
Increases doubleclick from 0.2 to 0.3
Fixes issue
Pasting does not work for server passwords #91
Fix issue #91
---
 .../mod/resource/ui/menus/connect_password.menu    | 36 +++++++++++++++++++---
 .../mod/resource/ui/menus/server_browser.menu      | 11 +++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

(limited to 'Northstar.Client/mod/resource/ui/menus')

diff --git a/Northstar.Client/mod/resource/ui/menus/connect_password.menu b/Northstar.Client/mod/resource/ui/menus/connect_password.menu
index b5e12ad25..d24214770 100644
--- a/Northstar.Client/mod/resource/ui/menus/connect_password.menu
+++ b/Northstar.Client/mod/resource/ui/menus/connect_password.menu
@@ -34,7 +34,7 @@ resource/ui/menus/mods_browse.menu
 			ControlName				ImagePanel
 			InheritProperties		MenuTopBar
 		}
-		
+
 		ButtonRowAnchor
 		{
 			ControlName				Label
@@ -43,7 +43,7 @@ resource/ui/menus/mods_browse.menu
 			xpos                    120
             ypos                    160
 		}
-		
+
 		MatchmakingStatus
 		{
 			ControlName				CNestedPanel
@@ -62,6 +62,34 @@ resource/ui/menus/mods_browse.menu
 			ControlName				TextEntry
 			wide					700
 			tall					53
+			zpos 1
+			visible					1
+			enabled					1
+			textHidden				0
+			editable				1
+			maxchars				32
+			NumericInputOnly		0
+			textAlignment			"east"
+			font 					DefaultBold_53
+			keyboardTitle			"#CONNECT_WITH_PASSWORD"
+			keyboardDescription		"#ENTER_PASSWORD"
+			allowRightClickMenu		1
+			allowSpecialCharacters	0
+			unicode					0
+			paintborder		        0
+			alpha							0
+
+			pin_to_sibling			ButtonRowAnchor
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+		}
+
+		EnterPasswordBoxDummy
+		{
+			ControlName				TextEntry
+			wide					700
+			tall					53
+			zpos 0
 			visible					1
 			enabled					1
 			textHidden				1
@@ -76,12 +104,12 @@ resource/ui/menus/mods_browse.menu
 			allowSpecialCharacters	0
 			unicode					0
 			paintborder		        0
-			
+
 			pin_to_sibling			ButtonRowAnchor
 			pin_corner_to_sibling	TOP_LEFT
 			pin_to_sibling_corner	BOTTOM_LEFT
 		}
-		
+
 		ConnectButton
 		{
 			ControlName				RuiButton
diff --git a/Northstar.Client/mod/resource/ui/menus/server_browser.menu b/Northstar.Client/mod/resource/ui/menus/server_browser.menu
index 959c1b099..94b57451f 100644
--- a/Northstar.Client/mod/resource/ui/menus/server_browser.menu
+++ b/Northstar.Client/mod/resource/ui/menus/server_browser.menu
@@ -2142,6 +2142,7 @@ resource/ui/menus/mods_browse.menu
 		wide 1200
 		tall 153
 		xpos	-8
+		classname 			FilterPanelChild
 
 		rui 					"ui/control_options_description.rpak"
 
@@ -2159,6 +2160,8 @@ resource/ui/menus/mods_browse.menu
 		InheritProperties		RuiSmallButton
 		labelText			"#SEARCHBAR_LABEL"
 		textAlignment west
+		classname 			FilterPanelChild
+
 		wide					500
 		xpos -23
 		ypos -16
@@ -2178,6 +2181,7 @@ resource/ui/menus/mods_browse.menu
 	BtnServerSearch
 	{
 		ControlName				TextEntry
+		classname 			FilterPanelChild
 		zpos					100 // This works around input weirdness when the control is constructed by code instead of VGUI blackbox.
 		xpos 					-400
 		ypos 					-5
@@ -2204,6 +2208,7 @@ resource/ui/menus/mods_browse.menu
 		InheritProperties		SwitchButton
 		labelText						"#MAP_FILTER"
 		ConVar							"filter_map"
+		classname 			FilterPanelChild
 		wide    						500
 
 		pin_to_sibling BtnSearchLabel
@@ -2220,6 +2225,7 @@ resource/ui/menus/mods_browse.menu
 		InheritProperties		SwitchButton
 		labelText						"#GAMEMODE_FILTER"
 		ConVar							"filter_gamemode"
+		classname 			FilterPanelChild
 		wide    						500
 
 		pin_to_sibling SwtBtnSelectMap
@@ -2236,6 +2242,7 @@ resource/ui/menus/mods_browse.menu
 		InheritProperties		SwitchButton
 		labelText						"#HIDE_FULL_FILTER"
 		ConVar							"filter_hide_full"
+		classname 			FilterPanelChild
 		wide    						500
 
 
@@ -2259,6 +2266,7 @@ resource/ui/menus/mods_browse.menu
 		InheritProperties		SwitchButton
 		labelText						"#HIDE_EMPTY_FILTER"
 		ConVar							"filter_hide_empty"
+		classname 			FilterPanelChild
 		wide    						500
 
 
@@ -2282,6 +2290,7 @@ resource/ui/menus/mods_browse.menu
 		InheritProperties		SwitchButton
 		labelText						"#HIDE_PROT_FILTER"
 		ConVar							"filter_hide_protected"
+		classname 			FilterPanelChild
 		wide    						500
 
 		list
@@ -2303,6 +2312,7 @@ resource/ui/menus/mods_browse.menu
 		ControlName							RuiButton
 		InheritProperties				RuiSmallButton
 		labelText				"#CLEAR_FILTERS"
+		classname 			FilterPanelChild
 		wide 100
 		xpos		-17
 		ypos 		-57
@@ -2322,6 +2332,7 @@ resource/ui/menus/mods_browse.menu
 
 	BtnDummyAfterFilterClear {
 		ControlName	RuiButton
+		classname 			FilterPanelChild
 		width		0
 		height		0
 		visible 	1
-- 
cgit v1.2.3