Merge lp:~widelands-dev/widelands/choose-attack-soldiers into lp:widelands

[Benedikt Straub]

Use a MultilineTextarea for the soldier stats in the attack box

Now the height of the attack box changes instead of the width ;)
It´ll change whenever the mouse is moved in or out; the text line is now hidden when no soldier is pointed at, which looks more elegant than an empty space at the bottom IMHO.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4986. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/532836861.
Appveyor build 4767. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_choose_attack_soldiers-4767.

[GunChleoc (gunchleoc)]

The vertical size not being fixed is a problem - the attack box can start jumping up and down.

[Benedikt Straub (nordfriese)]

How many lines should I set as the always visible minimum? two?

[Toni Förster (stonerl)]

I'd say 2. That would be 20 soldiers right?

[Benedikt Straub (nordfriese)]

@Toni I mean the textarea showing the soldier stats below

Alternatively, option 5: since the usage tooltip is shown only over the headers, we could remove the textarea and put the soldier stats into an own tooltip

[GunChleoc (gunchleoc)]

I think the last idea is the best one :)

[Benedikt Straub (nordfriese)]

A tooltip it is :)

review: Needs Resubmitting

[GunChleoc (gunchleoc)]

Perfect :)

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5041. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/537114220.
Appveyor build 4821. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_choose_attack_soldiers-4821.

=== modified file 'src/wui/attack_box.cc'
--- src/wui/attack_box.cc	2019-05-11 18:19:20 +0000
+++ src/wui/attack_box.cc	2019-05-25 09:26:45 +0000
@@ -246,9 +246,6 @@
 		mainbox.add(remaining_soldiers_.get(), UI::Box::Resizing::kFullSize);
 	}
 
-	current_soldier_stats_.reset(new UI::Textarea(&mainbox, "", UI::Align::kCenter));
-	mainbox.add(current_soldier_stats_.get(), UI::Box::Resizing::kFullSize, UI::Align::kCenter);
-
 	soldiers_slider_->set_enabled(max_attackers > 0);
 	more_soldiers_->set_enabled(max_attackers > 0);
 }
@@ -322,12 +319,12 @@
 }
 
 void AttackBox::ListOfSoldiers::handle_mousein(bool) {
-	attack_box_->set_soldier_info_text();
+	set_tooltip(std::string());
 }
 
 bool AttackBox::ListOfSoldiers::handle_mousemove(uint8_t, int32_t x, int32_t y, int32_t, int32_t) {
 	if (const Widelands::Soldier* soldier = soldier_at(x, y)) {
-		attack_box_->set_soldier_info_text(
+		set_tooltip(
 		   (boost::format(_("HP: %1$u/%2$u  AT: %3$u/%4$u  DE: %5$u/%6$u  EV: %7$u/%8$u")) %
 		    soldier->get_health_level() % soldier->descr().get_max_health_level() %
 		    soldier->get_attack_level() % soldier->descr().get_max_attack_level() %
@@ -335,7 +332,7 @@
 		    soldier->get_evade_level() % soldier->descr().get_max_evade_level())
 		      .str());
 	} else {
-		attack_box_->set_soldier_info_text();
+		set_tooltip(std::string());
 	}
 	return true;
 }
 
=== modified file 'src/wui/attack_box.h'
--- src/wui/attack_box.h	2019-05-11 18:19:20 +0000
+++ src/wui/attack_box.h	2019-05-25 09:26:45 +0000
@@ -55,9 +55,6 @@
 
 	size_t count_soldiers() const;
 	std::vector<Widelands::Serial> soldiers() const;
-	void set_soldier_info_text(std::string text = "") {
-		current_soldier_stats_->set_text(text);
-	}
 
 	UI::Button* get_attack_button() const {
 		return attack_button_.get();
@@ -161,7 +158,6 @@
 
 	std::unique_ptr<ListOfSoldiers> attacking_soldiers_;
 	std::unique_ptr<ListOfSoldiers> remaining_soldiers_;
-	std::unique_ptr<UI::Textarea> current_soldier_stats_;
 	std::unique_ptr<UI::Button> attack_button_;
 
 	/// The last time the information in this Panel got updated