Merge branch openmw:master into master

This commit is contained in:
Igilq 2025-08-13 09:59:41 +00:00
commit 3fc51e254c

View File

@ -666,19 +666,18 @@ namespace MWGui
if (excess > 0 && canStack)
invStore.unequipItemQuantity(ptr, excess);
if (isVisible())
if (mDragAndDrop->mIsOnDragAndDrop && isFromDragAndDrop)
{
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
// 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())
{
mItemView->update();
notifyContentChanged();
}
// else: will be updated in open()