Explorar o código

Rename panning->gesturing for consistency

Ivan Savenko %!s(int64=2) %!d(string=hai) anos
pai
achega
967dc95867

+ 1 - 1
client/battle/BattleFieldController.cpp

@@ -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);

+ 3 - 3
client/gui/EventDispatcher.cpp

@@ -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);
 	}
 }

+ 1 - 1
client/gui/EventsReceiver.cpp

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

+ 1 - 1
client/gui/EventsReceiver.h

@@ -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;