Merge branch 'skia_2024'

Author: djowel

lib/include/elements/element/label.hpp

@@ -289,7 +289,7 @@ namespace cycfi::elements
       using param_type = typename receiver<T>::param_type;
       using getter_type = typename receiver<T>::getter_type;
 
-                              as_label_element(F&& as_string, Subject label);
+                              as_label_element(F as_string, Subject label);
 
       void                    value(param_type val) override;
       getter_type             value() const override;
@@ -549,7 +549,7 @@ namespace cycfi::elements
     *    The subject.
     */
    template <concepts::Element Subject, typename T, typename F>
-   inline as_label_element<Subject, T, F>::as_label_element(F&& as_string, Subject subject)
+   inline as_label_element<Subject, T, F>::as_label_element(F as_string, Subject subject)
     : _as_string(as_string)
     , base_type(std::move(subject))
    {}
@@ -630,8 +630,7 @@ namespace cycfi::elements
    inline as_label_element<remove_cvref_t<Subject>, T, remove_cvref_t<F>>
    as_label(F&& as_string, Subject&& subject)
    {
-      using ftype = remove_cvref_t<F>;
-      return {std::forward<ftype>(as_string), std::forward<Subject>(subject)};
+      return {std::forward<F>(as_string), std::forward<Subject>(subject)};
    }
 
    /**

lib/include/elements/element/style/dial.hpp

@@ -208,8 +208,8 @@ namespace cycfi::elements
    radial_labels(Subject&& subject, float font_size, S&&... s)
    {
       auto r = radial_labels_styler<size, remove_cvref_t<Subject>, sizeof...(S)>
-         {std::move(subject), font_size};
-      r._labels = {{std::move(s)...}};
+         {std::forward<Subject>(subject), font_size};
+      r._labels = {{std::forward<S>(s)...}};
       return r;
    }
 }

lib/include/elements/element/style/thumbwheel.hpp

@@ -94,9 +94,8 @@ namespace cycfi::elements
    template <typename F>
    inline auto vthumbwheel(std::size_t num_items, F&& compose)
    {
-      using ftype = remove_cvref_t<F>;
       auto body = basic_vthumbwheel(
-         list{basic_cell_composer(num_items, std::forward<ftype>(compose))}
+         list{basic_cell_composer(num_items, std::forward<F>(compose))}
        , 1.0 / (num_items-1)
       );
       return thumbwheel(std::move(body), {0.0f, 0.0f});

lib/src/element/drag_and_drop.cpp

@@ -35,7 +35,7 @@ namespace cycfi::elements
       proxy_base::prepare_subject(ctx);
       std::string id = address_to_string(this);
       if (_mime_types.find(id) == _mime_types.end())
-         _mime_types.insert(id);
+         _mime_types.insert(std::move(id));
    }
 
    void drop_receiver::track_drop(context const& ctx, drop_info const& info, cursor_tracking status)