games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Activate nearest radial menu item, even if not hovered

Browse Source
This commit is contained in:
Ivan Savenko
2023-07-19 17:36:05 +03:00
parent 5b2ac27e90
commit a45a0d1c40
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
client/widgets/RadialMenu.cpp
View File

@@ -28,13 +28,6 @@ RadialMenuItem::RadialMenuItem(const std::string & imageName, const std::string
pos = picture->pos;
}
bool RadialMenuItem::isInside(const Point & position)
{
Point localPosition = position - pos.topLeft();
return !image->isTransparent(localPosition);
}
RadialMenu::RadialMenu(const Point & positionToCenter, const std::vector<RadialMenuConfig> & menuConfig)
{
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
@@ -67,34 +60,40 @@ void RadialMenu::addItem(const Point & offset, const std::string & path, const s
items.push_back(item);
}
void RadialMenu::gesturePanning(const Point & initialPosition, const Point & currentPosition, const Point & lastUpdateDistance)
std::shared_ptr<RadialMenuItem> RadialMenu::findNearestItem(const Point & cursorPosition) const
{
GH.statusbar()->clear();
int bestDistance = std::numeric_limits<int>::max();
std::shared_ptr<RadialMenuItem> bestItem;
for(const auto & item : items)
{
if (item->isInside(currentPosition))
Point vector = item->pos.center() - cursorPosition;
if (vector.length() < bestDistance)
{
GH.statusbar()->write(item->hoverText);
break;
bestDistance = vector.length();
bestItem = item;
}
}
assert(bestItem);
return bestItem;
}
void RadialMenu::gesturePanning(const Point & initialPosition, const Point & currentPosition, const Point & lastUpdateDistance)
{
auto item = findNearestItem(currentPosition);
GH.statusbar()->write(item->hoverText);
}
void RadialMenu::gesture(bool on, const Point & initialPosition, const Point & finalPosition)
{
if (!on)
{
// we need to close this window first so if action spawns a new window it won't be closed instead
GH.windows().popWindows(1);
if (on)
return;
for(const auto & item : items)
{
if (item->isInside(finalPosition))
{
item->callback();
break;
}
}
}
auto item = findNearestItem(finalPosition);
// we need to close this window first so if action spawns a new window it won't be closed instead
GH.windows().popWindows(1);
item->callback();
}

3
client/widgets/RadialMenu.h
View File

@@ -43,8 +43,6 @@ class RadialMenuItem : public CIntObject
public:
RadialMenuItem(const std::string & imageName, const std::string & hoverText, const std::function<void()> & callback);
bool isInside(const Point & position);
};
class RadialMenu : public CIntObject
@@ -55,6 +53,7 @@ class RadialMenu : public CIntObject
void addItem(const Point & offset, const std::string & path, const std::string & hoverText, const std::function<void()> & callback);
std::shared_ptr<RadialMenuItem> findNearestItem(const Point & cursorPosition) const;
public:
RadialMenu(const Point & positionToCenter, const std::vector<RadialMenuConfig> & menuConfig);