Merge remote-tracking branch 'remotes/fenyo1/MaxClickExtend'

Conflicts:
	src/Interface/TextList.cpp

Author: SupSuper

src/Basescape/CraftSoldiersState.cpp

@@ -166,18 +166,26 @@ void CraftSoldiersState::populateList()
  */
 void CraftSoldiersState::lstItemsLeftArrowClick(Action *action)
 {
-	if (action->getDetails()->button.button != SDL_BUTTON_LEFT)
+	if (SDL_BUTTON_LEFT == action->getDetails()->button.button
+	|| SDL_BUTTON_RIGHT == action->getDetails()->button.button)
 	{
-		return;
-	}
-	int row = _lstSoldiers->getSelectedRow();
-	if (row > 0 )
-	{
-		Soldier *s = _base->getSoldiers()->at(row);
-		_base->getSoldiers()->at(row) = _base->getSoldiers()->at(row-1);
-		_base->getSoldiers()->at(row-1) = s;
+		int row = _lstSoldiers->getSelectedRow();
+		if (row > 0 )
+		{
+			Soldier *s = _base->getSoldiers()->at(row);
+			if (SDL_BUTTON_LEFT == action->getDetails()->button.button)
+			{
+				_base->getSoldiers()->at(row) = _base->getSoldiers()->at(row-1);
+				_base->getSoldiers()->at(row-1) = s;
+			}
+			else
+			{
+				_base->getSoldiers()->erase(_base->getSoldiers()->begin()+row);
+				_base->getSoldiers()->insert(_base->getSoldiers()->begin(),s);
+			}
+		}
+		populateList();
 	}
-	populateList();
 }
 
 /**
@@ -186,18 +194,26 @@ void CraftSoldiersState::lstItemsLeftArrowClick(Action *action)
  */
 void CraftSoldiersState::lstItemsRightArrowClick(Action *action)
 {
-	if (action->getDetails()->button.button != SDL_BUTTON_LEFT)
+	if (SDL_BUTTON_LEFT == action->getDetails()->button.button
+	|| SDL_BUTTON_RIGHT == action->getDetails()->button.button)
 	{
-		return;
-	}
-	unsigned int row = _lstSoldiers->getSelectedRow();
-	if (row < _base->getSoldiers()->size() - 1 )
-	{
-		Soldier *s = _base->getSoldiers()->at(row);
-		_base->getSoldiers()->at(row) = _base->getSoldiers()->at(row+1);
-		_base->getSoldiers()->at(row+1) = s;
+		unsigned int row = _lstSoldiers->getSelectedRow();
+		if (row < _base->getSoldiers()->size() - 1 )
+		{
+			Soldier *s = _base->getSoldiers()->at(row);
+			if (SDL_BUTTON_LEFT == action->getDetails()->button.button)
+			{
+				_base->getSoldiers()->at(row) = _base->getSoldiers()->at(row+1);
+				_base->getSoldiers()->at(row+1) = s;
+			}
+			else
+			{
+				_base->getSoldiers()->erase(_base->getSoldiers()->begin()+row);
+				_base->getSoldiers()->insert(_base->getSoldiers()->end(),s);
+			}
+		}
+		populateList();
 	}
-	populateList();
 }
 
 /**

src/Interface/ArrowButton.cpp

@@ -296,11 +296,11 @@ void ArrowButton::scroll()
 {
 	if (_shape == ARROW_BIG_UP)
 	{
-		_list->scrollUp();
+		_list->scrollUp(false);
 	}
 	else if (_shape == ARROW_BIG_DOWN)
 	{
-		_list->scrollDown();
+		_list->scrollDown(false);
 	}
 }
 
@@ -332,4 +332,18 @@ void ArrowButton::mouseRelease(Action *action, State *state)
 	}
 }
 
+/*
+ * Scrolls the associated list to top or bottom.
+ * @param action Pointer to an action.
+ * @param state State that the action handlers belong to.
+ */
+void ArrowButton::mouseClick(Action *action, State *state)
+{
+	ImageButton::mouseClick(action, state);
+	if (0 != _list && SDL_BUTTON_RIGHT == action->getDetails()->button.button) {
+		if (_shape == ARROW_BIG_UP) _list->scrollUp(true);
+		else if (_shape == ARROW_BIG_DOWN) _list->scrollDown(true);
+	}
+}
+
 }

src/Interface/ArrowButton.h

@@ -59,6 +59,8 @@ class ArrowButton : public ImageButton
 	void mousePress(Action *action, State *state);
 	/// Special handling for mouse releases.
 	void mouseRelease(Action *action, State *state);
+	/// Special handling for mouse clicks.
+	void mouseClick(Action *action, State *state);
 };
 
 }

src/Interface/TextList.cpp

@@ -604,30 +604,32 @@ void TextList::clearList()
 }
 
 /**
- * Scrolls the text in the list up by one row.
+ * Scrolls the text in the list up by one row or to the top.
+ * @param toMax If true then scrolls to the top of the list. false => one row up
  */
-void TextList::scrollUp()
+void TextList::scrollUp(bool toMax)
 {
 	if (!_scrolling)
 		return;
 	if (_texts.size() > _visibleRows && _scroll > 0)
 	{
-		_scroll--;
+		if (toMax) _scroll=0; else _scroll--;
 		_redraw = true;
 	}
 	updateArrows();
 }
 
 /**
- * Scrolls the text in the list down by one row.
+ * Scrolls the text in the list down by one row or to the bottom.
+ * @param toMax If true then scrolls to the bottom of the list. false => one row down
  */
-void TextList::scrollDown()
+void TextList::scrollDown(bool toMax)
 {
 	if (!_scrolling)
 		return;
 	if (_texts.size() > _visibleRows && _scroll < _texts.size() - _visibleRows)
 	{
-		_scroll++;
+		if (toMax) _scroll=_texts.size()-_visibleRows; else _scroll++;
 		_redraw = true;
 	}
 	updateArrows();
@@ -743,11 +745,11 @@ void TextList::mousePress(Action *action, State *state)
 {
 	if (action->getDetails()->button.button == SDL_BUTTON_WHEELUP)
 	{
-		scrollUp();
+		scrollUp(false);
 	}
 	else if (action->getDetails()->button.button == SDL_BUTTON_WHEELDOWN)
 	{
-		scrollDown();
+		scrollDown(false);
 	}
 	if (_selectable)
 	{

src/Interface/TextList.h

@@ -135,9 +135,9 @@ class TextList : public InteractiveSurface
 	/// Clears the list.
 	void clearList();
 	/// Scrolls the list up.
-	void scrollUp();
+	void scrollUp(bool toMax);
 	/// Scrolls the list down.
-	void scrollDown();
+	void scrollDown(bool toMax);
 	/// Sets the list scrolling.
 	void setScrolling(bool scrolling);
 	/// Draws the text onto the text list.