Merge pull request #173 from raysfire/dev

v2021.0705

1 files changed, 17 insertions, 92 deletions

diff --git a/resource/ui/mainmenuplaylistentry.res b/resource/ui/mainmenuplaylistentry.res
index 2a5ade7..949bb93 100644
--- a/resource/ui/mainmenuplaylistentry.res
+++ b/resource/ui/mainmenuplaylistentry.res
@@ -7,8 +7,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"0"
-		"wide"			"270"
-		"tall"			"70"
+		"wide"			"o4"
+		"tall"			"p1.17"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
@@ -38,14 +38,13 @@
 		"fieldName"		"BGColor"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"-1"
+		"zpos"			"1"
 		"wide"			"f0"
 		"tall"			"f0"
 		"visible"		"1"
 		"enabled"		"1"
-
 		"proportionaltoparent"	"1"
-		"bgcolor_override"	"DarkGrey"
+		"bgcolor_override"	"TransparentBlack"
 	}
 
 	"ToolTipHack"
@@ -57,7 +56,7 @@
 		"zpos"			"490"
 		"wide"			"f0"
 		"tall"			"f0"
-		"visible"		"0"
+		"visible"		"1"
 		"enabled"		"1"
 		"mouseinputenabled"	"1"
 		"eatmouseinput"	"0"
@@ -70,16 +69,15 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"5"
-		"wide"			"250"
-		"tall"			"40"
+		"tall"			"50"
+		"wide"			"140"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%button_token%"
-		"textinsetx"	"4"
-		"textinsety"	"16"
 		"use_proportional_insets" "1"
-		"font"			"Cerbetica24"
-		"textAlignment"	"east"
+		"font"			"HudFontMediumSmall"
+		"textAlignment"	"north"
+		"textinsety"	"5"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
@@ -88,15 +86,15 @@
 		"actionsignallevel"	"2"
 
 		"border_default"	"NoBorder"
-		"border_armed"		"NoBorder"
+		"border_armed"		"CyanBorderThick"
 		"paintbackground"	"0"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"117 107 94 255"
-		"depressedFgColor_override" "235 226 202 255"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"TanLight"
+		"depressedFgColor_override" "TanLight"
 	}
 
 	"MatchmakingBanPanel"
@@ -140,93 +138,20 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"DescLabel"
-		"font"			"MMenuPlayListDesc"
-		"labelText"		"%desc_token%"
-		"textAlignment"	"center"
-		"xpos"			"0"
-		"ypos"			"35"
-		"zpos"			"2"
-		"wide"			"270"
-		"tall"			"35"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"1"
-		"fgcolor_override" "TanLight"
-		"proportionaltoparent" "1"
-		"mouseinputenabled"	"0"
+		"xpos"			"9999"
 	}
 
 	"DescLabelShadow"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"DescLabelShadow"
-		"font"			"MMenuPlayListDesc"
-		"labelText"		"%desc_token%"
-		"textAlignment"	"center"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"1"
-		"wide"			"270"
-		"tall"			"35"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"1"
-		"fgcolor_override" "TransparentBlack"
-		"proportionaltoparent" "1"
-		"mouseinputenabled"	"0"
-
-		"pin_to_sibling"		"DescLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"xpos"			"9999"
 	}
 
 	"DisabledIcon"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"DisabledIcon"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"				"50"
-		"wide"				"f0"
-		"tall"				"f0"
-		"visible"			"1"
-		"enabled"			"1"
-		"actionsignallevel"	"1"
-		"command"			"comp_access_info"
-		"labeltext"			""
-		"eatmouseinput"	"0"
-		"button_activation_type"	"1"
-
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"defaultFgColor_override" "TanDarker"
-		"armedFgColor_override" "TanLight"
-		"depressedFgColor_override" "TanDarker"
-		"defaultBgColor_override" "Transparent"
-		"armedBgColor_override" "Transparent"
-		"depressedBgColor_override" "Transparent"
-
-		"image_drawcolor"	"TextColor"
-		"image_armedcolor"	"TanLight"
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"110"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"15"
-			"tall"			"15"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"locked_icon"
-			"scaleImage"	"1"
-			"proportionaltoparent" "1"
-		}
+		"xpos"			"9999"
 	}
 }
\ No newline at end of file