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

Merge branch 'feature-freebsd-posix' into develop

Browse Source
This commit is contained in:
Jinhao
2018-05-08 04:52:13 +08:00
parent 10da8dcd0b e2d795ab26
commit c72d8e25b4
32 changed files with 509 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/paint/graphics.cpp
View File

@@ -440,7 +440,7 @@ namespace paint
#endif
impl_->handle->string.tab_pixels = detail::raw_text_extent_size(impl_->handle, L"\t", 1).width;
impl_->handle->string.whitespace_pixels = detail::raw_text_extent_size(impl_->handle, L" ", 1).width;
if (impl_->changed == false)
impl_->changed = true;
}
@@ -833,11 +833,11 @@ namespace paint
}
#elif defined(NANA_X11)
auto & spec = nana::detail::platform_spec::instance();
Display * display = spec.open_display();
nana::detail::platform_scope_guard lock;
::XCopyArea(display,
impl_->handle->pixmap, reinterpret_cast<Window>(dst), impl_->handle->context,
sx, sy, width, height, dx, dy);
@@ -847,7 +847,7 @@ namespace paint
::XGetWindowAttributes(display, reinterpret_cast<Window>(dst), &attr);
if(BadWindow != spec.rev_error_handler() && attr.map_state != IsUnmapped)
::XMapWindow(display, reinterpret_cast<Window>(dst));
::XFlush(display);
#endif
}
@@ -1063,7 +1063,7 @@ namespace paint
{
auto const end = str + len;
auto i = std::find(str, end, '\t');
#if defined(NANA_LINUX) || defined(NANA_MACOS)
#if defined(NANA_POSIX)
impl_->handle->update_text_color();
#endif
if (i != end)