Rename some event functions.

6 files changed, 28 insertions, 30 deletions

diff --git a/CruUI/ui/control.cpp b/CruUI/ui/control.cpp
index 1fa7a08d..adf429b1 100644
--- a/CruUI/ui/control.cpp
+++ b/CruUI/ui/control.cpp
@@ -343,7 +343,7 @@ namespace cru {
 
         }
 
-        void Control::OnPositionChangedInternal(PositionChangedEventArgs& args)
+        void Control::RaisePositionChangedEvent(PositionChangedEventArgs& args)
         {
             OnPositionChangedCore(args);
             OnPositionChanged(args);
@@ -563,7 +563,7 @@ namespace cru {
             if (this->old_position_ != this->position_)
             {
                 PositionChangedEventArgs args(this, this, this->old_position_, this->position_);
-                this->OnPositionChangedInternal(args);
+                this->RaisePositionChangedEvent(args);
                 this->old_position_ = this->position_;
             }
         }
diff --git a/CruUI/ui/control.h b/CruUI/ui/control.h
index daae1787..19995c76 100644
--- a/CruUI/ui/control.h
+++ b/CruUI/ui/control.h
@@ -217,8 +217,8 @@ namespace cru
             virtual void OnPositionChangedCore(events::PositionChangedEventArgs& args);
             virtual void OnSizeChangedCore(events::SizeChangedEventArgs& args);
 
-            void OnPositionChangedInternal(events::PositionChangedEventArgs& args);
-            void OnSizeChangedInternal(events::SizeChangedEventArgs& args);
+            void RaisePositionChangedEvent(events::PositionChangedEventArgs& args);
+            void RaiseSizeChangedEvent(events::SizeChangedEventArgs& args);
 
             //*************** region: mouse event ***************
             virtual void OnMouseEnter(events::MouseEventArgs& args);
@@ -235,12 +235,12 @@ namespace cru
             virtual void OnMouseUpCore(events::MouseButtonEventArgs& args);
             virtual void OnMouseClickCore(events::MouseButtonEventArgs& args);
 
-            void OnMouseEnterInternal(events::MouseEventArgs& args);
-            void OnMouseLeaveInternal(events::MouseEventArgs& args);
-            void OnMouseMoveInternal(events::MouseEventArgs& args);
-            void OnMouseDownInternal(events::MouseButtonEventArgs& args);
-            void OnMouseUpInternal(events::MouseButtonEventArgs& args);
-            void OnMouseClickInternal(events::MouseButtonEventArgs& args);
+            void RaiseMouseEnterEvent(events::MouseEventArgs& args);
+            void RaiseMouseLeaveEvent(events::MouseEventArgs& args);
+            void RaiseMouseMoveEvent(events::MouseEventArgs& args);
+            void RaiseMouseDownEvent(events::MouseButtonEventArgs& args);
+            void RaiseMouseUpEvent(events::MouseButtonEventArgs& args);
+            void RaiseMouseClickEvent(events::MouseButtonEventArgs& args);
 
             //*************** region: focus event ***************
             virtual void OnGetFocus(events::FocusChangeEventArgs& args);
@@ -249,8 +249,8 @@ namespace cru
             virtual void OnGetFocusCore(events::FocusChangeEventArgs& args);
             virtual void OnLoseFocusCore(events::FocusChangeEventArgs& args);
 
-            void OnGetFocusInternal(events::FocusChangeEventArgs& args);
-            void OnLoseFocusInternal(events::FocusChangeEventArgs& args);
+            void RaiseGetFocusEvent(events::FocusChangeEventArgs& args);
+            void RaiseLoseFocusEvent(events::FocusChangeEventArgs& args);
 
             //*************** region: layout ***************
             virtual Size OnMeasure(const Size& available_size);
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;
diff --git a/CruUI/ui/window.cpp b/CruUI/ui/window.cpp
index 3f9d9f6c..926fd77a 100644
--- a/CruUI/ui/window.cpp
+++ b/CruUI/ui/window.cpp
@@ -356,11 +356,11 @@ namespace cru
             if (focus_control_ == control)
                 return true;
 
-            DispatchEvent(focus_control_, &Control::OnLoseFocusInternal, nullptr, false);
+            DispatchEvent(focus_control_, &Control::RaiseLoseFocusEvent, nullptr, false);
 
             focus_control_ = control;
 
-            DispatchEvent(control, &Control::OnGetFocusInternal, nullptr, false);
+            DispatchEvent(control, &Control::RaiseGetFocusEvent, nullptr, false);
 
             return true;
         }
@@ -447,13 +447,13 @@ namespace cru
         void Window::OnSetFocusInternal()
         {
             window_focus_ = true;
-            DispatchEvent(focus_control_, &Control::OnGetFocusInternal, nullptr, true);
+            DispatchEvent(focus_control_, &Control::RaiseGetFocusEvent, nullptr, true);
         }
 
         void Window::OnKillFocusInternal()
         {
             window_focus_ = false;
-            DispatchEvent(focus_control_, &Control::OnLoseFocusInternal, nullptr, true);
+            DispatchEvent(focus_control_, &Control::RaiseLoseFocusEvent, nullptr, true);
         }
 
         void Window::OnMouseMoveInternal(const POINT point)
@@ -478,18 +478,18 @@ namespace cru
 
             if (mouse_capture_control_) // if mouse is captured
             {
-                DispatchEvent(mouse_capture_control_, &Control::OnMouseMoveInternal, nullptr, dip_point);
+                DispatchEvent(mouse_capture_control_, &Control::RaiseMouseMoveEvent, nullptr, dip_point);
             }
             else
             {
                 DispatchMouseHoverControlChangeEvent(old_control_mouse_hover, new_control_mouse_hover, dip_point);
-                DispatchEvent(new_control_mouse_hover, &Control::OnMouseMoveInternal, nullptr, dip_point);
+                DispatchEvent(new_control_mouse_hover, &Control::RaiseMouseMoveEvent, nullptr, dip_point);
             }
         }
 
         void Window::OnMouseLeaveInternal()
         {
-            DispatchEvent(mouse_hover_control_, &Control::OnMouseLeaveInternal, nullptr);
+            DispatchEvent(mouse_hover_control_, &Control::RaiseMouseLeaveEvent, nullptr);
             mouse_hover_control_ = nullptr;
         }
 
@@ -504,7 +504,7 @@ namespace cru
             else
                 control = HitTest(dip_point);
 
-            DispatchEvent(control, &Control::OnMouseDownInternal, nullptr, dip_point, button);
+            DispatchEvent(control, &Control::RaiseMouseDownEvent, nullptr, dip_point, button);
         }
 
         void Window::OnMouseUpInternal(MouseButton button, POINT point)
@@ -518,7 +518,7 @@ namespace cru
             else
                 control = HitTest(dip_point);
 
-            DispatchEvent(control, &Control::OnMouseUpInternal, nullptr, dip_point, button);
+            DispatchEvent(control, &Control::RaiseMouseUpEvent, nullptr, dip_point, button);
         }
 
         void Window::OnActivatedInternal()
@@ -539,9 +539,9 @@ namespace cru
             {
                 const auto lowest_common_ancestor = FindLowestCommonAncestor(old_control, new_control);
                 if (old_control != nullptr) // if last mouse-hover-on control exists
-                    DispatchEvent(old_control, &Control::OnMouseLeaveInternal, lowest_common_ancestor); // dispatch mouse leave event.
+                    DispatchEvent(old_control, &Control::RaiseMouseLeaveEvent, lowest_common_ancestor); // dispatch mouse leave event.
                 if (new_control != nullptr)
-                    DispatchEvent(new_control, &Control::OnMouseEnterInternal, lowest_common_ancestor, point); // dispatch mouse enter event.
+                    DispatchEvent(new_control, &Control::RaiseMouseEnterEvent, lowest_common_ancestor, point); // dispatch mouse enter event.
             }
         }
     }