Merge branch 'skia_2024'

Author: djowel

examples/status_bars/main.cpp

@@ -9,6 +9,7 @@
 using namespace cycfi::elements;
 using namespace std::chrono_literals;
 
+constexpr auto bred     = colors::red.opacity(0.4);
 constexpr auto bgreen   = colors::green.level(0.7).opacity(0.8);
 constexpr auto pgold    = colors::gold.opacity(0.8);
 
@@ -42,12 +43,12 @@ void prog_animate(concepts::StatusBar auto& prog_bar, view& view_)
 
 auto make_bars(view& view_)
 {
-   auto prog_bar        = share(progress_bar(rbox(colors::black), rbox(pgold)));
-   auto bsy_bar         = share(busy_bar(rbox(colors::black), rbox(bgreen)));
-   auto start_stop      = toggle_icon_button(icons::play, icons::stop, 2.0);
+   auto prog_bar = share(progress_bar(rbox(colors::black), rbox(pgold)));
+   auto bsy_bar = share(busy_bar(rbox(colors::black), rbox(bgreen)));
+   auto start_stop = toggle_icon_button(icons::play, icons::stop, 2.0, bred);
 
    start_stop.on_click =
-      [prog_bar, bsy_bar, &view_](bool state) mutable
+      [prog_bar, bsy_bar, &view_](bool state)
       {
          if (state)
          {
@@ -66,7 +67,7 @@ auto make_bars(view& view_)
    return
       margin({20, 20, 20, 20},
          htile(
-            start_stop,
+            align_middle(start_stop),
             hspace(10),
             vtile(
                vsize(27, hold(prog_bar)),

lib/include/elements/element/status_bar.hpp

@@ -108,6 +108,7 @@ namespace cycfi::elements
 
       void                    start(view& view_, duration time);
       void                    stop(view& view_);
+      bool                    is_stopped() const { return _time == _time.zero(); }
 
       rect                    foreground_bounds(context const& ctx) const override;
 
@@ -132,7 +133,8 @@ namespace cycfi::elements
       return {
          std::forward<Background>(bg),
          std::forward<Foreground>(fg),
-         init_value, start_pos};
+         init_value, start_pos
+      };
    }
 }
 

lib/src/element/busy_bar.cpp

@@ -126,7 +126,7 @@ namespace cycfi::elements
 
    void busy_bar_base::animate(view& view_)
    {
-      if (_time == _time.zero())
+      if (is_stopped())
       {
          _status = -0.2;
          value(0.0);