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

Refactor UI layers

Browse Source
This commit is contained in:
uramer 2022-02-26 13:54:42 +00:00 committed by Petr Mikheev
parent 55ff9b0c97
commit 21a363d96f
36 changed files with 50 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
#include <MyGUI_TabControl.h>
#include <MyGUI_TabItem.h>
#include <MyGUI_RenderManager.h>
#include <MyGUI_EditBox.h>
#include <LinearMath/btQuickprof.h>
@ -92,11 +91,6 @@ namespace MWGui
MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler");
mBulletProfilerEdit = item->createWidgetReal<MyGUI::EditBox>
("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch);
MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
mMainWidget->setSize(viewSize);
}
void DebugWindow::onFrame(float dt)

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

@ -99,8 +99,6 @@ namespace MWGui
, mIsDrowning(false)
, mDrowningFlashTheta(0.f)
{
mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
// Energy bars
getWidget(mHealthFrame, "HealthFrame");
getWidget(mHealth, "Health");

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

@ -24,10 +24,10 @@ namespace MWGui
for (MyGUI::Widget* widget : mListWindowRoot)
{
if (widget->getName() == main_name)
{
mMainWidget = widget;
break;
}
// Force the alignment to update immedeatly
widget->_setAlign(widget->getSize(), widget->getParentSize());
}
MYGUI_ASSERT(mMainWidget, "root widget name '" << MAIN_WINDOW << "' in layout '" << mLayoutName << "' not found.");
}

21
apps/openmw/mwgui/loadingscreen.cpp
View File

@ -8,7 +8,6 @@
#include <osg/Texture2D>
#include <osg/Version>
#include <MyGUI_RenderManager.h>
#include <MyGUI_ScrollBar.h>
#include <MyGUI_Gui.h>
#include <MyGUI_TextBox.h>
@ -45,19 +44,14 @@ namespace MWGui
, mProgress(0)
, mShowWallpaper(true)
{
mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
getWidget(mLoadingText, "LoadingText");
getWidget(mProgressBar, "ProgressBar");
getWidget(mLoadingBox, "LoadingBox");
getWidget(mSceneImage, "Scene");
getWidget(mSplashImage, "Splash");
mProgressBar->setScrollViewPage(1);
mBackgroundImage = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1,
MyGUI::Align::Stretch, "Menu");
mSceneImage = MyGUI::Gui::getInstance().createWidgetReal<BackgroundImage>("ImageBox", 0,0,1,1,
MyGUI::Align::Stretch, "Scene");
findSplashScreens();
}
@ -100,7 +94,7 @@ namespace MWGui
void LoadingScreen::setVisible(bool visible)
{
WindowBase::setVisible(visible);
mBackgroundImage->setVisible(visible);
mSplashImage->setVisible(visible);
mSceneImage->setVisible(visible);
}
@ -207,7 +201,6 @@ namespace MWGui
mViewer->getSceneData()->setComputeBoundingSphereCallback(nullptr);
mViewer->getSceneData()->dirtyBound();
//std::cout << "loading took " << mTimer.time_m() - mLoadingOnTime << std::endl;
setVisible(false);
if (osgUtil::IncrementalCompileOperation* ico = mViewer->getIncrementalCompileOperation())
@ -229,8 +222,8 @@ namespace MWGui
// TODO: add option (filename pattern?) to use image aspect ratio instead of 4:3
// we can't do this by default, because the Morrowind splash screens are 1024x1024, but should be displayed as 4:3
bool stretch = Settings::Manager::getBool("stretch menu background", "GUI");
mBackgroundImage->setVisible(true);
mBackgroundImage->setBackgroundImage(randomSplash, true, stretch);
mSplashImage->setVisible(true);
mSplashImage->setBackgroundImage(randomSplash, true, stretch);
}
mSceneImage->setBackgroundImage("");
mSceneImage->setVisible(false);
@ -320,8 +313,8 @@ namespace MWGui
#endif
mCopyFramebufferToTextureCallback->reset();
mBackgroundImage->setBackgroundImage("");
mBackgroundImage->setVisible(false);
mSplashImage->setBackgroundImage("");
mSplashImage->setVisible(false);
mSceneImage->setRenderItemTexture(mGuiTexture.get());
mSceneImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));

2
apps/openmw/mwgui/loadingscreen.hpp
View File

@ -79,7 +79,7 @@ namespace MWGui
MyGUI::TextBox* mLoadingText;
MyGUI::ScrollBar* mProgressBar;
BackgroundImage* mBackgroundImage;
BackgroundImage* mSplashImage;
BackgroundImage* mSceneImage;
std::vector<std::string> mSplashScreens;

3
apps/openmw/mwgui/screenfader.cpp
View File

@ -1,6 +1,5 @@
#include "screenfader.hpp"
#include <MyGUI_RenderManager.h>
#include <MyGUI_ImageBox.h>
#include <MyGUI_Gui.h>
@ -91,8 +90,6 @@ namespace MWGui
{
MyGUI::Gui::getInstance().eventFrameStart += MyGUI::newDelegate(this, &ScreenFader::onFrameStart);
mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
MyGUI::ImageBox* imageBox = mMainWidget->castType<MyGUI::ImageBox>(false);
if (imageBox)
{

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

@ -256,7 +256,7 @@ namespace MWGui
MyGUI::PointerManager::getInstance().setVisible(false);
mVideoBackground = MyGUI::Gui::getInstance().createWidgetReal<MyGUI::ImageBox>("ImageBox", 0,0,1,1,
MyGUI::Align::Default, "InputBlocker");
MyGUI::Align::Default, "Video");
mVideoBackground->setImageTexture("black");
mVideoBackground->setVisible(false);
mVideoBackground->setNeedMouseFocus(true);

2
files/mygui/openmw_chargen_birth.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 527 378" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 527 378" align="Center" name="_Main">
<!-- Birthsign list -->
<Widget type="ListBox" skin="MW_List" position="8 8 232 137" name="BirthsignList"/>

2
files/mygui/openmw_chargen_class.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 491 316" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 491 316" align="Center" name="_Main">
<!-- Class list -->
<Widget type="ListBox" skin="MW_List" position="8 8 194 138" name="ClassList"/>

2
files/mygui/openmw_chargen_class_description.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 244 248" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 244 248" align="Center" name="_Main">
<!-- Edit box -->
<Widget type="Widget" skin="MW_Box" position="8 8 220 192" align="Stretch"/>

2
files/mygui/openmw_chargen_create_class.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 498 198" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 498 198" align="Center" name="_Main">
<!-- Class name -->
<Widget type="TextBox" skin="NormalText" position="8 8 52 23" name="LabelT" align="Left Top">

2
files/mygui/openmw_chargen_generate_class_result.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 289 256" align="Center" name="_Main">
<Widget type="VBox" skin="MW_Dialog" layer="Modal" position="0 0 289 256" align="Center" name="_Main">
<Property key="AutoResize" value="true"/>
<Property key="Padding" value="8"/>
<Property key="Spacing" value="8"/>

2
files/mygui/openmw_chargen_race.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 640 433" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 640 433" align="Center" name="_Main">
<!-- Appearance -->
<Widget type="TextBox" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="Left Top">

2
files/mygui/openmw_chargen_review.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 541 428" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 541 428" align="Center" name="_Main">
<!-- Player Name, Race, Class and Birthsign -->
<Widget type="Widget" skin="MW_Box" position="8 8 265 126">

2
files/mygui/openmw_chargen_select_attribute.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 231" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 247 231" align="Center" name="_Main">
<Widget type="Widget" skin="" position="14 14 216 204" align="HCenter VStretch">
<!-- Label -->

2
files/mygui/openmw_chargen_select_skill.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 487 275" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 487 275" align="Center" name="_Main">
<Widget type="Widget" skin="" position="17 14 457 246" align="Stretch">
<!-- Label -->

2
files/mygui/openmw_confirmation_dialog.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 360 130" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 360 130" align="Center" name="_Main">
<Property key="Visible" value="false"/>
<Widget type="EditBox" skin="MW_TextEditClient" position="16 8 338 130" name="Message" align="Center Top">

2
files/mygui/openmw_console.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Windows" name="_Main">
<Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Console" name="_Main">
<Property key="Caption" value="#{sConsoleTitle}"/>
<Property key="MinSize" value="40 40"/>
<Property key="Visible" value="false"/>

2
files/mygui/openmw_count_window.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout" version="3.2.0">
<Widget type="Window" skin="MW_DialogNoTransp" position="0 0 600 128" align="Center" layer="Windows" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" position="0 0 600 128" align="Center" layer="Modal" name="_Main">
<Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="0 4 592 24" align="Left Top HStretch" name="LabelText">
<Property key="TextAlign" value="Center"/>

2
files/mygui/openmw_edit_effect.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 362 310" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 362 310" align="Center" name="_Main">
<Widget type="ImageBox" skin="ImageBox" position="8 12 16 16" name="EffectImage">
</Widget>

2
files/mygui/openmw_edit_note.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 336 242" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 336 242" align="Center" name="_Main">
<Widget type="AutoSizedTextBox" skin="SandText" position="13 13 200 16">
<Property key="Caption" value="#{sEditNote}"/>

2
files/mygui/openmw_infobox.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 545 265" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 545 265" align="Center" name="_Main">
<!-- Edit box -->
<Widget type="Widget" skin="" position="14 14 516 70" name="TextBox" align="Top HCenter">

2
files/mygui/openmw_interactive_messagebox.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="MessageBox" position="0 0 500 400" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" 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"/>

2
files/mygui/openmw_itemselection_dialog.layout
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 380 285" layer="Windows" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" position="0 0 380 285" layer="Modal" align="Center" name="_Main">
<Widget type="TextBox" skin="SandText" position="8 8 300 18" name="Label"/>

15
files/mygui/openmw_layers.xml
View File

@ -1,23 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layer" version="1.0">
<Layer name="Scene" overlapped="false" pick="false"/>
<Layer name="Overlay" overlapped="false" pick="false"/>
<Layer name="AdditiveOverlay" type="AdditiveLayer" pick="false"/>
<Layer name="FadeToBlack" overlapped="false" pick="false"/>
<Layer name="HitOverlay" type="AdditiveLayer" pick="false"/>
<Layer name="HUD" overlapped="false" pick="true"/>
<Layer name="Menu" overlapped="false" pick="true"/>
<Layer name="MainMenu" overlapped="true" pick="true"/>
<Layer name="JournalBooks" type="ScalingLayer" pick="true">
<Property key="Size" value="600 520"/>
</Layer>
<Layer name="Windows" overlapped="true" pick="true"/>
<Layer name="Debug" overlapped="true" pick="true"/>
<Layer name="Popup" 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"/>
<Layer name="MainMenu" overlapped="true" pick="true"/>
<Layer name="Console" overlapped="true" pick="true"/>
<Layer name="LoadingScreenBackground" overlapped="false" pick="true"/>
<Layer name="LoadingScreen" overlapped="false" pick="true"/>
<Layer name="MessageBox" overlapped="false" pick="true"/>
<Layer name="Modal" 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"/>
</MyGUI>

4
files/mygui/openmw_loading_screen.layout
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<!-- The entire screen -->
<Widget type="Widget" layer="LoadingScreen" position="0 0 300 300" name="_Main" align="Stretch">
<Widget type="Window" skin="MW_Dialog" position="0 245 300 48" align="Bottom HCenter" name="LoadingBox">
@ -16,4 +15,7 @@
</Widget>
</Widget>
<Widget name="Scene" layer="LoadingScreenBackground" type="BackgroundImage" skin="ImageBox" position="0 0 300 300" align="Stretch" />
<Widget name="Splash" layer="LoadingScreenBackground" type="BackgroundImage" skin="ImageBox" position="0 0 300 300" align="Stretch" />
</MyGUI>

2
files/mygui/openmw_magicselection_dialog.layout
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 330 370" layer="Windows" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" position="0 0 330 370" layer="Modal" align="Center" name="_Main">
<Widget type="TextBox" skin="SandText" position="8 8 292 24">
<Property key="Caption" value="#{sMagicSelectTitle}"/>

2
files/mygui/openmw_persuasion_dialog.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 220 192" align="Center" name="_Main">
<Widget type="Window" skin="MW_DialogNoTransp" layer="Modal" position="0 0 220 192" align="Center" name="_Main">
<Widget type="TextBox" skin="NormalText" position="0 4 220 24">
<Property key="Caption" value="#{sPersuasionMenuTitle}"/>

2
files/mygui/openmw_quickkeys_menu.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" position="0 0 370 230" layer="Windows" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" position="0 0 370 230" layer="Modal" align="Center" name="_Main">
<Widget type="TextBox" skin="SandText" position="8 8 354 18">
<Property key="Caption" value="#{sQuickMenuTitle}"/>

2
files/mygui/openmw_savegame_dialog.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="VBox" skin="MW_DialogNoTransp" layer="Windows" position="0 0 600 400" align="Center" name="_Main">
<Widget type="VBox" skin="MW_DialogNoTransp" layer="Modal" position="0 0 600 400" align="Center" name="_Main">
<Property key="Padding" value="8"/>
<Property key="Spacing" value="8"/>

2
files/mygui/openmw_screen_fader.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="ImageBox" skin="ImageBox" layer="Overlay" position="0 0 300 200" name="_Main" align="Stretch">
<Widget type="ImageBox" skin="ImageBox" layer="FadeToBlack" position="0 0 300 200" name="_Main" align="Stretch">
<Property key="ImageTexture" value="black"/>
</Widget>
</MyGUI>

2
files/mygui/openmw_screen_fader_hit.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="ImageBox" skin="ImageBox" layer="AdditiveOverlay" position="0 0 300 200" name="_Main" align="Stretch">
<Widget type="ImageBox" skin="ImageBox" layer="HitOverlay" position="0 0 300 200" name="_Main" align="Stretch">
<Property key="ImageTexture" value="black"/>
</Widget>
</MyGUI>

2
files/mygui/openmw_settings_window.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout" version="3.2.0">
<Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="Windows" name="_Main">
<Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="MainMenu" name="_Main">
<Property key="MinSize" value="430 446"/>
<Widget type="TabControl" skin="TabControl" position="8 8 368 405" align="Stretch" name="SettingsTab">
<Property key="ButtonAutoWidth" value="true"/>

2
files/mygui/openmw_text_input.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 320 97" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Modal" position="0 0 320 97" align="Center" name="_Main">
<!-- Appearance -->
<Widget type="TextBox" skin="ProgressText" position="6 6 300 18" name="LabelT" align="Left Top">

2
files/mygui/openmw_tooltips.layout
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Widget" layer="Popup" position="0 0 300 300" name="_Main">
<Widget type="Widget" layer="Tooltip" 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">

6
files/mygui/openmw_windows.skin.xml
View File

@ -453,11 +453,7 @@
<Child type="Widget" skin="HB_ALL" offset="0 0 30 20" align="Right" name="Right"/>
</Resource>
<!-- ----------------------------------------------------
WINDOW DEFINITION
------------------------------------------------------ -->
<!-- WINDOW DEFINITION -->
<Resource type="ResourceSkin" name="MW_Window" size="256 256">
<Property key="TextAlign" value="Center"/>