Merge lp:~widelands-dev/widelands/statistics_gui into lp:widelands

[GunChleoc]

GUI fixes for General Statistics:

- Fixed pointer error in box.cc. This fixes the button width in the general statistics GUI.
- Fixed text cropping in DiscreteSlider.
- Gave plot area bottom axis labels some space.
- autofit_ui_text now calls richtext_escape.

GUI fixes for General Statistics:

- Fixed pointer error in box.cc. This fixes the button width in the general statistics GUI.
- Fixed text cropping in DiscreteSlider.
- Gave plot area bottom axis labels some space.
- autofit_ui_text now calls richtext_escape.

[kaputtnik (franku)]

Works :-)

review: Approve (testing)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 763. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/110920193.
Appveyor build 609. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_statistics_gui-609.

[TiborB (tiborb95)]

Code looks good

review: Approve

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/graphic/text_layout.cc'
--- src/graphic/text_layout.cc	2016-02-18 09:29:38 +0000
+++ src/graphic/text_layout.cc	2016-03-02 17:15:03 +0000
@@ -138,10 +138,13 @@
 
 const Image* autofit_ui_text(const std::string& text, int width, RGBColor color, int fontsize) {
 	const Image* result =
-	   UI::g_fh1->render(as_uifont(text, fontsize, color, UI::FontSet::Face::kSans));
+		UI::g_fh1->render(as_uifont(richtext_escape(text), fontsize, color, UI::FontSet::Face::kSans));
 	if (width > 0) { // Autofit
 		for (; result->width() > width && fontsize >= kMinimumFontSize; --fontsize) {
-			result = UI::g_fh1->render(as_uifont(text, fontsize, color, UI::FontSet::Face::kCondensed));
+			result = UI::g_fh1->render(as_uifont(richtext_escape(text),
+															 fontsize,
+															 color,
+															 UI::FontSet::Face::kCondensed));
 		}
 	}
 	return result;

=== modified file 'src/ui_basic/box.cc'
--- src/ui_basic/box.cc	2016-02-04 19:46:40 +0000
+++ src/ui_basic/box.cc	2016-03-02 17:15:03 +0000
@@ -347,7 +347,7 @@
 	const Item & it = items_[idx];
 
 	get_item_desired_size(idx, depth, breadth);
-	depth += it.assigned_var_depth;
+	*depth += it.assigned_var_depth;
 }
 
 /**

=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2016-02-03 18:09:15 +0000
+++ src/ui_basic/slider.cc	2016-03-02 17:15:03 +0000
@@ -576,7 +576,7 @@
 	uint32_t gap_n = get_w() / labels.size();
 
 	for (uint32_t i = 0; i < labels.size(); i++) {
-		dst.blit(Point(gap_1 + i * gap_n, get_h() + 2),
+		dst.blit(Point(gap_1 + i * gap_n, get_h()),
 				 UI::g_fh1->render(as_uifont(labels[i])),
 				 BlendMode::UseAlpha,
 				 UI::Align::kBottomCenter);
@@ -597,7 +597,7 @@
 	slider.set_pos(Point(w / (2 * labels.size()) - slider.cursor_size_ / 2, 0));
 	slider.set_size
 		(w - (w / labels.size()) + slider.cursor_size_,
-		 h - UI::g_fh1->render(as_uifont("."))->height() - 2);
+		 h - UI::g_fh1->render(as_uifont("."))->height() + 2);
 	Panel::layout();
 }
 

=== modified file 'src/wui/plot_area.cc'
--- src/wui/plot_area.cc	2016-01-29 08:37:22 +0000
+++ src/wui/plot_area.cc	2016-03-02 17:15:03 +0000
@@ -43,7 +43,7 @@
 const uint32_t days = 24 * 60 * 60 * 1000;
 
 const int32_t spacing = 5;
-const int32_t space_at_bottom = 15;
+const int32_t space_at_bottom = 20;
 const int32_t space_at_right = 10;
 const int32_t space_left_of_label = 15;
 const uint32_t nr_samples = 30;   // How many samples per diagramm when relative plotting