widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1774591-loading-screen-tips into lp:widelands.

Commit message:
Fix horizontal centering for game tips.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1774591 in widelands: "Center game/editor tips"
  https://bugs.launchpad.net/widelands/+bug/1774591

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1774591-loading-screen-tips/+merge/353556
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1774591-loading-screen-tips into lp:widelands.

=== modified file 'src/graphic/text/rt_render.cc'
--- src/graphic/text/rt_render.cc	2018-05-27 06:11:04 +0000
+++ src/graphic/text/rt_render.cc	2018-08-22 07:57:35 +0000
@@ -1443,6 +1443,9 @@
 			uint8_t p = a["padding"].get_int();
 			padding.left = padding.top = padding.right = padding.bottom = p;
 		}
+		// TODO(GunChleoc): padding_l and padding_r don't seem to produce balanced results.
+		// We ran into that with the game tips,
+		// using "<rt padding_l=48 padding_t=28 padding_r=48 padding_b=28>" there.
 		if (a.has("padding_r"))
 			padding.right = a["padding_r"].get_int();
 		if (a.has("padding_b"))

=== modified file 'src/graphic/text_layout.cc'
--- src/graphic/text_layout.cc	2018-07-28 07:02:25 +0000
+++ src/graphic/text_layout.cc	2018-08-22 07:57:35 +0000
@@ -75,9 +75,7 @@
 
 std::string as_game_tip(const std::string& txt) {
 	static boost::format f(
-	   "<rt padding_l=48 padding_t=28 padding_r=48 padding_b=28>"
-	   "<p align=center><font color=21211b face=serif size=16>%s</font></p></rt>");
-
+	   "<rt><p align=center><font color=21211b face=serif size=16>%s</font></p></rt>");
 	f % txt;
 	return f.str();
 }

=== modified file 'src/wui/game_tips.cc'
--- src/wui/game_tips.cc	2018-07-08 13:53:45 +0000
+++ src/wui/game_tips.cc	2018-08-22 07:57:35 +0000
@@ -32,6 +32,8 @@
 
 #define BG_IMAGE "images/loadscreens/tips_bg.png"
 
+constexpr int kTextPadding = 48;
+
 GameTips::GameTips(UI::ProgressWindow& progressWindow, const std::vector<std::string>& names)
    : lastUpdated_(0),
      updateAfter_(0),
@@ -108,7 +110,7 @@
 	rt.blit(pt, pic_background);
 
 	std::shared_ptr<const UI::RenderedText> rendered_text =
-	   UI::g_fh->render(as_game_tip(tips_[index].text), w);
+	   UI::g_fh->render(as_game_tip(tips_[index].text), w - 2 * kTextPadding);
 	pt = Vector2i((g_gr->get_xres() - rendered_text->width()) / 2,
 	              (g_gr->get_yres() - rendered_text->height()) / 2);
 	rendered_text->draw(rt, pt);