mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 21:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_messagebox_layer' into 'master'

Browse Source 
Update hardcoded layers (hotfix for https://gitlab.com/OpenMW/openmw/-/merge_requests/1681)

See merge request OpenMW/openmw!1701
This commit is contained in:
Petr Mikheev 2022-02-27 11:59:55 +00:00
commit c2da4a5d49
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwgui/layout.cpp
View File

@ -26,7 +26,7 @@ namespace MWGui
if (widget->getName() == main_name) if (widget->getName() == main_name)
mMainWidget = widget; mMainWidget = widget;
// Force the alignment to update immedeatly // Force the alignment to update immediately
widget->_setAlign(widget->getSize(), widget->getParentSize()); widget->_setAlign(widget->getSize(), widget->getParentSize());
} }
MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found."); MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");

6
apps/openmw/mwgui/mainmenu.cpp
View File

@ -167,11 +167,11 @@ namespace MWGui
{ {
// Use black background to correct aspect ratio // Use black background to correct aspect ratio
mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1, mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1,
MyGUI::Align::Default, "Menu"); MyGUI::Align::Default, "MainMenuBackground");
mVideoBackground->setImageTexture("black"); mVideoBackground->setImageTexture("black");
mVideo = mVideoBackground->createWidget<VideoWidget>("ImageBox", 0,0,1,1, mVideo = mVideoBackground->createWidget<VideoWidget>("ImageBox", 0,0,1,1,
MyGUI::Align::Stretch, "Menu"); MyGUI::Align::Stretch, "MainMenuBackground");
mVideo->setVFS(mVFS); mVideo->setVFS(mVFS);
mVideo->playVideo("video\\menu_background.bik"); mVideo->playVideo("video\\menu_background.bik");
@ -191,7 +191,7 @@ namespace MWGui
if (!mBackground) if (!mBackground)
{ {
mBackground = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1, 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->setBackgroundImage("textures\\menu_morrowind.dds", true, stretch);
} }
mBackground->setVisible(true); mBackground->setVisible(true);

2
files/mygui/openmw_interactive_messagebox_notransp.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <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"> <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="Left Top Stretch" name="message">
<Property key="FontName" value="Default"/> <Property key="FontName" value="Default"/>
<Property key="TextAlign" value="Center"/> <Property key="TextAlign" value="Center"/>

1
files/mygui/openmw_layers.xml
View File

@ -13,6 +13,7 @@
<Layer name="Notification" overlapped="false" pick="false"/> <Layer name="Notification" overlapped="false" pick="false"/>
<Layer name="DragAndDrop" overlapped="false" pick="false"/> <Layer name="DragAndDrop" overlapped="false" pick="false"/>
<Layer name="DrowningBar" 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="MainMenu" overlapped="true" pick="true"/>
<Layer name="Console" overlapped="true" pick="true"/> <Layer name="Console" overlapped="true" pick="true"/>
<Layer name="LoadingScreenBackground" overlapped="false" pick="true"/> <Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>