diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 21:25:34 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 21:25:34 +0000 |
| commit | c600edba1fabe1b49f54a804ce150f18a5a3dfb2 (patch) | |
| tree | a42c214f7ba508f1a8490539417c1104137c2812 /ui/views/controls | |
| parent | 539df6c7207426d0626ee1bc76cf6f9a2f3766c0 (diff) | |
| download | chromium_src-c600edba1fabe1b49f54a804ce150f18a5a3dfb2.zip chromium_src-c600edba1fabe1b49f54a804ce150f18a5a3dfb2.tar.gz chromium_src-c600edba1fabe1b49f54a804ce150f18a5a3dfb2.tar.bz2 | |
views: Account for device scale factor when drawing drag images for views.
BUG=128820
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10574014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls')
| -rw-r--r-- | ui/views/controls/menu/menu_controller.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index 941ed81..0ff715be 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -20,6 +20,7 @@ #include "ui/views/controls/menu/menu_controller_delegate.h" #include "ui/views/controls/menu/menu_scroll_view_container.h" #include "ui/views/controls/menu/submenu_view.h" +#include "ui/views/drag_utils.h" #include "ui/views/view_constants.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/root_view.h" @@ -849,12 +850,13 @@ void MenuController::StartDrag(SubmenuView* source, View::ConvertPointToView(NULL, item, &press_loc); gfx::Point widget_loc(press_loc); View::ConvertPointToWidget(item, &widget_loc); - gfx::Canvas canvas(gfx::Size(item->width(), item->height()), false); - item->PaintButton(&canvas, MenuItemView::PB_FOR_DRAG); + scoped_ptr<gfx::Canvas> canvas(views::GetCanvasForDragImage( + source->GetWidget(), gfx::Size(item->width(), item->height()))); + item->PaintButton(canvas.get(), MenuItemView::PB_FOR_DRAG); OSExchangeData data; item->GetDelegate()->WriteDragData(item, &data); - drag_utils::SetDragImageOnDataObject(canvas, item->size(), press_loc, + drag_utils::SetDragImageOnDataObject(*canvas, item->size(), press_loc, &data); StopScrolling(); int drag_ops = item->GetDelegate()->GetDragOperations(item); |