mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-02 13:34:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fixkaramunsing' into 'master'

Browse source 
Ensure draganddrop finishes when item is used from it

Closes #8659

See merge request OpenMW/openmw!4847
This commit is contained in:
Evil Eye 2025-08-12 21:52:41 +00:00
commit ace1f7f3d0
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
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 (isVisible()) if (mDragAndDrop->mIsOnDragAndDrop && isFromDragAndDrop)
{ {
if (isFromDragAndDrop) // Feature: Don't finish draganddrop if potion or ingredient was used
{ if (type == ESM::Potion::sRecordId || type == ESM::Ingredient::sRecordId)
// 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(); mDragAndDrop->update();
else
mDragAndDrop->finish();
} }
if (isVisible())
{
mItemView->update(); mItemView->update();
notifyContentChanged(); notifyContentChanged();
} }
// else: will be updated in open() // else: will be updated in open()