AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-22 11:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch openmw:master into master

Browse Source
This commit is contained in:
Igilq 2025-08-13 09:59:41 +00:00
commit 3fc51e254c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwgui/inventorywindow.cpp
View File

@ -666,19 +666,18 @@ namespace MWGui
if (excess > 0 && canStack) if (excess > 0 && canStack)
invStore.unequipItemQuantity(ptr, excess); invStore.unequipItemQuantity(ptr, excess);
if (mDragAndDrop->mIsOnDragAndDrop && isFromDragAndDrop)
{
// Feature: Don't finish draganddrop if potion or ingredient was used
if (type == ESM::Potion::sRecordId || type == ESM::Ingredient::sRecordId)
mDragAndDrop->update();
else
mDragAndDrop->finish();
}
if (isVisible()) if (isVisible())
{ {
if (isFromDragAndDrop)
{
// Feature: Don't stop draganddrop if potion or ingredient was used
if (ptr.getType() != ESM::Potion::sRecordId && ptr.getType() != ESM::Ingredient::sRecordId)
mDragAndDrop->finish();
else
mDragAndDrop->update();
}
mItemView->update(); mItemView->update();
notifyContentChanged(); notifyContentChanged();
} }
// else: will be updated in open() // else: will be updated in open()