vcl/unx/gtk3/gtkinst.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 24db04bbe09f19a49733699e42d0e095eb417fed Author: Caolán McNamara <[email protected]> AuthorDate: Wed Dec 1 20:32:30 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Dec 2 22:52:47 2021 +0100 Related: tdf#145901 use x11 popover replacement for all non-menubutton cases replacement from inside real popover under x11 as in autofilter case doesn't work. Change-Id: Ie4ba95645a8094732b9bad9829426e77375d63ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126204 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index d808d1e478c4..c993e16fc4ce 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -22084,7 +22084,7 @@ public: //under wayland a Popover will work to "escape" the parent dialog, not //so under X, so come up with this hack to use a raw GtkWindow GdkDisplay *pDisplay = gtk_widget_get_display(GTK_WIDGET(m_pPopover)); - if (DLSYM_GDK_IS_X11_DISPLAY(pDisplay) && gtk_popover_get_constrain_to(m_pPopover) == GTK_POPOVER_CONSTRAINT_NONE) + if (DLSYM_GDK_IS_X11_DISPLAY(pDisplay)) { m_pMenuHack = GTK_WINDOW(gtk_window_new(GTK_WINDOW_POPUP)); gtk_window_set_type_hint(m_pMenuHack, GDK_WINDOW_TYPE_HINT_COMBO); @@ -22136,7 +22136,7 @@ public: //under wayland a Popover will work to "escape" the parent dialog, not //so under X, so come up with this hack to use a raw GtkWindow GdkDisplay *pDisplay = gtk_widget_get_display(GTK_WIDGET(m_pPopover)); - if (DLSYM_GDK_IS_X11_DISPLAY(pDisplay) && gtk_popover_get_constrain_to(m_pPopover) == GTK_POPOVER_CONSTRAINT_NONE) + if (DLSYM_GDK_IS_X11_DISPLAY(pDisplay)) { if (!m_bMenuPoppedUp) {
