Merge lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

[Benedikt Straub]

Hold down Ctrl when using the capacity arrow buttons in military- and trainingsites to set the capacity to min/max

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3987. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/429190145.
Appveyor build 3785. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_soldier_capacity_ctrl-3785.

[GunChleoc (gunchleoc)]

I comment with an idea.

[Benedikt Straub (nordfriese)]

OK implemented it like this.

[GunChleoc (gunchleoc)]

Code LGTM now, not tested.

[Toni Förster (stonerl)]

Tested it; and it works as advertised.

review: Approve

[GunChleoc (gunchleoc)]

Thanks!

Since we're in feature freeze, merging will have to wait until after Build 20.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4646. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/511062400.
Appveyor build 4433. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_soldier_capacity_ctrl-4433.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4673. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516239713.
Appveyor build 4459. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_soldier_capacity_ctrl-4459.

[GunChleoc (gunchleoc)]

@bunnybot merge

[Toni Förster (stonerl)]

This doesn't work for me any more in the latest trunk...

[Toni Förster (stonerl)]

Forget, my last comment I was just confused. Sorry.

=== modified file 'src/wui/soldiercapacitycontrol.cc'
--- src/wui/soldiercapacitycontrol.cc	2019-02-23 11:00:49 +0000
+++ src/wui/soldiercapacitycontrol.cc	2019-04-05 14:13:25 +0000
@@ -69,7 +69,7 @@
                32,
                UI::ButtonStyle::kWuiMenu,
                g_gr->images().get("images/wui/buildings/menu_down_train.png"),
-               _("Decrease capacity")),
+               _("Decrease capacity. Hold down Ctrl to set the capacity to the lowest value")),
      increase_(this,
                "increase",
                0,
@@ -78,7 +78,7 @@
                32,
                UI::ButtonStyle::kWuiMenu,
                g_gr->images().get("images/wui/buildings/menu_up_train.png"),
-               _("Increase capacity")),
+               _("Increase capacity. Hold down Ctrl to set the capacity to the highest value")),
      value_(this, "199", UI::Align::kCenter) {
 	decrease_.sigclicked.connect(
 	   boost::bind(&SoldierCapacityControl::click_decrease, boost::ref(*this)));
@@ -112,11 +112,17 @@
 }
 
 void SoldierCapacityControl::click_decrease() {
-	change_soldier_capacity(-1);
+	const SoldierControl* soldiers = building_.soldier_control();
+	assert(soldiers);
+	change_soldier_capacity((SDL_GetModState() & KMOD_CTRL) ?
+			soldiers->min_soldier_capacity() - soldiers->soldier_capacity() : -1);
 }
 
 void SoldierCapacityControl::click_increase() {
-	change_soldier_capacity(1);
+	const SoldierControl* soldiers = building_.soldier_control();
+	assert(soldiers);
+	change_soldier_capacity((SDL_GetModState() & KMOD_CTRL) ?
+			soldiers->max_soldier_capacity() - soldiers->soldier_capacity() : 1);
 }
 
 UI::Panel* create_soldier_capacity_control(UI::Panel& parent,