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

std::string_view

Browse Source
This commit is contained in:
Jinhao
2018-06-09 01:21:10 +08:00
parent ffee0e5a3b
commit fc7743cbe2
8 changed files with 263 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/paint/text_renderer.cpp
View File

@@ -169,8 +169,12 @@ namespace nana
dum_graph.bitblt(r, graph, pos);
#ifdef _nana_std_has_string_view
dum_graph.string({}, { i.begin, len }, graph.palette(true));
#else
dum_graph.palette(true, graph.palette(true));
dum_graph.string({}, i.begin, len);
#endif
r.x = pos.x;
r.y = top;
@@ -233,12 +237,11 @@ namespace nana
const std::size_t len = i.end - i.begin;
if(len > 1)
{
std::unique_ptr<unsigned[]> pixel_buf(new unsigned[len]);
//Find the char that should be splitted
#ifdef _nana_std_has_string_view
graph.glyph_pixels({ i.begin, len }, pixel_buf.get());
auto pixel_buf = graph.glyph_pixels({ i.begin, len });
#else
std::unique_ptr<unsigned[]> pixel_buf(new unsigned[len]);
graph.glyph_pixels(i.begin, len, pixel_buf.get());
#endif
@@ -458,14 +461,16 @@ namespace nana
std::size_t len = i.end - i.begin;
if(len > 1)
{
std::unique_ptr<unsigned[]> scope_res(new unsigned[len]);
auto pxbuf = scope_res.get();
//Find the char that should be splitted
#ifdef _nana_std_has_string_view
graph.glyph_pixels({ i.begin, len }, pxbuf);
auto scope_res = graph.glyph_pixels({ i.begin, len });
auto pxbuf = scope_res.get();
#else
std::unique_ptr<unsigned[]> scope_res(new unsigned[len]);
auto pxbuf = scope_res.get();
graph.glyph_pixels(i.begin, len, pxbuf);
#endif
std::size_t idx_head = 0, idx_splitted;
do
@@ -639,15 +644,17 @@ namespace nana
break;
}
#ifdef _nana_std_has_string_view
graph_.bidi_string(pos, text);
#else
graph_.bidi_string(pos, text.c_str(), text.size());
#endif
return;
}
#ifdef _nana_std_has_string_view
const auto ellipsis = graph_.text_extent_size(std::string_view{ "...", 3 }).width;
std::unique_ptr<unsigned[]> pixels(new unsigned[text.size()]);
graph_.glyph_pixels({ text.c_str(), text.size() }, pixels.get());
auto pixels = graph_.glyph_pixels({ text.c_str(), text.size() });
#else
const auto ellipsis = graph_.text_extent_size("...", 3).width;
@@ -674,7 +681,11 @@ namespace nana
} while (p != end);
pos.x += static_cast<int>(width - ellipsis - substr_px) + ellipsis;
#ifdef _nana_std_has_string_view
graph_.bidi_string(pos, { text.c_str() + substr_len, text.size() - substr_len });
#else
graph_.bidi_string(pos, text.c_str() + substr_len, text.size() - substr_len);
#endif
pos.x -= ellipsis;
}
else
@@ -691,8 +702,11 @@ namespace nana
if (align::center == text_align_ex_)
pos.x += (width - substr_px - ellipsis) / 2;
#ifdef _nana_std_has_string_view
graph_.bidi_string(pos, { text.c_str(), substr_len });
#else
graph_.bidi_string(pos, text.c_str(), substr_len);
#endif
pos.x += substr_px;
}