vcl/unx/gtk3/gtk3gtkframe.cxx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
New commits: commit 00bb70abc909163d9288add063cd68be084d1b25 Author: Caolán McNamara <[email protected]> Date: Tue Nov 7 13:26:27 2017 +0000 Resolves: rhbz#1505379 gtk3+X: open comboboxes block session if there's none of our windows under the mouse when clicked then close the popup window. There's similar code for gtk2, but using deprecated apis, do this again but with the recommended apis Change-Id: I9d844d098d09d0109dcbbc06390562e83edda397 Reviewed-on: https://gerrit.libreoffice.org/44403 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 9ac51974ea88..cff6e2d0b577 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2633,12 +2633,18 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer vcl::DeletionListener aDel( pThis ); - if (pThis->isFloatGrabWindow() && pEvent->window != widget_get_window(pThis->getMouseEventWidget())) + if (pThis->isFloatGrabWindow()) { - if (pEvent->type == GDK_BUTTON_PRESS) - pThis->closePopup(); - else if (pEvent->type == GDK_BUTTON_RELEASE) - return true; + //rhbz#1505379 if the window that got the event isn't our one, or there's none + //of our windows under the mouse then close this popup window + if (pEvent->window != widget_get_window(pThis->getMouseEventWidget()) || + gdk_device_get_window_at_position(pEvent->device, nullptr, nullptr) == nullptr) + { + if (pEvent->type == GDK_BUTTON_PRESS) + pThis->closePopup(); + else if (pEvent->type == GDK_BUTTON_RELEASE) + return true; + } } if (!aDel.isDeleted())
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
