diff options
author | crupest <crupest@outlook.com> | 2021-12-13 20:58:42 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2021-12-13 20:58:42 +0800 |
commit | 21fccf43ec049569f690674840ca1a10420a40da (patch) | |
tree | 33341a51f41bc9d783221ad363e33ffeb177886b /src/ui/controls | |
parent | c850d817cc0d8c2c80728f373f89dce91650023a (diff) | |
download | cru-21fccf43ec049569f690674840ca1a10420a40da.tar.gz cru-21fccf43ec049569f690674840ca1a10420a40da.tar.bz2 cru-21fccf43ec049569f690674840ca1a10420a40da.zip |
...
Diffstat (limited to 'src/ui/controls')
-rw-r--r-- | src/ui/controls/Control.cpp | 4 | ||||
-rw-r--r-- | src/ui/controls/TextHostControlService.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp index 29c2c46a..44da7f6f 100644 --- a/src/ui/controls/Control.cpp +++ b/src/ui/controls/Control.cpp @@ -20,12 +20,12 @@ Control::Control() { style_rule_set_bind_ = std::make_unique<style::StyleRuleSetBind>(this, style_rule_set_.get()); - MouseEnterEvent()->Direct()->AddHandler([this](event::MouseEventArgs&) { + MouseEnterEvent()->Direct()->AddHandler([this](events::MouseEventArgs&) { this->is_mouse_over_ = true; this->OnMouseHoverChange(true); }); - MouseLeaveEvent()->Direct()->AddHandler([this](event::MouseEventArgs&) { + MouseLeaveEvent()->Direct()->AddHandler([this](events::MouseEventArgs&) { this->is_mouse_over_ = false; this->OnMouseHoverChange(true); }); diff --git a/src/ui/controls/TextHostControlService.cpp b/src/ui/controls/TextHostControlService.cpp index b0759058..3a67860d 100644 --- a/src/ui/controls/TextHostControlService.cpp +++ b/src/ui/controls/TextHostControlService.cpp @@ -15,7 +15,7 @@ #include "cru/ui/Base.hpp" #include "cru/ui/DebugFlags.hpp" #include "cru/ui/components/Menu.hpp" -#include "cru/ui/events/UiEvent.hpp" +#include "cru/ui/events/UiEvents.hpp" #include "cru/ui/helper/ShortcutHub.hpp" #include "cru/ui/host/WindowHost.hpp" #include "cru/ui/render/ScrollRenderObject.hpp" @@ -445,7 +445,7 @@ void TextHostControlService::UpdateInputMethodPosition() { } void TextHostControlService::MouseDownHandler( - event::MouseButtonEventArgs& args) { + events::MouseButtonEventArgs& args) { if (IsEnabled()) { this->control_->SetFocus(); if (args.GetButton() == mouse_buttons::left && @@ -461,14 +461,14 @@ void TextHostControlService::MouseDownHandler( } } -void TextHostControlService::MouseUpHandler(event::MouseButtonEventArgs& args) { +void TextHostControlService::MouseUpHandler(events::MouseButtonEventArgs& args) { if (args.GetButton() == mouse_buttons::left && mouse_move_selecting_) { this->control_->ReleaseMouse(); this->mouse_move_selecting_ = false; } } -void TextHostControlService::MouseMoveHandler(event::MouseEventArgs& args) { +void TextHostControlService::MouseMoveHandler(events::MouseEventArgs& args) { if (this->mouse_move_selecting_) { const auto text_render_object = this->GetTextRenderObject(); const auto result = text_render_object->TextHitTest( @@ -479,7 +479,7 @@ void TextHostControlService::MouseMoveHandler(event::MouseEventArgs& args) { } void TextHostControlService::GainFocusHandler( - event::FocusChangeEventArgs& args) { + events::FocusChangeEventArgs& args) { CRU_UNUSED(args); if (editable_) { auto input_method_context = GetInputMethodContext(); @@ -514,7 +514,7 @@ void TextHostControlService::GainFocusHandler( } void TextHostControlService::LoseFocusHandler( - event::FocusChangeEventArgs& args) { + events::FocusChangeEventArgs& args) { if (!args.IsWindow()) this->AbortSelection(); input_method_context_event_guard_.Clear(); auto input_method_context = GetInputMethodContext(); |