1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-17 20:42:29 +00:00

Merge branch 'fix_layer_bugs' into 'master'

Fix bugs introduced by layer refactor

Closes #6659

See merge request OpenMW/openmw!1709
This commit is contained in:
psi29a 2022-03-04 22:08:41 +00:00
commit 9396cc7592
3 changed files with 3 additions and 3 deletions

View File

@ -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 -->

View File

@ -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"/>

View File

@ -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}"/>