sd/source/ui/slideshow/showwin.cxx | 6 ------ vcl/unx/gtk3/gtkinst.cxx | 17 +---------------- 2 files changed, 1 insertion(+), 22 deletions(-)
New commits: commit 1d1e9af105dabddb14c2d04702754161a5d3fee7 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Nov 6 10:59:55 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 7 09:45:12 2025 +0100 gtk3: Drop now obsolete workaround for GTK < 3.24 The underlying problem was fixed in GTK 3.24, so this workaround is no longer needed after commit c392f7b8a614c7ef32cfa9888aeb06b27b535390 Author: Michael Weghorn <[email protected]> Date: Wed Nov 5 17:44:57 2025 +0100 gtk3: Require GTK >= 3.24 Change-Id: Idf5434f57e14285c2a0d3de1ab36e4eafeea9400 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193523 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 816ccfc3f11c..dc0a55d2ca2e 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -98,12 +98,6 @@ void ShowWindow::dispose() void ShowWindow::KeyInput(const KeyEvent& rKEvt) { - // Ignore workaround of https://gitlab.gnome.org/GNOME/gtk/issues/1785 - // See calls to GtkSalFrame::makeFakeKeyPress (Fixed in GTK 3.24) - bool bFakeKeyPress = rKEvt.GetKeyCode().GetFullCode() == 0; - if (bFakeKeyPress) - return; - bool bReturn = false; if( SHOWWINDOWMODE_PREVIEW == meShowWindowMode ) diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index c30b7879fca4..47bfa4073d9e 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -11299,20 +11299,7 @@ public: pWidget = getPopupRect(pWidget, rRect, aRect); gtk_menu_attach_to_widget(m_pMenu, pWidget, nullptr); - // Send a keyboard event through gtk_main_do_event to toggle any active tooltip offs - // before trying to launch the menu - // https://gitlab.gnome.org/GNOME/gtk/issues/1785 - // Fixed in GTK 3.24 - GdkEvent *pKeyEvent = GtkSalFrame::makeFakeKeyPress(pWidget); - gtk_main_do_event(pKeyEvent); - GdkEvent *pTriggerEvent = gtk_get_current_event(); - bool bEventOwnership = true; - if (!pTriggerEvent) - { - pTriggerEvent = pKeyEvent; - bEventOwnership = false; - } bool bSwapForRTL = SwapForRTL(pWidget); @@ -11330,10 +11317,8 @@ public: else gtk_menu_popup_at_rect(m_pMenu, widget_get_surface(pWidget), &aRect, GDK_GRAVITY_NORTH_EAST, GDK_GRAVITY_NORTH_WEST, pTriggerEvent); } - if (bEventOwnership) + if (pTriggerEvent) gdk_event_free(pTriggerEvent); - - gdk_event_free(pKeyEvent); #endif if (g_main_loop_is_running(pLoop))
