mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix color issues

Browse Source
This commit is contained in:
Jinhao
2015-09-14 01:48:30 +08:00
parent edd7de4e8b
commit e97d2cb20f
7 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/paint/text_renderer.cpp
View File

@@ -118,11 +118,12 @@ namespace nana
{
graphics & graph;
int x, endpos;
::nana::color fgcolor;
//::nana::color fgcolor; //deprecated
unsigned omitted_pixels;
nana::unicode_bidi bidi;
std::vector<nana::unicode_bidi::entity> reordered;
/* //deprecated
draw_string_omitted(graphics& graph, int x, int endpos, const ::nana::color& fgcolor, bool omitted)
: graph(graph), x(x), endpos(endpos), fgcolor(fgcolor)
{
@@ -132,6 +133,7 @@ namespace nana
else
this->endpos = x;
}
*/
draw_string_omitted(graphics& graph, int x, int endpos, bool omitted)
: graph(graph), x(x), endpos(endpos)
@@ -169,7 +171,8 @@ namespace nana
nana::paint::graphics dum_graph({ r.width, r.height });
dum_graph.bitblt(r, graph, pos);
dum_graph.set_text_color(fgcolor);
//dum_graph.set_text_color(fgcolor); //deprecated
dum_graph.set_text_color(graph.palette(true));
dum_graph.string({}, i.begin, len);
r.x = pos.x;