From 39057d7b877c070cb3ff706c408657bcadce5a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20M=C3=BCller?= <robytemueller@gmail.com>
Date: Thu, 5 Oct 2023 11:58:46 +0200
Subject: [PATCH] Fix demo render complete popup opening on error, improve
 layout

The popup to show the completed demo rendering was also shown when the demo to be rendered could not be loaded or if the demo render popup was cancelled. Now the popup is only shown when the demo rendering was successful.

The layout of the popup is made consistent with other message popups. Long text is wrapped over multiple lines instead of decreasing the font size.
---
 src/game/client/components/menus.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index 4d379e5b0..dc9230ef1 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -1584,7 +1584,10 @@ int CMenus::Render()
 
 			static CButtonContainer s_ButtonAbort;
 			if(DoButton_Menu(&s_ButtonAbort, Localize("Abort"), 0, &Abort) || UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
+			{
+				m_DemoRenderInput.Clear();
 				m_Popup = POPUP_NONE;
+			}
 
 			static CButtonContainer s_ButtonOk;
 			if(DoButton_Menu(&s_ButtonOk, Localize("Ok"), 0, &Ok) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER))
@@ -1681,7 +1684,7 @@ int CMenus::Render()
 		}
 		else if(m_Popup == POPUP_RENDER_DONE)
 		{
-			CUIRect TextBox, Ok, OpenFolder;
+			CUIRect Ok, OpenFolder;
 
 			char aFilePath[IO_MAX_PATH_LENGTH];
 			char aSaveFolder[IO_MAX_PATH_LENGTH];
@@ -1702,7 +1705,7 @@ int CMenus::Render()
 			{
 				if(!open_file(aSaveFolder))
 				{
-					dbg_msg("menus", "couldn't open file '%s'", aBuf);
+					dbg_msg("menus", "couldn't open file '%s'", aSaveFolder);
 				}
 			}
 
@@ -1714,14 +1717,13 @@ int CMenus::Render()
 			}
 
 			Box.HSplitBottom(160.f, &Box, &Part);
-
-			Part.VSplitLeft(60.0f, nullptr, &TextBox);
-			TextBox.VSplitLeft(20.0f, nullptr, &TextBox);
-			TextBox.VSplitRight(60.0f, &TextBox, nullptr);
+			Part.VMargin(20.0f, &Part);
 
 			str_format(aBuf, sizeof(aBuf), Localize("Video was saved to '%s'"), aFilePath);
 
-			UI()->DoLabel(&TextBox, aBuf, 18.0f, TEXTALIGN_TL);
+			SLabelProperties MessageProps;
+			MessageProps.m_MaxWidth = (int)Part.w;
+			UI()->DoLabel(&Part, aBuf, 18.0f, TEXTALIGN_TL, MessageProps);
 		}
 #endif
 		else if(m_Popup == POPUP_FIRST_LAUNCH)
@@ -1853,7 +1855,10 @@ void CMenus::PopupConfirmDemoReplaceVideo()
 	m_LastPauseChange = -1.0f;
 	m_LastSpeedChange = -1.0f;
 	if(pError)
+	{
+		m_DemoRenderInput.Clear();
 		PopupMessage(Localize("Error"), str_comp(pError, "error loading demo") ? pError : Localize("Error loading demo"), Localize("Ok"));
+	}
 }
 #endif