[Gemrb-commits] gemrb: branch master updated. v0.7.0-588-g01c9984

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  01c9984bffc9a038aca98b2cadd10b243d8693ea (commit)
       via  4298f2c639d47b909490f7e4ab52391bc43e46b8 (commit)

Summary of changes:
 gemrb/plugins/SDLVideo/SDL20Video.cpp |   18 +++++++++---------
 gemrb/plugins/SDLVideo/SDL20Video.h   |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
      from  559b6cc390fbc672b8ada118937b180d5170f20e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=01c9984bffc9a038aca98b2cadd10b243d8693ea

commit 01c9984bffc9a038aca98b2cadd10b243d8693ea
Author: Brad Allred <bra...@me...>
Date:   Sun Mar 25 21:50:28 2012 -0600

    TouchInput: only locations should be offset, not deltas.

diff --git a/gemrb/plugins/SDLVideo/SDL20Video.cpp b/gemrb/plugins/SDLVideo/SDL20Video.cpp
index 1842cf3..483a611 100644
--- a/gemrb/plugins/SDLVideo/SDL20Video.cpp
+++ b/gemrb/plugins/SDLVideo/SDL20Video.cpp
@@ -395,16 +395,16 @@ int SDL20VideoDriver::ProcessEvent(const SDL_Event & event)
 					ProcessFirstTouch(GEM_MB_ACTION);
 				}
 				// invert the coordinates such that dragging down scrolls up etc.
-				int scrollX = ((event.tfinger.dx / xScaleFactor) + xOffset) * -1;
-				int scrollY = ((event.tfinger.dy / yScaleFactor) + yOffset) * -1;
+				int scrollX = (event.tfinger.dx / xScaleFactor) * -1;
+				int scrollY = (event.tfinger.dy / yScaleFactor) * -1;
 
 				EvntManager->MouseWheelScroll( scrollX, scrollY );
 			} else if (numFingers == core->NumFingKboard) {
-				if (((event.tfinger.dy / yScaleFactor) + xOffset) * -1 >= MIN_GESTURE_DELTA_PIXELS){
+				if ((event.tfinger.dy / yScaleFactor) * -1 >= MIN_GESTURE_DELTA_PIXELS){
 					// if the keyboard is already up interpret this gesture as console pop
 					if( softKeyboardShowing && !ConsolePopped ) core->PopupConsole();
 					else ShowSoftKeyboard();
-				} else if(((event.tfinger.dy / yScaleFactor) + xOffset) * -1 <= -MIN_GESTURE_DELTA_PIXELS){
+				} else if((event.tfinger.dy / yScaleFactor) * -1 <= -MIN_GESTURE_DELTA_PIXELS){
 					HideSoftKeyboard();
 				}
 			} else if (numFingers == 1) { //click and drag

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=4298f2c639d47b909490f7e4ab52391bc43e46b8

commit 4298f2c639d47b909490f7e4ab52391bc43e46b8
Author: Brad Allred <bra...@me...>
Date:   Sun Mar 25 21:48:42 2012 -0600

    typo fix

diff --git a/gemrb/plugins/SDLVideo/SDL20Video.cpp b/gemrb/plugins/SDLVideo/SDL20Video.cpp
index e2d8685..1842cf3 100644
--- a/gemrb/plugins/SDLVideo/SDL20Video.cpp
+++ b/gemrb/plugins/SDLVideo/SDL20Video.cpp
@@ -52,7 +52,7 @@ SDL20VideoDriver::SDL20VideoDriver(void)
 	// touch input
 	ignoreNextFingerUp = false;
 	firstFingerDown = SDL_TouchFingerEvent();
-	firstFigerDownTime = 0;
+	firstFingerDownTime = 0;
 }
 
 SDL20VideoDriver::~SDL20VideoDriver(void)
@@ -293,8 +293,8 @@ int SDL20VideoDriver::SwapBuffers(void)
 
 int SDL20VideoDriver::PollEvents()
 {
-	if (firstFigerDownTime
-		&& GetTickCount() - firstFigerDownTime >= TOUCH_RC_NUM_TICKS) {
+	if (firstFingerDownTime
+		&& GetTickCount() - firstFingerDownTime >= TOUCH_RC_NUM_TICKS) {
 		// enough time has passed to transform firstTouch into a right click event
 		int x = firstFingerDown.x;
 		int y = firstFingerDown.y;
@@ -329,7 +329,7 @@ void SDL20VideoDriver::ProcessFirstTouch( int mouseButton )
 
 		firstFingerDown = SDL_TouchFingerEvent();
 		ignoreNextFingerUp = false;
-		firstFigerDownTime = 0;
+		firstFingerDownTime = 0;
 	}
 }
 
@@ -418,7 +418,7 @@ int SDL20VideoDriver::ProcessEvent(const SDL_Event & event)
 			if (numFingers == 1) {
 				// do not send a mouseDown event. we delay firstTouch until we know more about the context.
 				firstFingerDown = event.tfinger;
-				firstFigerDownTime = GetTickCount();
+				firstFingerDownTime = GetTickCount();
 				firstFingerDown.x /= xScaleFactor;
 				firstFingerDown.x += xOffset;
 				firstFingerDown.y /= yScaleFactor;
diff --git a/gemrb/plugins/SDLVideo/SDL20Video.h b/gemrb/plugins/SDLVideo/SDL20Video.h
index dd56467..a38aa62 100644
--- a/gemrb/plugins/SDLVideo/SDL20Video.h
+++ b/gemrb/plugins/SDLVideo/SDL20Video.h
@@ -34,7 +34,7 @@ private:
 	// touch input vars
 	bool ignoreNextFingerUp;
 	SDL_TouchFingerEvent firstFingerDown;
-	unsigned long firstFigerDownTime;
+	unsigned long firstFingerDownTime;
 public:
 	SDL20VideoDriver(void);
 	~SDL20VideoDriver(void);

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator