widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/dismantlesite-color into lp:widelands.

Commit message:
Changed color of statistics string for Dismantlesite to match Constructionsite.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/dismantlesite-color/+merge/288866

A bit of UI consistency... "x% dismantled" is now using the dark font color.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/dismantlesite-color into lp:widelands.

=== modified file 'src/logic/map_objects/tribes/dismantlesite.cc'
--- src/logic/map_objects/tribes/dismantlesite.cc	2016-02-18 18:27:52 +0000
+++ src/logic/map_objects/tribes/dismantlesite.cc	2016-03-13 09:28:07 +0000
@@ -30,6 +30,7 @@
 #include "graphic/animation.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/text_constants.h"
 #include "logic/editor_game_base.h"
 #include "logic/game.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
@@ -93,7 +94,8 @@
 void DismantleSite::update_statistics_string(std::string* s)
 {
 	unsigned int percent = (get_built_per64k() * 100) >> 16;
-	*s = (boost::format(_("%u%% dismantled")) % percent).str();
+	*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_DARK.hex_value() %
+			(boost::format(_("%u%% dismantled")) % percent).str()).str();
 }
 
 /*