Renamed dial_base to basic_dial for consistency

Author: djowel

examples/basic_sliders_and_knobs/main.cpp

@@ -33,7 +33,7 @@ slider_ptr hsliders[3];
 slider_ptr vsliders[3];
 
 // We make three dials.
-using dial_ptr = std::shared_ptr<dial_base>;
+using dial_ptr = std::shared_ptr<basic_dial>;
 dial_ptr dials[3];
 
 // We make linear slider markers that are placed below the sliders.

examples/custom_control/main.cpp

@@ -197,7 +197,7 @@ class my_app : public app
 private:
 
    constexpr static float default_value = my_custom_control::default_value;
-   using dial_ptr = std::shared_ptr<dial_base>;
+   using dial_ptr = std::shared_ptr<basic_dial>;
    using label_ptr = decltype(share(label("")));
 
    auto              make_control();

examples/sprite_sliders_and_knobs/main.cpp

@@ -15,7 +15,7 @@ auto background = box(bkd_color);
 using slider_ptr = std::shared_ptr<basic_slider_base>;
 slider_ptr vsliders[3];
 
-using dial_ptr = std::shared_ptr<dial_base>;
+using dial_ptr = std::shared_ptr<basic_dial>;
 dial_ptr dials[3];
 
 template <bool is_vertical>
@@ -107,7 +107,7 @@ void link_control(int index, view& view_)
    vsliders[index]->on_change =
       [index, &view_](double val)
       {
-         dials[index]->dial_base::value(val);
+         dials[index]->basic_dial::value(val);
          view_.refresh(*dials[index]);
       };
 

lib/include/elements/element/dial.hpp

@@ -23,13 +23,13 @@ namespace cycfi::elements
    ////////////////////////////////////////////////////////////////////////////
    // Dials
    ////////////////////////////////////////////////////////////////////////////
-   class dial_base : public tracker<proxy_base>, public receiver<double>
+   class basic_dial : public tracker<proxy_base>, public receiver<double>
    {
    public:
 
       using dial_function = std::function<void(double pos)>;
 
-                           dial_base(double init_value = 0.0);
+                           basic_dial(double init_value = 0.0);
 
       void                 prepare_subject(context& ctx) override;
       element*             hit_test(context const& ctx, point p, bool leaf, bool control) override;
@@ -52,19 +52,21 @@ namespace cycfi::elements
       double               _value;
    };
 
+   using dial_base [[deprecated("Use basic_dial instead.")]] = basic_dial;
+
    template <concepts::Element Subject>
-   inline proxy<remove_cvref_t<Subject>, dial_base>
+   inline proxy<remove_cvref_t<Subject>, basic_dial>
    dial(Subject&& subject, double init_value = 0.0)
    {
       return {std::forward<Subject>(subject), init_value};
    }
 
-   inline double dial_base::value() const
+   inline double basic_dial::value() const
    {
       return _value;
    }
 
-   inline element* dial_base::hit_test(context const& ctx, point p, bool leaf, bool /*control*/)
+   inline element* basic_dial::hit_test(context const& ctx, point p, bool leaf, bool /*control*/)
    {
       return element::hit_test(ctx, p, leaf, false); // accept non-control subjects
    }

lib/src/element/dial.cpp

@@ -12,22 +12,22 @@
 namespace cycfi::elements
 {
    ////////////////////////////////////////////////////////////////////////////
-   // dial_base
+   // basic_dial
    ////////////////////////////////////////////////////////////////////////////
-   dial_base::dial_base(double init_value)
+   basic_dial::basic_dial(double init_value)
     : _value(init_value)
    {
       clamp(_value, 0.0, 1.0);
    }
 
-   void dial_base::prepare_subject(context& ctx)
+   void basic_dial::prepare_subject(context& ctx)
    {
       proxy_base::prepare_subject(ctx);
       if (auto* rcvr = find_subject<receiver<double>*>(this))
          rcvr->value(_value);
    }
 
-   void dial_base::value(double val)
+   void basic_dial::value(double val)
    {
       _value = clamp(val, 0.0, 1.0);
       if (auto* rcvr = find_subject<receiver<double>*>(this))
@@ -36,21 +36,21 @@ namespace cycfi::elements
 
    namespace
    {
-      inline void edit_value(dial_base* this_, double val)
+      inline void edit_value(basic_dial* this_, double val)
       {
          this_->value(val);
          if (this_->on_change)
             this_->on_change(this_->value());
       }
    }
 
-   void dial_base::edit(view& view_, param_type val)
+   void basic_dial::edit(view& view_, param_type val)
    {
       edit_value(this, val);
       receiver<double>::notify_edit(view_);
    }
 
-   double dial_base::radial_value(context const& ctx, tracker_info& track_info)
+   double basic_dial::radial_value(context const& ctx, tracker_info& track_info)
    {
       using namespace radial_consts;
 
@@ -66,7 +66,7 @@ namespace cycfi::elements
       return value();
    }
 
-   double dial_base::linear_value(context const& /*ctx*/, tracker_info& track_info)
+   double basic_dial::linear_value(context const& /*ctx*/, tracker_info& track_info)
    {
       point delta{
          track_info.current.x - track_info.previous.x,
@@ -81,15 +81,15 @@ namespace cycfi::elements
       return clamp(val, 0.0, 1.0);
    }
 
-   double dial_base::compute_value(context const& ctx, tracker_info& track_info)
+   double basic_dial::compute_value(context const& ctx, tracker_info& track_info)
    {
       return (get_theme().dial_mode == dial_mode_enum::radial)?
          radial_value(ctx, track_info) :
          linear_value(ctx, track_info)
          ;
    }
 
-   void dial_base::keep_tracking(context const& ctx, tracker_info& track_info)
+   void basic_dial::keep_tracking(context const& ctx, tracker_info& track_info)
    {
       if (track_info.current != track_info.previous)
       {
@@ -102,7 +102,7 @@ namespace cycfi::elements
       }
    }
 
-   bool dial_base::scroll(context const& ctx, point dir, point p)
+   bool basic_dial::scroll(context const& ctx, point dir, point p)
    {
       auto sdir = scroll_direction();
       track_scroll(ctx, dir, p);