@@ -87,7 +87,12 @@ void Camera::minMaxInt(int *value, const int minValue, const int maxValue) const
  */
 void Camera::mousePress(Action *action, State *)
 {
-	if (Options::battleDragScrollButton != SDL_BUTTON_MIDDLE || (SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton)) == 0)
+	if (action->getDetails()->button.button == SDL_BUTTON_LEFT && Options::battleEdgeScroll == SCROLL_TRIGGER)
+	{
+		_scrollTrigger = true;
+		mouseOver(action, 0);
+	}
+	else if (Options::battleDragScrollButton != SDL_BUTTON_MIDDLE || (SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton)) == 0)
 	{
 		if (action->getDetails()->button.button == SDL_BUTTON_WHEELUP)
 		{
@@ -98,11 +103,6 @@ void Camera::mousePress(Action *action, State *)
 			down();
 		}
 	}
-	else if (action->getDetails()->button.button == SDL_BUTTON_LEFT && Options::battleEdgeScroll == SCROLL_TRIGGER)
-	{
-		_scrollTrigger = true;
-		mouseOver(action, 0);
-	}
 }
 
 /**
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,12 @@ void Camera::minMaxInt(int *value, const int minValue, const int maxValue) const`
`87`	`87`	`*/`
`88`	`88`	`void Camera::mousePress(Action action, State )`
`89`	`89`	`{`
`90`		`- if (Options::battleDragScrollButton != SDL_BUTTON_MIDDLE \|\| (SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton)) == 0)`
	`90`	`+ if (action->getDetails()->button.button == SDL_BUTTON_LEFT && Options::battleEdgeScroll == SCROLL_TRIGGER)`
	`91`	`+ {`
	`92`	`+ _scrollTrigger = true;`
	`93`	`+ mouseOver(action, 0);`
	`94`	`+ }`
	`95`	`+ else if (Options::battleDragScrollButton != SDL_BUTTON_MIDDLE \|\| (SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton)) == 0)`
`91`	`96`	`{`
`92`	`97`	`if (action->getDetails()->button.button == SDL_BUTTON_WHEELUP)`
`93`	`98`	`{`
`@@ -98,11 +103,6 @@ void Camera::mousePress(Action action, State )`
`98`	`103`	`down();`
`99`	`104`	`}`
`100`	`105`	`}`
`101`		`- else if (action->getDetails()->button.button == SDL_BUTTON_LEFT && Options::battleEdgeScroll == SCROLL_TRIGGER)`
`102`		`- {`
`103`		`- _scrollTrigger = true;`
`104`		`- mouseOver(action, 0);`
`105`		`- }`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`