Merge branch 'fix_ui_popups' into 'master'

Rename Tooltip layer back to Popup, layer Notification layer on top of it

Closes #6663 and #6662

See merge request OpenMW/openmw!1713

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="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"/>
@@ -18,7 +17,8 @@
     <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="Popup" overlapped="true" pick="true"/>
+    <Layer name="Notification" overlapped="false" pick="false"/>
     <Layer name="Video" overlapped="false" pick="true"/>
     <Layer name="InputBlocker" overlapped="false" pick="true"/>
     <Layer name="Pointer" overlapped="false" pick="false"/>

files/mygui/openmw_tooltips.layout

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Widget" layer="Tooltip" position="0 0 300 300" name="_Main">
+    <Widget type="Widget" layer="Popup" position="0 0 300 300" name="_Main">
 
         <!-- Dynamically constructed tooltip goes here -->
         <Widget type="Widget" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="DynamicToolTipBox">