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

Merge branch 'develop' of https://github.com/beru/nana into beru-develop

Browse Source 
Conflicts:
	source/gui/widgets/skeletons/text_editor.cpp
	source/gui/widgets/textbox.cpp
	source/paint/detail/image_bmp.hpp
	source/paint/detail/image_ico.hpp
This commit is contained in:
Jinhao
2015-08-01 22:08:06 +08:00
parent abdf93a862 0e024d3227
commit 7d868f2377
22 changed files with 322 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/paint/image.cpp
View File

@@ -70,6 +70,31 @@ namespace paint
return false;
}
bool image_ico::open(void* buff, size_t sz)
{
close();
#if defined(NANA_WINDOWS)
HICON handle = CreateIconFromResource((PBYTE)buff, sz, TRUE, 0x00030000);
if(handle)
{
ICONINFO info;
if (::GetIconInfo(handle, &info) != 0)
{
HICON * p = new HICON(handle);
ptr_ = std::shared_ptr<HICON>(p, handle_deleter());
size_.width = (info.xHotspot << 1);
size_.height = (info.yHotspot << 1);
::DeleteObject(info.hbmColor);
::DeleteObject(info.hbmMask);
return true;
}
}
#else
if(is_ico_){} //kill the unused compiler warning in Linux.
#endif
return false;
}
bool image_ico::alpha_channel() const
{
return false;
@@ -236,6 +261,13 @@ namespace paint
return false;
}
bool image::open_icon(void* buff, size_t sz)
{
image::image_impl_interface * helper = new detail::image_ico(true);
image_ptr_ = std::shared_ptr<image_impl_interface>(helper);
return helper->open(buff, sz);
}
bool image::empty() const
{
return ((nullptr == image_ptr_) || image_ptr_->empty());