diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-03-04 10:13:08 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-03-04 12:45:18 +0100 |
commit | 7a078207fbfd71b33cb51c38b3886351fedcde8d (patch) | |
tree | 098f8dc0a455d3b0e0f205239e37742b0f01acb2 | |
parent | 1e4e57afb50f25b5b7c4f24b3fb4d96c71e25b92 (diff) |
tdf#131076 allow 'return' in GtkComboBox to activate default widget
typically ok and accept the dialog. alt+down is documented as the
default menu-activate key binding, space will also work to popup
the menu from a combobox.
Change-Id: I7bec880670cc006b288996d6f59a88fe9a9fb8cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89950
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 28344edc8cc4..99fc6205ad67 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -12305,6 +12305,24 @@ private: g_signal_handler_unblock(m_pMenu, m_nMenuActivateSignalId); } + // tdf#131076 we want return in a GtkComboBox to act like return in a + // GtkEntry and activate the default dialog/assistant button + bool combobox_activate() + { + GtkWidget *pComboBox = GTK_WIDGET(m_pComboBox); + GtkWidget *pToplevel = gtk_widget_get_toplevel(pComboBox); + GtkWindow *pWindow = GTK_WINDOW(pToplevel); + if (!pWindow) + return false; + if (!GTK_IS_DIALOG(pWindow) && !GTK_IS_ASSISTANT(pWindow)) + return false; + bool bDone = false; + GtkWidget *pDefaultWidget = gtk_window_get_default_widget(pWindow); + if (pDefaultWidget && pDefaultWidget != m_pToggleButton && gtk_widget_get_sensitive(pDefaultWidget)) + bDone = gtk_widget_activate(pDefaultWidget); + return bDone; + } + bool signal_key_press(const GdkEventKey* pEvent) { KeyEvent aKEvt(GtkToVcl(*pEvent)); @@ -12313,7 +12331,8 @@ private: bool bDone = false; - switch (aKeyCode.GetCode()) + auto nCode = aKeyCode.GetCode(); + switch (nCode) { case KEY_DOWN: case KEY_UP: @@ -12325,9 +12344,16 @@ private: case KEY_RIGHT: case KEY_RETURN: m_aQuickSelectionEngine.Reset(); + // tdf#131076 don't let bare return toggle menu popup + if (nCode == KEY_RETURN && !pEvent->state) + bDone = combobox_activate(); break; default: - bDone = m_aQuickSelectionEngine.HandleKeyEvent(aKEvt); + // tdf#131076 let base space toggle menu popup when its not already visible + if (nCode == KEY_SPACE && !pEvent->state && !m_bPopupActive) + bDone = false; + else + bDone = m_aQuickSelectionEngine.HandleKeyEvent(aKEvt); break; } |