don't lose scroll position when reordering

myk002 · myk002 · commit 4819d6baa2ce · 2015-05-11T18:27:45.000-07:00
diff --git a/src/Basescape/CraftSoldiersState.cpp b/src/Basescape/CraftSoldiersState.cpp
@@ -247,6 +247,7 @@ void CraftSoldiersState::btnOkClick(Action *)
  */
 void CraftSoldiersState::initList()
 {
+	size_t originalScrollPos = _lstSoldiers->getScroll();
 	int row = 0;
 	_lstSoldiers->clearList();
 	Craft *c = _base->getCrafts()->at(_craft);
@@ -272,6 +273,7 @@ void CraftSoldiersState::initList()
 	}
 
 	_lstSoldiers->draw();
+	_lstSoldiers->scrollTo(originalScrollPos);
 
 	_txtAvailable->setText(tr("STR_SPACE_AVAILABLE").arg(c->getSpaceAvailable()));
 	_txtUsed->setText(tr("STR_SPACE_USED").arg(c->getSpaceUsed()));

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,7 @@ void CraftSoldiersState::btnOkClick(Action *)`
`247`	`247`	`*/`
`248`	`248`	`void CraftSoldiersState::initList()`
`249`	`249`	`{`
	`250`	`+ size_t originalScrollPos = _lstSoldiers->getScroll();`
`250`	`251`	`int row = 0;`
`251`	`252`	`_lstSoldiers->clearList();`
`252`	`253`	`Craft *c = _base->getCrafts()->at(_craft);`
`@@ -272,6 +273,7 @@ void CraftSoldiersState::initList()`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`_lstSoldiers->draw();`
	`276`	`+ _lstSoldiers->scrollTo(originalScrollPos);`
`275`	`277`
`276`	`278`	`_txtAvailable->setText(tr("STR_SPACE_AVAILABLE").arg(c->getSpaceAvailable()));`
`277`	`279`	`_txtUsed->setText(tr("STR_SPACE_USED").arg(c->getSpaceUsed()));`