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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Oct 17 20:11:55 UTC 2020


 vcl/unx/gtk3/gtk3gtkframe.cxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d89a2b67ee74998b12ca7d23fb2b1717301a3f95
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Oct 17 19:43:17 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Oct 17 22:11:20 2020 +0200

    Resolves: tdf#137201 don't update IM if focus is in another widget
    
    Change-Id: Ib5dd5a7d8b1e74655891c3ffa03f1ba77102f294
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104469
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d14574489956..4055520fe153 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3216,11 +3216,8 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointe
 
     vcl::DeletionListener aDel( pThis );
 
-    if( pThis->m_pIMHandler )
-    {
-        if( pThis->m_pIMHandler->handleKeyEvent( pEvent ) )
-            return true;
-    }
+    if (!bFocusInAnotherGtkWidget && pThis->m_pIMHandler && pThis->m_pIMHandler->handleKeyEvent(pEvent))
+        return true;
 
     bool bStopProcessingKey = false;
 


More information about the Libreoffice-commits mailing list