Fixed status_bar not firing OnValueChanged, and removed update()

Author: cschreib

changelog.txt

@@ -211,6 +211,7 @@ Other changes:
  - gui: fixed frame not marked as "user placed" when moved or resized
  - gui: fixed missing 'const' for slider::are_clicks_outside_thumb_allowed()
  - gui: fixed missing 'const' for region::render()
+ - gui: fixed status_bar not firing OnValueChanged
 
 v1.2.0:
  - added support for MSVC 2010

include/lxgui/gui_status_bar.hpp

@@ -174,15 +174,6 @@ class status_bar : public frame {
      */
     bool is_reversed() const;
 
-    /**
-     * \brief Updates this region's logic.
-     * \param delta Time spent since last update
-     * \note Triggered callbacks could destroy the frame. If you need
-     * to use the frame again after calling this function, use
-     * the helper class alive_checker.
-     */
-    void update(float delta) override;
-
     /// Registers this region class to the provided Lua state
     static void register_on_lua(sol::state& lua);
 
@@ -195,8 +186,6 @@ class status_bar : public frame {
     void parse_attributes_(const layout_node& node) override;
     void parse_all_nodes_before_children_(const layout_node& node) override;
 
-    bool update_bar_texture_flag_ = false;
-
     orientation orientation_ = orientation::horizontal;
     bool        is_reversed_ = false;
 

src/gui_status_bar.cpp

@@ -77,7 +77,15 @@ void status_bar::set_min_value(float min_value) {
     if (min_value_ > max_value_)
         min_value_ = max_value_;
 
-    value_ = std::clamp(value_, min_value_, max_value_);
+    const auto old_value = value_;
+    value_               = std::clamp(value_, min_value_, max_value_);
+
+    if (value_ != old_value) {
+        alive_checker checker(*this);
+        fire_script("OnValueChanged", {value_});
+        if (!checker.is_alive())
+            return;
+    }
 
     notify_bar_texture_needs_update_();
 }
@@ -90,7 +98,15 @@ void status_bar::set_max_value(float max_value) {
     if (max_value_ < min_value_)
         max_value_ = min_value_;
 
-    value_ = std::clamp(value_, min_value_, max_value_);
+    const auto old_value = value_;
+    value_               = std::clamp(value_, min_value_, max_value_);
+
+    if (value_ != old_value) {
+        alive_checker checker(*this);
+        fire_script("OnValueChanged", {value_});
+        if (!checker.is_alive())
+            return;
+    }
 
     notify_bar_texture_needs_update_();
 }
@@ -102,7 +118,15 @@ void status_bar::set_min_max_values(float min_value, float max_value) {
     min_value_ = std::min(min_value, max_value);
     max_value_ = std::max(min_value, max_value);
 
-    value_ = std::clamp(value_, min_value_, max_value_);
+    const auto old_value = value_;
+    value_               = std::clamp(value_, min_value_, max_value_);
+
+    if (value_ != old_value) {
+        alive_checker checker(*this);
+        fire_script("OnValueChanged", {value_});
+        if (!checker.is_alive())
+            return;
+    }
 
     notify_bar_texture_needs_update_();
 }
@@ -114,13 +138,21 @@ void status_bar::set_value(float value) {
         return;
 
     value_ = value;
+
+    alive_checker checker(*this);
+    fire_script("OnValueChanged", {value_});
+    if (!checker.is_alive())
+        return;
+
     notify_bar_texture_needs_update_();
 }
 
 void status_bar::set_bar_draw_layer(layer bar_layer) {
     bar_layer_ = bar_layer;
-    if (bar_texture_)
+
+    if (bar_texture_) {
         bar_texture_->set_draw_layer(bar_layer_);
+    }
 }
 
 void status_bar::set_bar_texture(utils::observer_ptr<texture> bar_texture) {
@@ -133,10 +165,11 @@ void status_bar::set_bar_texture(utils::observer_ptr<texture> bar_texture) {
 
     std::string parent = bar_texture_->get_parent().get() == this ? "$parent" : name_;
 
-    if (is_reversed_)
+    if (is_reversed_) {
         bar_texture_->set_point(point::top_right, parent);
-    else
+    } else {
         bar_texture_->set_point(point::bottom_left, parent);
+    }
 
     initial_text_coords_ = select_uvs(bar_texture_->get_tex_coord());
     notify_bar_texture_needs_update_();
@@ -164,13 +197,15 @@ void status_bar::set_reversed(bool reversed) {
     is_reversed_ = reversed;
 
     if (bar_texture_) {
-        if (is_reversed_)
+        if (is_reversed_) {
             bar_texture_->set_point(point::top_right);
-        else
+        } else {
             bar_texture_->set_point(point::bottom_left);
+        }
 
-        if (!is_virtual_)
+        if (!is_virtual_) {
             bar_texture_->notify_borders_need_update();
+        }
     }
 }
 
@@ -215,41 +250,34 @@ void status_bar::create_bar_texture_() {
     set_bar_texture(bar_texture);
 }
 
-void status_bar::update(float delta) {
-    if (update_bar_texture_flag_ && bar_texture_) {
-        float coef = (value_ - min_value_) / (max_value_ - min_value_);
+void status_bar::notify_bar_texture_needs_update_() {
+    if (!bar_texture_)
+        return;
+
+    float coef = (value_ - min_value_) / (max_value_ - min_value_);
 
-        if (orientation_ == orientation::horizontal)
-            bar_texture_->set_relative_dimensions(vector2f(coef, 1.0f));
-        else
-            bar_texture_->set_relative_dimensions(vector2f(1.0f, coef));
+    if (orientation_ == orientation::horizontal) {
+        bar_texture_->set_relative_dimensions(vector2f(coef, 1.0f));
+    } else {
+        bar_texture_->set_relative_dimensions(vector2f(1.0f, coef));
+    }
 
-        std::array<float, 4> uvs = initial_text_coords_;
-        if (orientation_ == orientation::horizontal) {
-            if (is_reversed_)
-                uvs[0] = (uvs[0] - uvs[2]) * coef + uvs[2];
-            else
-                uvs[2] = (uvs[2] - uvs[0]) * coef + uvs[0];
+    std::array<float, 4> uvs = initial_text_coords_;
+    if (orientation_ == orientation::horizontal) {
+        if (is_reversed_) {
+            uvs[0] = (uvs[0] - uvs[2]) * coef + uvs[2];
         } else {
-            if (is_reversed_)
-                uvs[3] = (uvs[3] - uvs[1]) * coef + uvs[1];
-            else
-                uvs[1] = (uvs[1] - uvs[3]) * coef + uvs[3];
+            uvs[2] = (uvs[2] - uvs[0]) * coef + uvs[0];
+        }
+    } else {
+        if (is_reversed_) {
+            uvs[3] = (uvs[3] - uvs[1]) * coef + uvs[1];
+        } else {
+            uvs[1] = (uvs[1] - uvs[3]) * coef + uvs[3];
         }
-
-        bar_texture_->set_tex_rect(uvs);
-
-        update_bar_texture_flag_ = false;
     }
 
-    alive_checker checker(*this);
-    base::update(delta);
-    if (!checker.is_alive())
-        return;
-}
-
-void status_bar::notify_bar_texture_needs_update_() {
-    update_bar_texture_flag_ = true;
+    bar_texture_->set_tex_rect(uvs);
 }
 
 } // namespace lxgui::gui