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

Merge branch 'hotfix-1.6.2' into develop-1.7

Browse Source
This commit is contained in:
Jinhao 2019-03-09 21:54:57 +08:00
commit 2470848fba
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/widgets/group.cpp
View File

@ -241,6 +241,14 @@ checkbox& group::add_option(std::string text)
group& group::enable_format_caption(bool format) group& group::enable_format_caption(bool format)
{ {
impl_->caption.format(format); impl_->caption.format(format);
// if the caption is already set, make sure the layout is updated
if(!caption().empty())
{
impl_->update_div();
impl_->place_content.collocate();
API::refresh_window(*this);
}
return *this; return *this;
} }

2
source/paint/image.cpp
View File

@ -228,7 +228,7 @@ namespace paint
//JFIF //JFIF
if (bytes > 11 && (0xe0ffd8ff == *reinterpret_cast<const unsigned*>(data)) && 0x4649464A == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6)) if (bytes > 11 && (0xe0ffd8ff == *reinterpret_cast<const unsigned*>(data)) && 0x4649464A == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6))
ptr = std::make_shared<detail::image_jpeg>(); ptr = std::make_shared<detail::image_jpeg>();
else if (bytes > 9 && (0x66697845 == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+5))) //Exif else if (bytes > 9 && (0x66697845 == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+6))) //Exif
ptr = std::make_shared<detail::image_jpeg>(); ptr = std::make_shared<detail::image_jpeg>();
#endif #endif
if ((!ptr) && (bytes > 40)) if ((!ptr) && (bytes > 40))