From f93c2fed5bc1fe506cada968cbe205372b939810 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Tue, 27 Jul 2021 23:33:09 -0400
Subject: Fixed notification alert not displaying in classic main menu

---
 #customizations/mainmenuoverride-classic.res |  12 ---
 resource/ui/mainmenuoverride-base.res        | 136 ---------------------------
 resource/ui/mainmenuoverride.res             | 136 +++++++++++++++++++++++++++
 3 files changed, 136 insertions(+), 148 deletions(-)

diff --git a/#customizations/mainmenuoverride-classic.res b/#customizations/mainmenuoverride-classic.res
index 205869a..3fdb802 100644
--- a/#customizations/mainmenuoverride-classic.res
+++ b/#customizations/mainmenuoverride-classic.res
@@ -56,18 +56,6 @@
 		"ypos"			"260"
 	}
 
-	"Notifications_ShowButtonPanel"
-	{
-		"xpos"				"r28"
-		"ypos"				"40"
-	}
-
-	"Notifications_Panel"
-	{
-		"xpos"			"r240"
-		"ypos"			"60"
-	}
-
 	"FriendsContainer"
 	{
 		"xpos"			"80"
diff --git a/resource/ui/mainmenuoverride-base.res b/resource/ui/mainmenuoverride-base.res
index 4e91659..2e79abf 100644
--- a/resource/ui/mainmenuoverride-base.res
+++ b/resource/ui/mainmenuoverride-base.res
@@ -411,142 +411,6 @@
 		}
 	}
 
-	"Notifications_ShowButtonPanel"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"Notifications_ShowButtonPanel"
-		"xpos"				"295"
-		"ypos"				"62"
-		"zpos"				"0"
-		"wide"				"20"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"bgcolor_override"	"Transparent"
-
-		"Notifications_ShowButtonPanel_SB"
-		{
-			"ControlName"		"CExImageButton"
-			"fieldName"			"Notifications_ShowButtonPanel_SB"
-			"xpos"				"0"
-			"ypos"				"0"
-			"wide"				"20"
-			"tall"				"20"
-			"autoResize"		"0"
-			"pinCorner"			"3"
-			"visible"			"1"
-			"enabled"			"1"
-			"tabPosition"		"0"
-			"labelText"			"k"
-			"font"				"CustomIcons"
-			"Command"			"noti_show"
-			"use_proportional_insets" "1"
-			"textAlignment"		"center"
-			"default"			"1"
-			"actionsignallevel"	"2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override"		"ColorCyan"
-		}
-	}
-
-	"Notifications_Panel"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"Notifications_Panel"
-		"xpos"			"c-120"
-		"ypos"			"62"
-		"zpos"			"100"
-		"wide"			"210"
-		"tall"			"80"
-		"visible"		"0"
-		"paintbackground"		"1"
-		"border"				"NoBorder"
-		"bgcolor_override"		"DarkGrey"
-		"PaintBackgroundType"	"2"
-
-		"Notifications_CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"Notifications_CloseButton"
-			"xpos"			"186"
-			"ypos"			"8"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		"("
-			"font"			"CustomIcons"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"actionsignallevel"	"2"
-			"Command"			"noti_hide"
-			"paintbackground"	"0"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override" 	"TanLight"
-			"armedFgColor_override" 	"RedSolid"
-			"depressedFgColor_override" "TanLight"
-		}
-
-		"Notifications_TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"Notifications_TitleLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"%notititle%"
-			"textAlignment"	"north-west"
-			"xpos"			"12"
-			"ypos"			"8"
-			"wide"			"250"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override"	"ColorCyan"
-			"wrap"				"1"
-		}
-
-		"Notifications_Scroller"
-		{
-			"ControlName"	"ScrollableEditablePanel"
-			"fieldName"		"Notifications_Scroller"
-			"xpos"			"8"
-			"ypos"			"25"
-			"wide"			"210"
-			"tall"			"135"
-			"PaintBackgroundType"	"2"
-			"fgcolor_override"	"TextColor"
-
-			"Notifications_Control"
-			{
-				"ControlName"	"CMainMenuNotificationsControl"
-				"fieldName"		"Notifications_Control"
-				"xpos"			"0"
-				"ypos"			"0"
-				"wide"			"220"
-				"tall"			"135"
-				"visible"		"1"
-			}
-		}
-	}
-
 	"CompetitiveAccessInfoPanel"
 	{
 		"ControlName"	"CCompetitiveAccessInfoPanel"
diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
index fdb6afa..5b9765d 100644
--- a/resource/ui/mainmenuoverride.res
+++ b/resource/ui/mainmenuoverride.res
@@ -18,7 +18,143 @@
 		"enabled"			"1"
 		"scaleImage"		"1"
 	}
+	
+	"Notifications_ShowButtonPanel"
+	{
+		"ControlName"		"EditablePanel"
+		"fieldName"			"Notifications_ShowButtonPanel"
+		"xpos"				"rs1-10"
+		"ypos"				"45"
+		"zpos"				"0"
+		"wide"				"20"
+		"tall"				"20"
+		"autoResize"		"0"
+		"pinCorner"			"3"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"bgcolor_override"	"Transparent"
+
+		"Notifications_ShowButtonPanel_SB"
+		{
+			"ControlName"		"CExImageButton"
+			"fieldName"			"Notifications_ShowButtonPanel_SB"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"k"
+			"font"				"CustomIcons"
+			"Command"			"noti_show"
+			"use_proportional_insets" "1"
+			"textAlignment"		"center"
+			"default"			"1"
+			"actionsignallevel"	"2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"ColorCyan"
+		}
+	}
+
+	"Notifications_Panel"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"Notifications_Panel"
+		"xpos"			"r345"
+		"ypos"			"45"
+		"zpos"			"100"
+		"wide"			"210"
+		"tall"			"80"
+		"visible"		"0"
+		"paintbackground"		"1"
+		"border"				"NoBorder"
+		"bgcolor_override"		"DarkGrey"
+		"PaintBackgroundType"	"2"
+
+		"Notifications_CloseButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"Notifications_CloseButton"
+			"xpos"			"186"
+			"ypos"			"8"
+			"zpos"			"10"
+			"wide"			"14"
+			"tall"			"14"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"labeltext"		"("
+			"font"			"CustomIcons"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"0"
+			"actionsignallevel"	"2"
+			"Command"			"noti_hide"
+			"paintbackground"	"0"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"RedSolid"
+			"depressedFgColor_override" "TanLight"
+		}
+
+		"Notifications_TitleLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"Notifications_TitleLabel"
+			"font"			"HudFontSmall"
+			"labelText"		"%notititle%"
+			"textAlignment"	"north-west"
+			"xpos"			"12"
+			"ypos"			"8"
+			"wide"			"250"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor_override"	"ColorCyan"
+			"wrap"				"1"
+		}
+
+		"Notifications_Scroller"
+		{
+			"ControlName"	"ScrollableEditablePanel"
+			"fieldName"		"Notifications_Scroller"
+			"xpos"			"8"
+			"ypos"			"25"
+			"wide"			"210"
+			"tall"			"135"
+			"PaintBackgroundType"	"2"
+			"fgcolor_override"	"TextColor"
+
+			"Notifications_Control"
+			{
+				"ControlName"	"CMainMenuNotificationsControl"
+				"fieldName"		"Notifications_Control"
+				"xpos"			"0"
+				"ypos"			"0"
+				"wide"			"220"
+				"tall"			"135"
+				"visible"		"1"
+			}
+		}
+	}
+	
 	"QuestLogButton"
 	{
 		"ControlName"	"EditablePanel"
-- 
cgit v1.2.3