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

Unified Diff: ui/views/widget/widget.cc

Issue 1964283002: MacViews: Implemented Drag & Drop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« ui/views/cocoa/drag_drop_client_mac.mm ('K') | « ui/views/widget/widget.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 17675e73c44d8c90681eabff93600f6de4b5d1d4..f07b1eb99f6cbb1c30931fd81250811e7ae5d383 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -781,13 +781,9 @@ void Widget::RunShellDrag(View* view,
if (!widget_deletion_observer.IsWidgetAlive())
return;
- // If the view is removed during the drag operation, dragged_view_ is set to
- // NULL.
- if (view && dragged_view_ == view) {
- dragged_view_ = NULL;
- view->OnDragDone();
- }
- OnDragComplete();
+#if !defined(OS_MACOSX)
+ DraggingEnded(view);
tapted 2016/05/26 12:31:42 Hm - x11 spins its own runloop to "force" it to be
+#endif
}
void Widget::SchedulePaintInRect(const gfx::Rect& rect) {
@@ -1367,6 +1363,16 @@ void Widget::DestroyRootView() {
void Widget::OnDragWillStart() {}
+void Widget::DraggingEnded(View* view) {
+ // If the view is removed during the drag operation, dragged_view_ is set to
+ // NULL.
+ if (view && dragged_view_ == view) {
+ dragged_view_ = NULL;
+ view->OnDragDone();
+ }
+ OnDragComplete();
+}
+
void Widget::OnDragComplete() {}
////////////////////////////////////////////////////////////////////////////////
« ui/views/cocoa/drag_drop_client_mac.mm ('K') | « ui/views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698