AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-12 05:51:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1383 from akortunov/guifixes

Browse Source 
Enable transparency for interactive messageboxes and tooltips in game mode
This commit is contained in:
scrawl 2017-08-10 21:55:24 +00:00 committed by GitHub
commit 0f983144a4
7 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ namespace MWGui
InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons) InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message, const std::vector<std::string>& buttons)
: WindowModal("openmw_interactive_messagebox.layout") : WindowModal(MWBase::Environment::get().getWindowManager()->isGuiMode() ? "openmw_interactive_messagebox_notransp.layout" : "openmw_interactive_messagebox.layout")
, mMessageBoxManager(parMessageBoxManager) , mMessageBoxManager(parMessageBoxManager)
, mButtonPressed(-1) , mButtonPressed(-1)
{ {

13
apps/openmw/mwgui/tooltips.cpp
View File

@ -378,17 +378,10 @@ namespace MWGui
{ {
mDynamicToolTipBox->setVisible(true); mDynamicToolTipBox->setVisible(true);
if(mShowOwned == 1 || mShowOwned == 3) if((mShowOwned == 1 || mShowOwned == 3) && isFocusObject && checkOwned())
{ mDynamicToolTipBox->changeWidgetSkin(MWBase::Environment::get().getWindowManager()->isGuiMode() ? "HUD_Box_NoTransp_Owned" : "HUD_Box_Owned");
if(isFocusObject && checkOwned())
{
mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_Owned");
}
else else
{ mDynamicToolTipBox->changeWidgetSkin(MWBase::Environment::get().getWindowManager()->isGuiMode() ? "HUD_Box_NoTransp" : "HUD_Box");
mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp");
}
}
std::string caption = info.caption; std::string caption = info.caption;
std::string image = info.icon; std::string image = info.icon;

1
files/mygui/CMakeLists.txt
View File

@ -38,6 +38,7 @@ set(MYGUI_FILES
openmw_hud.layout openmw_hud.layout
openmw_infobox.layout openmw_infobox.layout
openmw_interactive_messagebox.layout openmw_interactive_messagebox.layout
openmw_interactive_messagebox_notransp.layout
openmw_inventory_window.layout openmw_inventory_window.layout
openmw_journal.layout openmw_journal.layout
openmw_journal.skin.xml openmw_journal.skin.xml

12
files/mygui/openmw_hud_box.skin.xml
View File

@ -36,6 +36,18 @@
<!-- The interior of the box --> <!-- The interior of the box -->
<Child type="Widget" skin="DialogBG_NoTransp_Owned" offset="0 0 40 40" align="Stretch" name="Client"/>
<!-- Borders -->
<Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="Left Stretch" name="Client"/>
</Resource>
<Resource type="ResourceSkin" name="HUD_Box_Owned" size="40 40">
<!-- The interior of the box -->
<Child type="Widget" skin="DialogBG_Owned" offset="0 0 40 40" align="Stretch" name="Client"/> <Child type="Widget" skin="DialogBG_Owned" offset="0 0 40 40" align="Stretch" name="Client"/>
<!-- Borders --> <!-- Borders -->

16
files/mygui/openmw_interactive_messagebox_notransp.layout Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_DialogNoTransp" layer="MessageBox" 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"/>
<Property key="Static" value="true"/>
<Property key="WordWrap" value="true"/>
<Property key="MultiLine" value="1"/>
<Property key="VisibleVScroll" value="1"/>
</Widget>
<Widget type="Widget" skin="" position="0 0 500 400" align="Stretch" name="buttons">
</Widget>
</Widget>
</MyGUI>

2
files/mygui/openmw_persuasion_dialog.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_Dialog" layer="Windows" position="0 0 220 192" align="Center" name="_Main"> <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 220 192" align="Center" name="_Main">
<Widget type="TextBox" skin="NormalText" position="0 4 220 24"> <Widget type="TextBox" skin="NormalText" position="0 4 220 24">
<Property key="Caption" value="#{sPersuasionMenuTitle}"/> <Property key="Caption" value="#{sPersuasionMenuTitle}"/>

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

@ -158,7 +158,14 @@
</Resource> </Resource>
<!-- Defines a owned background --> <!-- Defines a owned background -->
<Resource type="ResourceSkin" name="DialogBG_Owned" size="8 8" texture="white"> <Resource type="ResourceSkin" name="DialogBG_NoTransp_Owned" size="8 8" texture="white">
<Property key="Colour" value="#{setting=GUI,color background owned}"/>
<BasisSkin type="MainSkin" offset="0 0 8 8">
<State name="normal" offset="0 0 8 8"/>
</BasisSkin>
</Resource>
<Resource type="ResourceSkin" name="DialogBG_Owned" size="8 8" texture="transparent">
<Property key="Colour" value="#{setting=GUI,color background owned}"/> <Property key="Colour" value="#{setting=GUI,color background owned}"/>
<BasisSkin type="MainSkin" offset="0 0 8 8"> <BasisSkin type="MainSkin" offset="0 0 8 8">
<State name="normal" offset="0 0 8 8"/> <State name="normal" offset="0 0 8 8"/>