teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Exit drag-and-drop if dragged item is deleted (Fixes #3097)

Browse source
This commit is contained in:
scrawl 2017-09-26 16:51:19 +02:00
parent 2ce79e07a4
commit 9b91ea5d34
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/draganddrop.cpp
View file

@ -121,6 +121,12 @@ void DragAndDrop::drop(ItemModel *targetModel, ItemView *targetView)
mSourceView->update(); mSourceView->update();
} }
void DragAndDrop::onFrame()
{
if (mIsOnDragAndDrop && mItem.mBase.getRefData().getCount() == 0)
finish();
}
void DragAndDrop::finish() void DragAndDrop::finish()
{ {
mIsOnDragAndDrop = false; mIsOnDragAndDrop = false;

1
apps/openmw/mwgui/draganddrop.hpp
View file

@ -29,6 +29,7 @@ namespace MWGui
void startDrag (int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count); void startDrag (int index, SortFilterItemModel* sortModel, ItemModel* sourceModel, ItemView* sourceView, int count);
void drop (ItemModel* targetModel, ItemView* targetView); void drop (ItemModel* targetModel, ItemView* targetView);
void onFrame();
void finish(); void finish();
}; };

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

@ -876,11 +876,7 @@ namespace MWGui
MWBase::StateManager::State_NoGame) MWBase::StateManager::State_NoGame)
return; return;
if (mDragAndDrop->mIsOnDragAndDrop) mDragAndDrop->onFrame();
{
assert(mDragAndDrop->mDraggedWidget);
mDragAndDrop->mDraggedWidget->setPosition(MyGUI::InputManager::getInstance().getMousePosition());
}
updateMap(); updateMap();