From df788fcc308bbf8950ad8a22a1f8290681b64f0d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 26 Jan 2021 10:03:37 +0000 Subject: tdf#139609 avoid fetching unnecessary xid under gtk3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- vcl/inc/salframe.hxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vcl/inc/salframe.hxx') diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index d55a40b1a93b..f79ae07ce9a8 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -215,6 +215,10 @@ public: virtual const SystemEnvData* GetSystemData() const = 0; + // tdf#139609 SystemEnvData::GetWindowHandle() calls this to on-demand fill the aWindow + // member of SystemEnvData for backends that want to defer doing that + virtual void ResolveWindowHandle(SystemEnvData& /*rData*/) const {}; + // get current modifier, button mask and mouse position struct SalPointerState { -- cgit