Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(881)

Unified Diff: ash/wm/workspace/workspace_event_handler.cc

Issue 139983009: ui::LocatedEvent location() returns gfx::PointF (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo accidental change. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/workspace/workspace_event_handler.cc
diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc
index bba3f76160b94b5bf99495d81c3450a9f51c3e6c..367d0120ab20b28c287dd5b79438853cd21535df 100644
--- a/ash/wm/workspace/workspace_event_handler.cc
+++ b/ash/wm/workspace/workspace_event_handler.cc
@@ -28,8 +28,8 @@ void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
event->IsOnlyLeftMouseButton() &&
((event->flags() &
(ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK)) == 0)) {
- click_component_ = target->delegate()->
- GetNonClientComponent(event->location());
+ click_component_ = target->delegate()->GetNonClientComponent(
+ gfx::ToFlooredPoint(event->location()));
}
if (event->handled())
@@ -37,10 +37,10 @@ void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
switch (event->type()) {
case ui::ET_MOUSE_MOVED: {
- int component =
- target->delegate()->GetNonClientComponent(event->location());
- multi_window_resize_controller_.Show(target, component,
- event->location());
+ int component = target->delegate()->GetNonClientComponent(
+ gfx::ToFlooredPoint(event->location()));
+ multi_window_resize_controller_.Show(
+ target, component, gfx::ToFlooredPoint(event->location()));
break;
}
case ui::ET_MOUSE_ENTERED:
@@ -53,8 +53,8 @@ void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {
if (event->IsOnlyLeftMouseButton()) {
if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
- int component = target->delegate()->
- GetNonClientComponent(event->location());
+ int component = target->delegate()->GetNonClientComponent(
+ gfx::ToFlooredPoint(event->location()));
if (component == HTCAPTION &&
component == click_component_) {
ash::Shell::GetInstance()->metrics()->RecordUserMetricsAction(
@@ -88,8 +88,8 @@ void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
int previous_target_component = click_component_;
- click_component_ = target->delegate()->
- GetNonClientComponent(event->location());
+ click_component_ = target->delegate()->GetNonClientComponent(
+ gfx::ToFlooredPoint(event->location()));
if (click_component_ != HTCAPTION)
return;
@@ -120,8 +120,8 @@ void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
ui::MouseEvent* event) {
aura::Window* target = target_state->window();
if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
- int component =
- target->delegate()->GetNonClientComponent(event->location());
+ int component = target->delegate()->GetNonClientComponent(
+ gfx::ToFlooredPoint(event->location()));
if (component == HTBOTTOM || component == HTTOP) {
Shell::GetInstance()->metrics()->RecordUserMetricsAction(
UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK);

Powered by Google App Engine
This is Rietveld 408576698