mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-14 01:19:59 +00:00
Merge branch 'quickkeysmenu' into 'master'
Quick keys menu fixes (#8359) Closes #8359 See merge request OpenMW/openmw!4546
This commit is contained in:
commit
dc3cb147df
@ -246,6 +246,8 @@ namespace MWGui
|
||||
|
||||
if (mItemSelectionDialog)
|
||||
mItemSelectionDialog->setVisible(false);
|
||||
|
||||
MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
|
||||
}
|
||||
|
||||
void QuickKeysMenu::onAssignItemCancel()
|
||||
|
@ -279,7 +279,7 @@ namespace MWGui
|
||||
&& !base.get<ESM::Book>()->mBase->mData.mIsScroll)
|
||||
return false;
|
||||
|
||||
if ((mFilter & Filter_OnlyUsableItems) && base.getClass().getScript(base).empty())
|
||||
if ((mFilter & Filter_OnlyUsableItems))
|
||||
{
|
||||
std::unique_ptr<MWWorld::Action> actionOnUse = base.getClass().use(base);
|
||||
if (!actionOnUse || actionOnUse->isNullAction())
|
||||
|
@ -12,7 +12,6 @@
|
||||
<Property key="MultiLine" value="true"/>
|
||||
<Property key="WordWrap" value="true"/>
|
||||
<Property key="Static" value="true"/>
|
||||
<Property key="TextAlign" value="Center"/>
|
||||
</Widget>
|
||||
|
||||
<Widget type="Widget" skin="" position="15 55 332 128" align="Left Bottom HCenter">
|
||||
|
Loading…
x
Reference in New Issue
Block a user