sd/source/ui/slideshow/showwin.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
New commits: commit 30b9bdcc524d4fb70f9f970cd014ff4584fe1549 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Dec 20 16:37:52 2023 +0000 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Jan 8 08:52:45 2024 +0100 Resolves: tdf#158332 'fake' keystroke exits presentation the fake keystroke is to make tooltips go away before menus which used to be a problem versions of gtk3 < 3.24 that resultsed in no menus appearing. Our min is still 3.18 so technically we need to retain that until bumping past that as baseline. Change-Id: I94aa309665c50c8ca310285d1e691030f443934a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161023 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 8e1f8a6d49cd..dfa04f47a07e 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -97,6 +97,12 @@ 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 ) @@ -126,11 +132,7 @@ void ShowWindow::KeyInput(const KeyEvent& rKEvt) } else if( SHOWWINDOWMODE_BLANK == meShowWindowMode ) { - bool bFakeKeyPress = rKEvt.GetKeyCode().GetFullCode() == 0; - // Ignore workaround of https://gitlab.gnome.org/GNOME/gtk/issues/1785 - // See calls to GtkSalFrame::makeFakeKeyPress (Fixed in GTK 2.34) - if (!bFakeKeyPress) - RestartShow(); + RestartShow(); bReturn = true; } else if( SHOWWINDOWMODE_PAUSE == meShowWindowMode )
