Review: Approve
> IMO the best way to solve the tabs issue is to run clang-format over the
> whole codebase and remove the conflicting codecheck rules.
Amen to that. We should do that.
lgtm, feel free to merge whenever.
Diff comments:
>
> === modified file 'src/graphic/wordwrap.cc'
> --- src/graphic/wordwrap.cc 2016-01-28 21:27:04 +0000
> +++ src/graphic/wordwrap.cc 2016-01-29 17:34:45 +0000
> @@ -33,32 +33,6 @@
> #include "graphic/rendertarget.h"
> #include "graphic/text/bidi.h"
>
> -namespace {
> -std::string as_editorfont(const std::string& text,
> - int ptsize =
> UI_FONT_SIZE_SMALL,
> - const
> RGBColor& clr = UI_FONT_CLR_FG) {
> - // UI Text is always bold due to historic reasons
I made that comment :). It is bold, because the text in settlers 2 was bold.
And that is also the reason why it is yellow. I was not a very original fellow
when I started Widelands I guess :).
Yes, let's finish the switchover first.
> - static boost::format
> - f("<rt keep_spaces=1><p><font face=serif size=%i bold=1
> shadow=1 color=%s>%s</font></p></rt>");
> - f % ptsize;
> - f % clr.hex_value();
> - f % richtext_escape(text);
> - return f.str();
> -}
> -
> -// This is inefficient; only call when we need the exact width.
> -uint32_t text_width(const std::string& text, int ptsize) {
> - return UI::g_fh1->render(as_editorfont(text, ptsize -
> UI::g_fh1->fontset().size_offset()))->width();
> -}
> -
> -// This is inefficient; only call when we need the exact height.
> -uint32_t text_height(const std::string& text, int ptsize) {
> - return UI::g_fh1->render(as_editorfont(text.empty() ? "." : text,
> -
> ptsize -
> UI::g_fh1->fontset().size_offset()))->height();
> -}
> -
> -} // namespace
> -
> namespace UI {
>
> /**
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1530124/+merge/284356
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1530124.
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
