Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed inconsistency between sf::Touch::getPosition and touch events.

Browse Source
This commit is contained in:
Chase W 2015-04-29 11:54:30 -04:00
parent e0174545e6
commit 653c0fdb30
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SFML/Window/iOS/SFAppDelegate.mm
View File

@ -242,6 +242,9 @@ namespace
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
- (void)notifyTouchBegin:(unsigned int)index atPosition:(sf::Vector2i)position; - (void)notifyTouchBegin:(unsigned int)index atPosition:(sf::Vector2i)position;
{ {
position.x *= backingScaleFactor;
position.y *= backingScaleFactor;
// save the touch position // save the touch position
if (index >= touchPositions.size()) if (index >= touchPositions.size())
touchPositions.resize(index + 1, sf::Vector2i(-1, -1)); touchPositions.resize(index + 1, sf::Vector2i(-1, -1));
@ -253,8 +256,8 @@ namespace
sf::Event event; sf::Event event;
event.type = sf::Event::TouchBegan; event.type = sf::Event::TouchBegan;
event.touch.finger = index; event.touch.finger = index;
event.touch.x = position.x * backingScaleFactor; event.touch.x = position.x;
event.touch.y = position.y * backingScaleFactor; event.touch.y = position.y;
sfWindow->forwardEvent(event); sfWindow->forwardEvent(event);
} }
} }
@ -263,6 +266,9 @@ namespace
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
- (void)notifyTouchMove:(unsigned int)index atPosition:(sf::Vector2i)position; - (void)notifyTouchMove:(unsigned int)index atPosition:(sf::Vector2i)position;
{ {
position.x *= backingScaleFactor;
position.y *= backingScaleFactor;
// save the touch position // save the touch position
if (index >= touchPositions.size()) if (index >= touchPositions.size())
touchPositions.resize(index + 1, sf::Vector2i(-1, -1)); touchPositions.resize(index + 1, sf::Vector2i(-1, -1));
@ -274,8 +280,8 @@ namespace
sf::Event event; sf::Event event;
event.type = sf::Event::TouchMoved; event.type = sf::Event::TouchMoved;
event.touch.finger = index; event.touch.finger = index;
event.touch.x = position.x * backingScaleFactor; event.touch.x = position.x;
event.touch.y = position.y * backingScaleFactor; event.touch.y = position.y;
sfWindow->forwardEvent(event); sfWindow->forwardEvent(event);
} }
} }