games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Radial menu is now a proper window. Minor fixes to positioning.

Browse Source
This commit is contained in:
Ivan Savenko
2023-07-16 14:49:48 +03:00
parent a494dc4870
commit d26595cef7
7 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client/widgets/CGarrisonInt.cpp
View File

@@ -345,37 +345,10 @@ void CGarrisonSlot::clickPressed(const Point & cursorPosition)
}
}
void CGarrisonSlot::gesturePanning(const Point & initialPosition, const Point & currentPosition, const Point & lastUpdateDistance)
{
assert(radialMenu);
if (radialMenu)
radialMenu->gesturePanning(initialPosition, currentPosition, lastUpdateDistance);
}
void CGarrisonSlot::gesture(bool on, const Point & initialPosition, const Point & finalPosition)
{
if (on)
{
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
radialMenu = std::make_shared<RadialMenu>(owner, this);
radialMenu->center(pos.center());
auto topParent = parent;
while (topParent->parent)
topParent = topParent->parent;
// Add radial menu to current window / topmost parent for proper rendering order
topParent->addChild(radialMenu.get(), false);
}
else
{
radialMenu->gesture(on, initialPosition, finalPosition);
radialMenu.reset();
}
GH.windows().totalRedraw();
GH.windows().createAndPushWindow<RadialMenu>(pos.center(), owner, this);
}
void CGarrisonSlot::update()