From db5770b44c077bad1b35b85e1782a92e11f855e5 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 4 Mar 2022 17:31:52 +0100
Subject: [PATCH 1/2] Fix bugs introduced by layer refactor

---
 files/mygui/openmw_chargen_select_specialization.layout | 2 +-
 files/mygui/openmw_layers.xml                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/mygui/openmw_chargen_select_specialization.layout
index 47dc32f629..9c5b54557b 100644
--- a/files/mygui/openmw_chargen_select_specialization.layout
+++ b/files/mygui/openmw_chargen_select_specialization.layout
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
     <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
-    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 144" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 247 144" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="14 14 216 116" align="Stretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_layers.xml b/files/mygui/openmw_layers.xml
index 3e267075ef..4c93574edd 100644
--- a/files/mygui/openmw_layers.xml
+++ b/files/mygui/openmw_layers.xml
@@ -9,7 +9,6 @@
     </Layer>
     <Layer name="Windows" overlapped="true" pick="true"/>
     <Layer name="Debug" overlapped="true" pick="true"/>
-    <Layer name="Tooltip" overlapped="true" pick="true"/>
     <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="DragAndDrop" overlapped="false" pick="false"/>
     <Layer name="DrowningBar" overlapped="false" pick="false"/>
@@ -19,6 +18,7 @@
     <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>
     <Layer name="LoadingScreen" overlapped="false" pick="true"/>
     <Layer name="Modal" overlapped="true" pick="true"/>
+    <Layer name="Tooltip" overlapped="true" pick="true"/>
     <Layer name="Video" overlapped="false" pick="true"/>
     <Layer name="InputBlocker" overlapped="false" pick="true"/>
     <Layer name="Pointer" overlapped="false" pick="false"/>

From 3bcbd4c17090fb67d38dac4ce6ae1df20c5dcbfe Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Fri, 4 Mar 2022 21:58:39 +0100
Subject: [PATCH 2/2] Fix quickkeys assign UI layer

---
 files/mygui/openmw_quickkeys_menu_assign.layout | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/mygui/openmw_quickkeys_menu_assign.layout b/files/mygui/openmw_quickkeys_menu_assign.layout
index 2c80fefcd8..649294e9d3 100644
--- a/files/mygui/openmw_quickkeys_menu_assign.layout
+++ b/files/mygui/openmw_quickkeys_menu_assign.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 16 154" layer="Windows" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 16 154" layer="Modal" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 0 18" name="Label">
             <Property key="Caption" value="#{sQuickMenu1}"/>