games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-19 12:02:24 +02:00
Code Issues Releases Activity

Correctly update drag-and-drop cursor if our window gets deactivated

Browse Source
This commit is contained in:
Ivan Savenko 2022-12-18 14:34:38 +02:00
parent 526a6e4fe7
commit 57dba9433c
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/gui/CCursorHandler.cpp
View File

@ -67,6 +67,8 @@ void CCursorHandler::initCursor()
void CCursorHandler::changeGraphic(ECursor::ECursorTypes type, int index) void CCursorHandler::changeGraphic(ECursor::ECursorTypes type, int index)
{ {
assert(dndObject == nullptr);
if(type != this->type) if(type != this->type)
{ {
this->type = type; this->type = type;

16
client/widgets/CArtifactHolder.cpp
View File

@ -254,6 +254,22 @@ void CHeroArtPlace::clickRight(tribool down, bool previousState)
} }
} }
void CArtifactsOfHero::activate()
{
if (commonInfo->src.AOH == this && commonInfo->src.art)
CCS->curh->dragAndDropCursor(make_unique<CAnimImage>("artifact", commonInfo->src.art->artType->getIconIndex()));
CIntObject::activate();
}
void CArtifactsOfHero::deactivate()
{
if (commonInfo->src.AOH == this && commonInfo->src.art)
CCS->curh->dragAndDropCursor(nullptr);
CIntObject::deactivate();
}
/** /**
* Selects artifact slot so that the containing artifact looks like it's picked up. * Selects artifact slot so that the containing artifact looks like it's picked up.
*/ */

3
client/widgets/CArtifactHolder.h
View File

@ -148,6 +148,9 @@ public:
void dispose(); //free resources not needed after closing windows and reset state void dispose(); //free resources not needed after closing windows and reset state
void scrollBackpack(int dir); //dir==-1 => to left; dir==1 => to right void scrollBackpack(int dir); //dir==-1 => to left; dir==1 => to right
void activate() override;
void deactivate() override;
void safeRedraw(); void safeRedraw();
void markPossibleSlots(const CArtifactInstance* art); void markPossibleSlots(const CArtifactInstance* art);
void unmarkSlots(bool withRedraw = true); //unmarks slots in all visible AOHs void unmarkSlots(bool withRedraw = true); //unmarks slots in all visible AOHs