[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b986fa2c66e272d926b189683c12cca81bcb5125
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 27 14:33:40 2017 +0100

    Resolves: rhbz#1436050 im window misplaced for gtk3
    
    events are relative to event window not the toplevel
    window which includes a menubar widget (and maybe
    the decoration topbar as well)
    
    Change-Id: I5101bd4a35d6e3aee03191594e5f6edb7ca34c69
    (cherry picked from commit 32351d1bd34a0a0d3bb8fa41667a770c125de460)
    Reviewed-on: https://gerrit.libreoffice.org/35761
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 1a4823eb3eb5..550e76e8cbe4 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3566,7 +3566,7 @@ void GtkSalFrame::IMHandler::createIMContext()
                           G_CALLBACK (signalIMPreeditEnd), this );
 
         GetGenericData()->ErrorTrapPush();
-        gtk_im_context_set_client_window( m_pIMContext, widget_get_window(GTK_WIDGET(m_pFrame->m_pWindow)) );
+        gtk_im_context_set_client_window(m_pIMContext, widget_get_window(m_pFrame->getMouseEventWidget()));
         gtk_im_context_focus_in( m_pIMContext );
         GetGenericData()->ErrorTrapPop();
         m_bFocused = true;