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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 265713007: views: Update event-related API to use PointF/RectF instead of Point/Rect. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 1ad31a6793dd45074b95d5a4bab196b7c31969cc..e063eb0cee1244212fda34707877aba18a3de367 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -668,7 +668,7 @@ gfx::Size BookmarkBarView::GetPreferredSize() {
return LayoutItems(true);
}
-bool BookmarkBarView::HitTestRect(const gfx::Rect& rect) const {
+bool BookmarkBarView::HitTestRect(const gfx::RectF& rect) const {
// If bookmark bar is attached and omnibox popup is open (on top of the bar),
// force hit-testing to fail. This prevents hovers/clicks just above the
// omnibox popup from activating the top few pixels of items on the bookmark
@@ -1077,7 +1077,7 @@ void BookmarkBarView::BookmarkNodeFaviconChanged(BookmarkModel* model,
}
void BookmarkBarView::WriteDragDataForView(View* sender,
- const gfx::Point& press_pt,
+ const gfx::PointF& press_pt,
ui::OSExchangeData* data) {
content::RecordAction(UserMetricsAction("BookmarkBar_DragButton"));
@@ -1087,9 +1087,11 @@ void BookmarkBarView::WriteDragDataForView(View* sender,
scoped_ptr<gfx::Canvas> canvas(
views::GetCanvasForDragImage(button->GetWidget(), button->size()));
button->PaintButton(canvas.get(), views::TextButton::PB_FOR_DRAG);
- drag_utils::SetDragImageOnDataObject(*canvas, button->size(),
- press_pt.OffsetFromOrigin(),
- data);
+ drag_utils::SetDragImageOnDataObject(
+ *canvas,
+ button->size(),
+ gfx::ToFlooredPoint(press_pt).OffsetFromOrigin(),
+ data);
WriteBookmarkDragData(model_->bookmark_bar_node()->GetChild(i), data);
return;
}
@@ -1098,7 +1100,7 @@ void BookmarkBarView::WriteDragDataForView(View* sender,
}
int BookmarkBarView::GetDragOperationsForView(View* sender,
- const gfx::Point& p) {
+ const gfx::PointF& p) {
if (size_animation_->is_animating() ||
(size_animation_->GetCurrentValue() == 0 &&
bookmark_bar_state_ != BookmarkBar::DETACHED)) {
@@ -1120,12 +1122,12 @@ int BookmarkBarView::GetDragOperationsForView(View* sender,
}
bool BookmarkBarView::CanStartDragForView(views::View* sender,
- const gfx::Point& press_pt,
- const gfx::Point& p) {
+ const gfx::PointF& press_pt,
+ const gfx::PointF& p) {
// Check if we have not moved enough horizontally but we have moved downward
// vertically - downward drag.
- gfx::Vector2d move_offset = p - press_pt;
- gfx::Vector2d horizontal_offset(move_offset.x(), 0);
+ gfx::Vector2dF move_offset = p - press_pt;
+ gfx::Vector2dF horizontal_offset(move_offset.x(), 0);
if (!View::ExceededDragThreshold(horizontal_offset) && move_offset.y() > 0) {
for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
if (sender == GetBookmarkButton(i)) {

Powered by Google App Engine
This is Rietveld 408576698