Added vtile_spaced and htile_spaced: tiles with specified spaces in between elements.

Author: djowel

examples/buttons/main.cpp

@@ -183,34 +183,22 @@ auto make_buttons(view& view_)
 
    return
       margin({20, 20, 20, 20},
-         vtile(
+         vtile_spaced(15.0, // space in between
             mbutton,
-            vspace(15),
             tbutton,
-            vspace(15),
             hold(lbutton),
-            vspace(15),
             hold(reset),
-            vspace(15),
             note,
-            vspace(15),
             disabled_button,
-            vspace(15),
-            htile(
+            htile_spaced(10.0, // space in between
                label("Enabled"),
-               hspace(10),
                align_left(slide_btn1),
-               hspace(10),
                label("Slide Buttons"),
                align_right(slide_btn2),
-               hspace(10),
                disabled_label
             ),
-            vspace(15),
             hgrid(left, center, right),
-            vspace(15),
             hgrid(left_rounded, center_square, right_rounded),
-            vspace(15),
             custom
          )
       );
@@ -234,15 +222,11 @@ auto make_controls(view& view_)
    auto  check_boxes =
          group("Check boxes",
             margin({10, 45, 20, 20},
-               vtile(
+               vtile_spaced(10.0, // space in between
                   align_left(check_box1),
-                  vspace(10),
                   align_left(check_box2),
-                  vspace(10),
                   align_left(check_box3),
-                  vspace(10),
                   align_left(check_box4),
-                  vspace(10),
                   align_left(check_box5)
                )
             )
@@ -259,13 +243,10 @@ auto make_controls(view& view_)
    auto  radio_buttons =
          group("Radio Buttons",
             margin({10, 45, 20, 20},
-               vtile(
+               vtile_spaced(10.0, // space in between
                   align_left(radio_button1),
-                  vspace(10),
                   align_left(radio_button2),
-                  vspace(10),
                   align_left(radio_button3),
-                  vspace(10),
                   align_left(radio_button4)
                )
             )

examples/model/main.cpp

@@ -112,7 +112,6 @@ using elements::basic_knob;
 using elements::selection_menu;
 using elements::input_box;
 using elements::label;
-using elements::hspace;
 using elements::view;
 using elements::app;
 using elements::window;
@@ -267,9 +266,8 @@ auto make_preset_menu(my_model& model, view& view_)
       align_top(
          align_center(
             hsize(180,
-               htile(
+               htile_spaced(10.0,
                   label("Preset:"),
-                  hspace(10),
                   preset_menu.first
                )
             )

examples/range_slider/main.cpp

@@ -89,14 +89,12 @@ auto make_range_slider = [] (view& _view, auto _range_slider, std::string _title
     return margin(
         {10, 10, 10, 10},
         layer(
-            vtile(
-                vspace(10),
+            vtile_spaced(10,
                 align_center(
                     label(_title).font_size(18)
                 ),
-                vspace(10),
                 margin(
-                    {50, 10, 50, 10},
+                    {50, 10, 50, 0},
                     hold(_range_slider)
                 ),
                 layer(
@@ -221,14 +219,12 @@ auto make_log_range_slider(view& _view) {
     return margin(
         {10, 10, 10, 10},
         layer(
-            vtile(
-                vspace(10),
+            vtile_spaced(10,
                 align_center(
                     label("Overlapping Logarithmic range slider").font_size(18)
                 ),
-                vspace(10),
                 margin(
-                    {50, 10, 50, 10},
+                    {50, 10, 50, 0},
                     hold(_range_slider)
                 ),
                 layer(

examples/status_bars/main.cpp

@@ -68,12 +68,10 @@ auto make_bars(view& view_)
 
    return
       margin({20, 20, 20, 20},
-         htile(
+         htile_spaced(20,
             align_middle(start_stop),
-            hspace(10),
-            vtile(
+            vtile_spaced(10,
                vsize(27, hold(prog_bar)),
-               vspace(10),
                vsize(27, hold(bsy_bar))
             )
          )

lib/include/elements/element/tile.hpp

@@ -8,6 +8,7 @@
 
 #include <elements/view.hpp>
 #include <elements/element/composite.hpp>
+#include <elements/element/margin.hpp>
 #include <memory>
 
 namespace cycfi::elements
@@ -32,7 +33,7 @@ namespace cycfi::elements
 
    using vtile_composite = vector_composite<vtile_element>;
 
-   template <typename... E>
+   template <concepts::Element... E>
    inline auto vtile(E&&... elements)
    {
       using composite = array_composite<sizeof...(elements), vtile_element>;
@@ -42,6 +43,23 @@ namespace cycfi::elements
       return r;
    }
 
+   template <concepts::Element FE, concepts::Element... E>
+   inline auto vtile_spaced(float space, FE&& first, E&&... rest)
+   {
+      using composite = array_composite<1+(sizeof...(rest)), vtile_element>;
+      composite r{};
+
+      std::size_t i = 0;
+      r[i] = share(std::forward<FE>(first));
+      auto fill_interleaved = [&, i = 1](auto&& e) mutable
+      {
+         r[i++] = share(margin_top(space, std::forward<decltype(e)>(e)));
+      };
+
+      (fill_interleaved(rest), ...);
+      return r;
+   }
+
    ////////////////////////////////////////////////////////////////////////////
    // Horizontal Tiles
    ////////////////////////////////////////////////////////////////////////////
@@ -62,7 +80,7 @@ namespace cycfi::elements
 
    using htile_composite = vector_composite<htile_element>;
 
-   template <typename... E>
+   template <concepts::Element... E>
    inline auto htile(E&&... elements)
    {
       using composite = array_composite<sizeof...(elements), htile_element>;
@@ -71,6 +89,23 @@ namespace cycfi::elements
       r = container{{share(std::forward<E>(elements))...}};
       return r;
    }
+
+   template <concepts::Element FE, concepts::Element... E>
+   inline auto htile_spaced(float space, FE&& first, E&&... rest)
+   {
+      using composite = array_composite<1+(sizeof...(rest)), htile_element>;
+      composite r{};
+
+      std::size_t i = 0;
+      r[i] = share(std::forward<FE>(first));
+      auto fill_interleaved = [&, i = 1](auto&& e) mutable
+      {
+         r[i++] = share(margin_left(space, std::forward<decltype(e)>(e)));
+      };
+
+      (fill_interleaved(rest), ...);
+      return r;
+   }
 }
 
 #endif