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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkframe.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit f565adda49eae3cb2a07c3b4f2dff5c380c7a524
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 7 12:42:57 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 7 15:49:17 2021 +0200

    Revert: #i47175# update eventual pointer grab with cursor
    
    revert commit:
    
    commit d4f61372b23d6bb7f4df1e563f0823b3a3211c1d
    Date:   Mon Mar 5 14:25:35 2007 +0000
    
        INTEGRATION: CWS vcl74 (1.59.42); FILE MERGED
        2007/01/31 15:25:15 pl 1.59.42.1: #i47175# update eventual pointer grab with cursor
    
    this got later modified by...
    
    commit e9cb118e6e98eb13b3ad1901c8c912bed674f096
    Date:   Tue Jan 29 15:21:11 2008 +0000
    
        INTEGRATION: CWS vcl85_SRC680 (1.71.70); FILE MERGED
        ...
        2007/12/13 15:30:31 pl 1.71.70.1: #i80791# use correct owner events parameter in SetPointer
    
    but now in impress, under wayland, if I click and hold on the border of
    a textbox and then try to use SetPointer while the mouse is captured
    then the cursor doesn't change, the regrab drops the cursor.
    
    The original problem reported back in #i47175# no longer arises in gtk
    as the dialog is a native gtk one.
    
    Drop this workaround as its weird to potentially do a special grab when
    we just want to change the mouse cursor.
    
    Change-Id: Ifb7f55a17692a5e79cd4221d1e0f440dacbee0bf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121775
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index cd596b3a4297..807d5e8b5445 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -2299,12 +2299,6 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle )
     m_ePointerStyle = ePointerStyle;
     GdkCursor *pCursor = getDisplay()->getCursor( ePointerStyle );
     widget_set_cursor(GTK_WIDGET(m_pWindow), pCursor);
-
-    // #i80791# use grabPointer the same way as CaptureMouse, respective float grab
-    if( getDisplay()->MouseCaptured( this ) )
-        grabPointer( true, false, false );
-    else if( m_nFloats > 0 )
-        grabPointer( true, false, true );
 }
 
 void GtkSalFrame::grabPointer( bool bGrab, bool bKeyboardAlso, bool bOwnerEvents )