0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reimplement color2hexa without using sprintf

Browse source
This commit is contained in:
Charles Dang 2016-11-24 23:00:53 +11:00
parent 60450ed108
commit f5f5758985
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/font/text_formatting.cpp
View file

@ -29,21 +29,19 @@ std::string unit32_to_pango_color(uint32_t rgb)
h << "#"
<< std::hex << std::setfill('0') << std::setw(2) << ((rgb & 0xFF0000) >> 16)
<< std::hex << std::setfill('0') << std::setw(2) << ((rgb & 0x00FF00) >> 8)
<< std::hex << std::setfill('0') << std::setw(2) << ( rgb & 0x0000FF);
<< std::hex << std::setfill('0') << std::setw(2) << (rgb & 0x0000FF);
return h.str();
}
std::string color2hexa(const SDL_Color &color)
std::string color2hexa(const SDL_Color& color)
{
char buf[7];
sprintf(buf, "%02x%02x%02x", color.r, color.g, color.b);
return buf;
return unit32_to_pango_color((color.r << 16 ) + (color.g << 8) + (color.b));
}
std::string span_color(const SDL_Color &color)
std::string span_color(const SDL_Color& color)
{
return "<span foreground=\"#" + font::color2hexa(color) + "\">";
return "<span color='" + color2hexa(color) + "'>";
}
std::string get_pango_color_from_id(const std::string& id)