Merge branch 'develop' into cairo_2023

cycfi · Nov 17, 2023 · 36efa23 · 36efa23
2 parents f304049 + 7de8777
commit 36efa23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/include/elements/element/size.hpp b/lib/include/elements/element/size.hpp
@@ -63,8 +63,9 @@ namespace cycfi { namespace elements
    template <typename Subject>
    inline void size_element<Subject>::prepare_subject(context& ctx)
    {
-      ctx.bounds.right = ctx.bounds.left + _size.x;
-      ctx.bounds.bottom = ctx.bounds.top + _size.y;
+      auto e_limits = this->subject().limits(ctx);
+      ctx.bounds.right = ctx.bounds.left + e_limits.min.x;
+      ctx.bounds.bottom = ctx.bounds.top + e_limits.min.y;
    }
 
    ////////////////////////////////////////////////////////////////////////////

diff --git a/lib/src/element/gallery/icon_button.cpp b/lib/src/element/gallery/icon_button.cpp
@@ -83,7 +83,7 @@ namespace cycfi { namespace elements
 
       draw_icon_button(
          ctx, value? _code2 : _code1, _size * get_theme().icon_font._size
-         , _body_color, true, hilite, enabled
+         , _body_color, false, hilite, enabled
       );
    }