aboutsummaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2018-11-06 19:26:59 +0800
committercrupest <crupest@outlook.com>2018-11-06 19:26:59 +0800
commit0152bebd76399b7f32260533c93b3e0dc20becf1 (patch)
tree8b2c433ade5cb0120160021ca8eaf3d9fb7ff5ce /src/ui
parent1c5b696b487f621aebaafddf25a010c4cdbbd666 (diff)
downloadcru-0152bebd76399b7f32260533c93b3e0dc20becf1.tar.gz
cru-0152bebd76399b7f32260533c93b3e0dc20becf1.tar.bz2
cru-0152bebd76399b7f32260533c93b3e0dc20becf1.zip
Rename two methods in control.
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/control.cpp4
-rw-r--r--src/ui/control.h4
-rw-r--r--src/ui/controls/text_control.cpp2
-rw-r--r--src/ui/events/ui_event.cpp2
-rw-r--r--src/ui/window.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index 6746e820..93d26e81 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -170,13 +170,13 @@ namespace cru {
return position_cache_.lefttop_position_absolute;
}
- Point Control::LocalToAbsolute(const Point& point) const
+ Point Control::ControlToWindow(const Point& point) const
{
return Point(point.x + position_cache_.lefttop_position_absolute.x,
point.y + position_cache_.lefttop_position_absolute.y);
}
- Point Control::AbsoluteToLocal(const Point & point) const
+ Point Control::WindowToControl(const Point & point) const
{
return Point(point.x - position_cache_.lefttop_position_absolute.x,
point.y - position_cache_.lefttop_position_absolute.y);
diff --git a/src/ui/control.h b/src/ui/control.h
index 2a608374..9ee657f7 100644
--- a/src/ui/control.h
+++ b/src/ui/control.h
@@ -115,10 +115,10 @@ namespace cru
Point GetPositionAbsolute() const;
//Local point to absolute point.
- Point LocalToAbsolute(const Point& point) const;
+ Point ControlToWindow(const Point& point) const;
//Absolute point to local point.
- Point AbsoluteToLocal(const Point& point) const;
+ Point WindowToControl(const Point& point) const;
virtual bool IsPointInside(const Point& point);
diff --git a/src/ui/controls/text_control.cpp b/src/ui/controls/text_control.cpp
index 6524df0e..08857e09 100644
--- a/src/ui/controls/text_control.cpp
+++ b/src/ui/controls/text_control.cpp
@@ -249,7 +249,7 @@ namespace cru::ui::controls
return;
}
- const auto p = point.value_or(AbsoluteToLocal(window->GetMousePosition()));
+ const auto p = point.value_or(WindowToControl(window->GetMousePosition()));
if (GetRect(RectRange::Padding).IsPointInside(p))
SetCursor(cursors::i_beam);
else
diff --git a/src/ui/events/ui_event.cpp b/src/ui/events/ui_event.cpp
index 34339ff4..5e9ca452 100644
--- a/src/ui/events/ui_event.cpp
+++ b/src/ui/events/ui_event.cpp
@@ -11,7 +11,7 @@ namespace cru
Point MouseEventArgs::GetPoint(Control* control, const RectRange range) const
{
if (point_.has_value())
- return control->TransformPoint(control->AbsoluteToLocal(point_.value()), RectRange::Margin, range);
+ return control->TransformPoint(control->WindowToControl(point_.value()), RectRange::Margin, range);
return Point();
}
}
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 86ae13a5..5ca5ad3f 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -392,7 +392,7 @@ namespace cru
{
for (auto i = control_list_.crbegin(); i != control_list_.crend(); ++i) {
auto control = *i;
- if (control->IsPointInside(control->AbsoluteToLocal(point))) {
+ if (control->IsPointInside(control->WindowToControl(point))) {
return control;
}
}