From 388e4b2d74ce4dca350721fe6aec74015ffa795f Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 27 Aug 2019 12:12:14 +0000 Subject: [PATCH] Bug 1576268 - [Wayland] Use MOVE as a default Drag and Drop action to match X11 behavior, r=jhorak Differential Revision: https://phabricator.services.mozilla.com/D43578 --HG-- extra : moz-landing-system : lando --- widget/gtk/nsClipboardWayland.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widget/gtk/nsClipboardWayland.cpp b/widget/gtk/nsClipboardWayland.cpp index 2b5898b00bf3..5e8aa87f8dbf 100644 --- a/widget/gtk/nsClipboardWayland.cpp +++ b/widget/gtk/nsClipboardWayland.cpp @@ -195,6 +195,12 @@ void WaylandDataOffer::SetDragStatus(GdkDragAction aAction, uint32_t aTime) { uint32_t all_actions = WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE; + /* Default to move D&D action (Bug 1576268). + */ + if (dnd_actions == 0) { + all_actions = WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE; + } + wl_data_offer_set_actions(mWaylandDataOffer, all_actions, dnd_actions); /* Workaround Wayland D&D architecture here. To get the data_device_drop()