| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/app_list/views/apps_grid_view.h" | 5 #include "ui/app_list/views/apps_grid_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 | 435 |
| 436 void AppsGridView::InitiateDrag(AppListItemView* view, | 436 void AppsGridView::InitiateDrag(AppListItemView* view, |
| 437 Pointer pointer, | 437 Pointer pointer, |
| 438 const ui::LocatedEvent& event) { | 438 const ui::LocatedEvent& event) { |
| 439 DCHECK(view); | 439 DCHECK(view); |
| 440 if (drag_view_ || pulsing_blocks_model_.view_size()) | 440 if (drag_view_ || pulsing_blocks_model_.view_size()) |
| 441 return; | 441 return; |
| 442 | 442 |
| 443 drag_view_ = view; | 443 drag_view_ = view; |
| 444 drag_view_init_index_ = GetIndexOfView(drag_view_); | 444 drag_view_init_index_ = GetIndexOfView(drag_view_); |
| 445 drag_view_offset_ = event.location(); | 445 drag_view_offset_ = gfx::ToFlooredPoint(event.location()); |
| 446 drag_start_page_ = pagination_model_->selected_page(); | 446 drag_start_page_ = pagination_model_->selected_page(); |
| 447 ExtractDragLocation(event, &drag_start_grid_view_); | 447 ExtractDragLocation(event, &drag_start_grid_view_); |
| 448 drag_view_start_ = gfx::Point(drag_view_->x(), drag_view_->y()); | 448 drag_view_start_ = gfx::Point(drag_view_->x(), drag_view_->y()); |
| 449 } | 449 } |
| 450 | 450 |
| 451 void AppsGridView::StartSettingUpSynchronousDrag() { | 451 void AppsGridView::StartSettingUpSynchronousDrag() { |
| 452 #if defined(OS_WIN) | 452 #if defined(OS_WIN) |
| 453 if (!delegate_) | 453 if (!delegate_) |
| 454 return; | 454 return; |
| 455 | 455 |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1203 GetWidget()->GetNativeWindow()->GetRootWindow(), | 1203 GetWidget()->GetNativeWindow()->GetRootWindow(), |
| 1204 GetWidget()->GetNativeWindow(), | 1204 GetWidget()->GetNativeWindow(), |
| 1205 drag_point); | 1205 drag_point); |
| 1206 } | 1206 } |
| 1207 | 1207 |
| 1208 views::View::ConvertPointFromWidget(this, drag_point); | 1208 views::View::ConvertPointFromWidget(this, drag_point); |
| 1209 #else | 1209 #else |
| 1210 // For non-aura, root location is not clearly defined but |drag_view_| does | 1210 // For non-aura, root location is not clearly defined but |drag_view_| does |
| 1211 // not have the scale transform. So no round error would be introduced and | 1211 // not have the scale transform. So no round error would be introduced and |
| 1212 // it's okay to use View::ConvertPointToTarget. | 1212 // it's okay to use View::ConvertPointToTarget. |
| 1213 *drag_point = event.location(); | 1213 *drag_point = gfx::ToFlooredPoint(event.location()); |
| 1214 views::View::ConvertPointToTarget(drag_view_, this, drag_point); | 1214 views::View::ConvertPointToTarget(drag_view_, this, drag_point); |
| 1215 #endif | 1215 #endif |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 void AppsGridView::CalculateDropTarget(const gfx::Point& drag_point, | 1218 void AppsGridView::CalculateDropTarget(const gfx::Point& drag_point, |
| 1219 bool use_page_button_hovering) { | 1219 bool use_page_button_hovering) { |
| 1220 if (EnableFolderDragDropUI()) { | 1220 if (EnableFolderDragDropUI()) { |
| 1221 CalculateDropTargetWithFolderEnabled(drag_point, use_page_button_hovering); | 1221 CalculateDropTargetWithFolderEnabled(drag_point, use_page_button_hovering); |
| 1222 return; | 1222 return; |
| 1223 } | 1223 } |
| (...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2091 void AppsGridView::SetAsFolderDroppingTarget(const Index& target_index, | 2091 void AppsGridView::SetAsFolderDroppingTarget(const Index& target_index, |
| 2092 bool is_target_folder) { | 2092 bool is_target_folder) { |
| 2093 AppListItemView* target_view = | 2093 AppListItemView* target_view = |
| 2094 static_cast<AppListItemView*>( | 2094 static_cast<AppListItemView*>( |
| 2095 GetViewAtSlotOnCurrentPage(target_index.slot)); | 2095 GetViewAtSlotOnCurrentPage(target_index.slot)); |
| 2096 if (target_view) | 2096 if (target_view) |
| 2097 target_view->SetAsAttemptedFolderTarget(is_target_folder); | 2097 target_view->SetAsAttemptedFolderTarget(is_target_folder); |
| 2098 } | 2098 } |
| 2099 | 2099 |
| 2100 } // namespace app_list | 2100 } // namespace app_list |
| OLD | NEW |