diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-20 16:37:52 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2024-01-08 08:52:45 +0100 |
| commit | 30b9bdcc524d4fb70f9f970cd014ff4584fe1549 (patch) | |
| tree | ab22cb6f3f33e2d5ce5a9a35f112f395d167e1db /sd | |
| parent | dfb1f218448464bee5f46f43c43d83f859689551 (diff) | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
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 ) |