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

add a new tabbar_lite widget

Browse Source
This commit is contained in:
Jinhao
2015-08-14 01:38:23 +08:00
parent ff7a1f9510
commit 42dd27b68f
4 changed files with 355 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/paint/graphics.cpp
View File

@@ -451,7 +451,7 @@ namespace paint
return true;
}
nana::size graphics::bidi_extent_size(const nana::string& str) const
nana::size graphics::bidi_extent_size(const std::wstring& str) const
{
nana::size sz;
#if defined NANA_UNICODE
@@ -472,6 +472,11 @@ namespace paint
return sz;
}
::nana::size graphics::bidi_extent_size(const std::string& str) const
{
return bidi_extent_size(std::wstring{ ::nana::charset(str, ::nana::unicode::utf8) });
}
bool graphics::text_metrics(unsigned & ascent, unsigned& descent, unsigned& internal_leading) const
{
if(handle_)
@@ -880,6 +885,12 @@ namespace paint
return static_cast<unsigned>(moved_pos.x - pos.x);
}
unsigned graphics::bidi_string(const point& pos, const char* str, std::size_t len)
{
std::wstring wstr = ::nana::charset(std::string(str, str + len), ::nana::unicode::utf8);
return bidi_string(pos, wstr.data(), wstr.size());
}
void graphics::blend(const nana::rectangle& r, const ::nana::color& clr, double fade_rate)
{
if (handle_)