From 938391d2e0654bf2f57a67871753a056023e0d2c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 19 Sep 2018 22:19:52 +0800
Subject: Rename some event functions.

---
 CruUI/ui/controls/text_block.h      | 5 +----
 CruUI/ui/controls/toggle_button.cpp | 5 +++--
 CruUI/ui/controls/toggle_button.h   | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'CruUI/ui/controls')

diff --git a/CruUI/ui/controls/text_block.h b/CruUI/ui/controls/text_block.h
index 3fed2283..dce83427 100644
--- a/CruUI/ui/controls/text_block.h
+++ b/CruUI/ui/controls/text_block.h
@@ -29,10 +29,7 @@ namespace cru
 
                 explicit operator DWRITE_TEXT_RANGE() const
                 {
-                    DWRITE_TEXT_RANGE result;
-                    result.startPosition = position;
-                    result.length = count;
-                    return result;
+                    return DWRITE_TEXT_RANGE { position, count };
                 }
             };
 
diff --git a/CruUI/ui/controls/toggle_button.cpp b/CruUI/ui/controls/toggle_button.cpp
index 033fa9fc..001f46eb 100644
--- a/CruUI/ui/controls/toggle_button.cpp
+++ b/CruUI/ui/controls/toggle_button.cpp
@@ -60,6 +60,7 @@ namespace cru::ui::controls
 
             const auto time = total_time * (std::abs(delta) / (inner_circle_x * 2));
 
+            // ReSharper disable once CppExpressionWithoutSideEffects
             AnimationBuilder(fmt::format(L"ToggleButton {}", reinterpret_cast<size_t>(this)), time)
             .AddStepHandler(CreatePtr<animations::AnimationStepHandlerPtr>([=](animations::AnimationDelegatePtr, const double percentage)
             {
@@ -67,7 +68,7 @@ namespace cru::ui::controls
                 Repaint();
             })).Start();
 
-            OnToggleInternal(state);
+            RaiseToggleEvent(state);
             Repaint();
         }
     }
@@ -139,7 +140,7 @@ namespace cru::ui::controls
         return result_size;
     }
 
-    void ToggleButton::OnToggleInternal(bool new_state)
+    void ToggleButton::RaiseToggleEvent(bool new_state)
     {
         events::ToggleEventArgs args(this, this, new_state);
         OnToggle(args);
diff --git a/CruUI/ui/controls/toggle_button.h b/CruUI/ui/controls/toggle_button.h
index 8668b2c9..d496f21a 100644
--- a/CruUI/ui/controls/toggle_button.h
+++ b/CruUI/ui/controls/toggle_button.h
@@ -47,7 +47,7 @@ namespace cru::ui::controls
         Size OnMeasure(const Size& available_size) override;
 
     private:
-        void OnToggleInternal(bool new_state);
+        void RaiseToggleEvent(bool new_state);
 
     private:
         bool state_ = false;
-- 
cgit v1.2.3