games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Rename panning->gesturing for consistency

Browse Source
This commit is contained in:
Ivan Savenko 2023-06-16 15:31:59 +03:00
parent 0be9aff99f
commit 967dc95867
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/battle/BattleFieldController.cpp
View File

@ -854,7 +854,7 @@ void BattleFieldController::show(Canvas & to)
renderBattlefield(to);
if (isActive() && isPanning() && getHoveredHex() != BattleHex::INVALID)
if (isActive() && isGesturing() && getHoveredHex() != BattleHex::INVALID)
{
auto cursorIndex = CCS->curh->get<Cursor::Combat>();
auto imageIndex = static_cast<size_t>(cursorIndex);

6
client/gui/EventDispatcher.cpp
View File

@ -242,7 +242,7 @@ void EventDispatcher::dispatchGesturePanningEnded(const Point & initialPosition,
for(auto it : copied)
{
if (it->isPanning())
if (it->isGesturing())
{
it->gesture(false, initialPosition, finalPosition);
it->panningState = false;
@ -256,7 +256,7 @@ void EventDispatcher::dispatchGesturePanning(const Point & initialPosition, cons
for(auto it : copied)
{
if (it->isPanning())
if (it->isGesturing())
it->gesturePanning(initialPosition, currentPosition, lastUpdateDistance);
}
}
@ -265,7 +265,7 @@ void EventDispatcher::dispatchGesturePinch(const Point & initialPosition, double
{
for(auto it : panningInterested)
{
if (it->isPanning())
if (it->isGesturing())
it->gesturePinch(initialPosition, distance);
}
}

2
client/gui/EventsReceiver.cpp
View File

@ -27,7 +27,7 @@ bool AEventsReceiver::isHovered() const
return hoveredState;
}
bool AEventsReceiver::isPanning() const
bool AEventsReceiver::isGesturing() const
{
return panningState;
}

2
client/gui/EventsReceiver.h
View File

@ -90,7 +90,7 @@ public:
bool isHovered() const;
/// Returns true if panning/swiping gesture is currently active
bool isPanning() const;
bool isGesturing() const;
/// Returns true if element is currently active and may receive events
bool isActive() const;