[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit fb08aedb6c2bf0c4eda720451970568533a3c5c1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 28 17:05:28 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 28 20:54:50 2021 +0200

    gtk4: restore 'return' in combobox to active default dialog/assistant button
    
    Change-Id: I540d8d6461470bf784c3cade909c4d4cd68d0854
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116353
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 3809bd35d4e5..5dc29911adac 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -16653,8 +16653,7 @@ private:
     // GtkEntry and activate the default dialog/assistant button
     bool combobox_activate()
     {
-#if 0
-        GtkWidget *pComboBox = GTK_WIDGET(m_pToggleButton);
+        GtkWidget *pComboBox = GTK_WIDGET(m_pComboBox);
         GtkWidget *pToplevel = widget_get_toplevel(pComboBox);
         GtkWindow *pWindow = GTK_WINDOW(pToplevel);
         if (!pWindow)
@@ -16663,12 +16662,9 @@ private:
             return false;
         bool bDone = false;
         GtkWidget *pDefaultWidget = gtk_window_get_default_widget(pWindow);
-        if (pDefaultWidget && pDefaultWidget != m_pToggleButton && gtk_widget_get_sensitive(pDefaultWidget))
+        if (pDefaultWidget && pDefaultWidget != pComboBox && gtk_widget_get_sensitive(pDefaultWidget))
             bDone = gtk_widget_activate(pDefaultWidget);
         return bDone;
-#else
-        return false;
-#endif
     }
 
 #if 0