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

show owned - better settings

Browse Source
This commit is contained in:
Jiří Kuneš 2015-07-18 17:13:20 +02:00
parent df077f8649
commit 75f5972898
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ namespace MWGui
, mLastMouseY(0)
, mEnabled(true)
, mFullHelp(false)
, mShowOwned(0)
{
getWidget(mDynamicToolTipBox, "DynamicToolTipBox");
@ -55,6 +56,8 @@ namespace MWGui
{
mMainWidget->getChildAt(i)->setVisible(false);
}
mShowOwned = Settings::Manager::getInt("show owned", "Game");
}
void ToolTips::setEnabled(bool enabled)
@ -370,13 +373,16 @@ namespace MWGui
{
mDynamicToolTipBox->setVisible(true);
if(checkOwned())
if(mShowOwned == 1 || mShowOwned == 3)
{
mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_R");
}
else
{
mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp");
if(checkOwned())
{
mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp_R");
}
else
{
mDynamicToolTipBox->changeWidgetSkin("HUD_Box_NoTransp");
}
}
std::string caption = info.caption;

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

@ -122,6 +122,8 @@ namespace MWGui
bool mEnabled;
bool mFullHelp;
int mShowOwned;
};
}
#endif

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

@ -187,7 +187,7 @@ namespace MWGui
, mRestAllowed(true)
, mFPS(0.0f)
, mFallbackMap(fallbackMap)
, mShowOwned(false)
, mShowOwned(0)
, mVersionDescription(versionDescription)
{
float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
@ -264,7 +264,7 @@ namespace MWGui
MyGUI::ClipboardManager::getInstance().eventClipboardChanged += MyGUI::newDelegate(this, &WindowManager::onClipboardChanged);
MyGUI::ClipboardManager::getInstance().eventClipboardRequested += MyGUI::newDelegate(this, &WindowManager::onClipboardRequested);
mShowOwned = Settings::Manager::getBool("show owned", "Game");
mShowOwned = Settings::Manager::getInt("show owned", "Game");
}
void WindowManager::initUI()
@ -1043,7 +1043,7 @@ namespace MWGui
{
mToolTips->setFocusObject(focus);
if(mShowOwned && mHud)
if(mHud && (mShowOwned == 2 || mShowOwned == 3))
{
bool owned = mToolTips->checkOwned();
mHud->setCrosshairOwned(owned);

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

@ -487,7 +487,7 @@ namespace MWGui
std::map<std::string, std::string> mFallbackMap;
bool mShowOwned;
int mShowOwned;
std::string mVersionDescription;

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

@ -131,7 +131,7 @@
<!-- Defines a red background -->
<Resource type="ResourceSkin" name="DialogBG_R" size="8 8" texture="white">
<Property key="Colour" value="0.3 0 0 1"/>
<Property key="Colour" value="0.2 0 0 1"/>
<BasisSkin type="MainSkin" offset="0 0 8 8">
<State name="normal" offset="0 0 8 8"/>
</BasisSkin>

8
files/settings-default.cfg
View File

@ -162,8 +162,12 @@ best attack = false
difficulty = 0
# change crosshair color when pointing on owned object
show owned = false
# Change crosshair/toolTip color when pointing on owned object
#0: nothing changed
#1: tint toolTip
#2: tint crosshair
#3: both
show owned = 0
[Saves]
character =