From fd8261c6a2b0aee6f7d6149258a55a862e88d915 Mon Sep 17 00:00:00 2001 From: ErrorFlynn Date: Thu, 7 Mar 2019 04:36:27 -0500 Subject: [PATCH 1/2] fix for issue #399 --- source/gui/widgets/group.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/gui/widgets/group.cpp b/source/gui/widgets/group.cpp index f1ca7821..9bb62ff1 100644 --- a/source/gui/widgets/group.cpp +++ b/source/gui/widgets/group.cpp @@ -235,6 +235,14 @@ checkbox& group::add_option(std::string text) group& group::enable_format_caption(bool 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; } From 845dda8c3ea898a73cbc46ab08948b9708aa8f4a Mon Sep 17 00:00:00 2001 From: ErrorFlynn Date: Thu, 7 Mar 2019 12:42:59 -0500 Subject: [PATCH 2/2] corrected wrong offset for "Exif" bytes --- source/paint/image.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/paint/image.cpp b/source/paint/image.cpp index 1781a657..53b71227 100644 --- a/source/paint/image.cpp +++ b/source/paint/image.cpp @@ -228,7 +228,7 @@ namespace paint //JFIF if (bytes > 11 && (0xe0ffd8ff == *reinterpret_cast(data)) && 0x4649464A == *reinterpret_cast(reinterpret_cast(data)+6)) ptr = std::make_shared(); - else if (bytes > 9 && (0x66697845 == *reinterpret_cast(reinterpret_cast(data)+5))) //Exif + else if (bytes > 9 && (0x66697845 == *reinterpret_cast(reinterpret_cast(data)+6))) //Exif ptr = std::make_shared(); #endif if ((!ptr) && (bytes > 40))