summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/app/saldisp.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-01-26 10:03:37 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-01-27 10:18:50 +0100
commitdf788fcc308bbf8950ad8a22a1f8290681b64f0d (patch)
treeeac883afe20faea112046e1ca4d3999c5668ef1c /vcl/unx/generic/app/saldisp.cxx
parent7d506f6bb45725bff9d5a6ddf0893d826f992596 (diff)
tdf#139609 avoid fetching unnecessary xid under gtk3
because of the side effects using a bare GtkGrid as m_pSocket in vcl/unx/gtk3/gtk3gtkobject.cxx is perhaps a poor choice, getting its xid causes poor side effects wrt events belonging to its child widgets getting delivered to the SalFrame widget, so duplicate scrolling after showing a opengl slide and/or showing a video and lots of flickering we're (generally at least) not using the xid under gtk3 so don't set it unless it's explicitly asked for. Happily the gtk Player::createPlayerWindow doesn't use its arg[0] xid in any case, so don't bother setting it for that backend. Change-Id: I1c59a607a332635091782c3b49de10647558f301 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109941 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/generic/app/saldisp.cxx')
-rw-r--r--vcl/unx/generic/app/saldisp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index dc843f34ab67..b736d0a09249 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -1849,7 +1849,7 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture )
if( !pEnv || !*pEnv )
{
int ret = XGrabPointer( GetDisplay(),
- static_cast<::Window>(pEnvData->GetWindowHandle()),
+ static_cast<::Window>(pEnvData->GetWindowHandle(pCapture)),
False,
PointerMotionMask| ButtonPressMask|ButtonReleaseMask,
GrabModeAsync,