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

code review

Browse Source
This commit is contained in:
Jinhao
2015-10-07 18:01:46 +08:00
parent c6f13c1748
commit 573a5bee86
18 changed files with 36 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/paint/text_renderer.cpp
View File

@@ -118,23 +118,10 @@ namespace nana
{
graphics & graph;
int x, endpos;
//::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)
{
omitted_pixels = (omitted ? graph.text_extent_size(STR("..."), 3).width : 0);
if(endpos - x > static_cast<int>(omitted_pixels))
this->endpos -= omitted_pixels;
else
this->endpos = x;
}
*/
draw_string_omitted(graphics& graph, int x, int endpos, bool omitted)
: graph(graph), x(x), endpos(endpos)
{
@@ -171,7 +158,7 @@ namespace nana
nana::paint::graphics dum_graph({ r.width, r.height });
dum_graph.bitblt(r, graph, pos);
//dum_graph.set_text_color(fgcolor); //deprecated
dum_graph.set_text_color(graph.palette(true));
dum_graph.string({}, i.begin, len);