Merge lp:~widelands-dev/widelands/bug-1532279 into lp:widelands

[GunChleoc]

- Increased label height in spinboxes to avoid autogeneration of scrollbar button by the MultilineTextarea.
- Added size offset to some fonts that were too small.

The extra button belonged to the scrollbar generated by the label, which is a Multilinetextarea. So, I gave the label a bit more height.

[bunnybot (widelandsofficial)]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch lp:~widelands-dev/widelands/bug-1532279 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1532279

You can give me commands by starting a line with @bunnybot <command>. I understand:
 merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set.

[bunnybot (widelandsofficial)]

Travis build 353 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/104294117.

[SirVer (sirver)]

One nit, otherwise lgtm.

review: Approve

[SirVer (sirver)]

And also tested, works fine.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'i18n/fonts.lua'
--- i18n/fonts.lua	2015-10-31 12:11:44 +0000
+++ i18n/fonts.lua	2016-01-24 08:33:27 +0000
@@ -46,7 +46,8 @@
 
    devanagari = {
       serif = "Nakula/nakula.ttf",
-      direction = "rtl"
+      direction = "rtl",
+      size_offset = 2
    },
 
    hebrew = {
@@ -56,11 +57,13 @@
       sans = "Culmus/TaameyFrankCLM-Medium.ttf",
       sans_bold = "TaameyFrankCLM-Bold.ttf",
       sans_italic = "Culmus/TaameyFrankCLM-MediumOblique.ttf",
-      direction = "rtl"
+      direction = "rtl",
+      size_offset = 4
    },
 
    myanmar = {
       serif = "mmrCensus/mmrCensus.ttf",
+      size_offset = 2
    },
 
    sinhala = {

=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2016-01-01 18:41:20 +0000
+++ src/ui_basic/spinbox.cc	2016-01-24 08:33:27 +0000
@@ -108,7 +108,8 @@
 	uint32_t padding = 2;
 	uint32_t actual_w = std::max(w, unit_w);
 	uint32_t no_padding = (is_big ? 6 : 4);
-	uint32_t texth = UI::g_fh1->render(as_uifont("."))->height();
+	// Give some height margin = 2 to keep the label from generating a scrollbar.
+	uint32_t texth = UI::g_fh1->render(as_uifont("."))->height() + 2;
 	uint32_t buttonh = 20;
 
 	// 40 is an ad hoc width estimate for the MultilineTextarea scrollbar + a bit of text.

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2016-01-05 09:54:44 +0000
+++ src/ui_fsmenu/options.cc	2016-01-24 08:33:27 +0000
@@ -189,7 +189,7 @@
 
 	// Saving options
 	sb_autosave_
-		(&box_saving_, 0, 0, column_width_, 240,
+		(&box_saving_, 0, 0, column_width_, 250,
 		 opt.autosave / 60, 0, 100, _("Save game automatically every"),
 		 /** TRANSLATORS: Options: Save game automatically every: */
 		 /** TRANSLATORS: This will have a number added in front of it */
@@ -197,13 +197,13 @@
 		 g_gr->images().get("pics/but3.png"), UI::SpinBox::Type::kBig),
 
 	sb_rolling_autosave_
-		(&box_saving_, 0, 0, column_width_, 240,
+		(&box_saving_, 0, 0, column_width_, 250,
 		 opt.rolling_autosave, 1, 20, _("Maximum number of autosave files"),
 		 "",
 		 g_gr->images().get("pics/but3.png"), UI::SpinBox::Type::kBig),
 
 	sb_remove_replays_
-		(&box_saving_, 0, 0, column_width_, 240,
+		(&box_saving_, 0, 0, column_width_, 250,
 		 opt.remove_replays, 0, 365, _("Remove replays older than:"),
 		 /** TRANSLATORS: Options: Remove Replays older than: */
 		 /** TRANSLATORS: This will have a number added in front of it */