From b5411c190e798c27e18a67eb1472b465728c28a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 21 Nov 2016 10:22:27 +0000
Subject: [PATCH] Resolves: rhbz#1396827 update geom on mouse click as well as
 motion

Change-Id: Ia361aa316fe3f5ecdd672d42de9bea7fcf142554
---
 vcl/unx/gtk3/gtk3gtkframe.cxx | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 24ffcdd..d5ade01 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2582,10 +2582,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
         case 3: aEvent.mnButton = MOUSE_RIGHT;  break;
         default: return false;
     }
-    aEvent.mnTime   = pEvent->time;
-    aEvent.mnX      = (long)pEvent->x_root - pThis->maGeometry.nX;
-    aEvent.mnY      = (long)pEvent->y_root - pThis->maGeometry.nY;
-    aEvent.mnCode   = GetMouseModCode( pEvent->state );
 
     vcl::DeletionListener aDel( pThis );
 
@@ -2596,12 +2592,31 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
             closePopup();
     }
 
-    // --- RTL --- (mirror mouse pos)
-    if( AllSettings::GetLayoutRTL() )
-        aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
+    if (!aDel.isDeleted())
+    {
+        int frame_x = (int)(pEvent->x_root - pEvent->x);
+        int frame_y = (int)(pEvent->y_root - pEvent->y);
+        if (frame_x != pThis->maGeometry.nX || frame_y != pThis->maGeometry.nY)
+        {
+            pThis->maGeometry.nX = frame_x;
+            pThis->maGeometry.nY = frame_y;
+            ImplSVData* pSVData = ImplGetSVData();
+            if (pSVData->maNWFData.mbCanDetermineWindowPosition)
+                pThis->CallCallbackExc(SalEvent::Move, nullptr);
+        }
+    }
 
     if (!aDel.isDeleted())
     {
+        aEvent.mnTime   = pEvent->time;
+        aEvent.mnX      = (long)pEvent->x_root - pThis->maGeometry.nX;
+        aEvent.mnY      = (long)pEvent->y_root - pThis->maGeometry.nY;
+        aEvent.mnCode   = GetMouseModCode( pEvent->state );
+
+        // --- RTL --- (mirror mouse pos)
+        if( AllSettings::GetLayoutRTL() )
+            aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
+
         pThis->CallCallbackExc( nEventType, &aEvent );
     }
 
@@ -2777,7 +2792,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer
             pThis->CallCallbackExc(SalEvent::Move, nullptr);
     }
 
-    if( ! aDel.isDeleted() )
+    if (!aDel.isDeleted())
     {
         SalMouseEvent aEvent;
         aEvent.mnTime   = pEvent->time;
@@ -2793,7 +2808,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer
         pThis->CallCallbackExc( SalEvent::MouseMove, &aEvent );
     }
 
-    if( ! aDel.isDeleted() )
+    if (!aDel.isDeleted())
     {
         // ask for the next hint
         gint x, y;
-- 
2.9.3