From 6845d681f23d64662d659d3c05257e135ed85e3d Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 27 Feb 2022 11:59:55 +0000
Subject: [PATCH] Update hardcoded layers (hotfix for
 https://gitlab.com/OpenMW/openmw/-/merge_requests/1681)

---
 apps/openmw/mwgui/layout.cpp                              | 2 +-
 apps/openmw/mwgui/mainmenu.cpp                            | 6 +++---
 files/mygui/openmw_interactive_messagebox_notransp.layout | 2 +-
 files/mygui/openmw_layers.xml                             | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/layout.cpp b/apps/openmw/mwgui/layout.cpp
index 06577f780c..9ac39f9a00 100644
--- a/apps/openmw/mwgui/layout.cpp
+++ b/apps/openmw/mwgui/layout.cpp
@@ -26,7 +26,7 @@ namespace MWGui
                 if (widget->getName() == main_name)
                     mMainWidget = widget;
 
-                // Force the alignment to update immedeatly
+                // Force the alignment to update immediately
                 widget->_setAlign(widget->getSize(), widget->getParentSize());
             }
             MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 4e695710ff..8fff838add 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -167,11 +167,11 @@ namespace MWGui
             {
                 // Use black background to correct aspect ratio
                 mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Default, "Menu");
+                    MyGUI::Align::Default, "MainMenuBackground");
                 mVideoBackground->setImageTexture("black");
 
                 mVideo = mVideoBackground->createWidget<VideoWidget>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Stretch, "Menu");
+                    MyGUI::Align::Stretch, "MainMenuBackground");
                 mVideo->setVFS(mVFS);
 
                 mVideo->playVideo("video\\menu_background.bik");
@@ -191,7 +191,7 @@ namespace MWGui
             if (!mBackground)
             {
                 mBackground = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1,
-                    MyGUI::Align::Stretch, "Menu");
+                    MyGUI::Align::Stretch, "MainMenuBackground");
                 mBackground->setBackgroundImage("textures\\menu_morrowind.dds", true, stretch);
             }
             mBackground->setVisible(true);
diff --git a/files/mygui/openmw_interactive_messagebox_notransp.layout b/files/mygui/openmw_interactive_messagebox_notransp.layout
index f5a462977b..3a31ee2501 100644
--- a/files/mygui/openmw_interactive_messagebox_notransp.layout
+++ b/files/mygui/openmw_interactive_messagebox_notransp.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="MessageBox" position="0 0 500 400" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 500 400" align="Center" name="_Main">
         <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="Left Top Stretch" name="message">
             <Property key="FontName" value="Default"/>
             <Property key="TextAlign" value="Center"/>
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 9c99526ec8..3e267075ef 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -13,6 +13,7 @@
     <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
+    <Layer name="MainMenuBackground" overlapped="true" pick="true"/>
     <Layer name="MainMenu" overlapped="true" pick="true"/>
     <Layer name="Console" overlapped="true" pick="true"/>
     <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>