[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit fe0d47bc77742ba830e07d036e4fef8154f8a185
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 9 21:16:50 2016 +0000

    Related: tdf#98419 use gtk_window_begin_move_drag bodge for wayland only
    
    Change-Id: Ica19aef9b94e0c11e014f48b7801ecb0c110c44b
    (cherry picked from commit 380e5a98d2f20d77b8fc51bbea74f554dd24cdd1)
    Reviewed-on: https://gerrit.libreoffice.org/23105
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index f018576..3170db3 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -905,7 +905,16 @@ void GtkSalFrame::dragWindowTo(long nX, long nY)
     if (isChild(false))
         moveWindow(nX, nY);
     else
-        gtk_window_begin_move_drag(GTK_WINDOW(m_pWindow), 1, nX, nY, GDK_CURRENT_TIME);
+    {
+#if defined(GDK_WINDOWING_WAYLAND)
+        if (GDK_IS_WAYLAND_DISPLAY(getGdkDisplay()))
+        {
+            gtk_window_begin_move_drag(GTK_WINDOW(m_pWindow), 1, nX, nY, GDK_CURRENT_TIME);
+            return;
+        }
+#endif
+        gtk_window_move(GTK_WINDOW(m_pWindow), nX, nY);
+    }
 }
 
 void GtkSalFrame::widget_set_size_request(long nWidth, long nHeight)