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

[Maxim Monastirsky (via logerrit)]

 vcl/source/window/brdwin.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 46984619f8b7fa30678b5c7ccd40a0d727a57ce5
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Wed Jan 27 16:49:54 2021 +0200
Commit:     Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Thu Jan 28 10:40:39 2021 +0100

    tdf#122714 Avoid tracking mode for a toolbar's title menu button
    
    Regression of commit c3e552ac25be001a623469c549ee8d0719b98133
    ("wayland: Make popup menus not show off-screen"). Apparently
    executing the menu async used to give the tracking mode a chance
    to be turned off.
    
    Avoid the problem by not activating that mode in the first place.
    And because the Tracking method will no longer be executed, we
    also need to reset the "pressed" state here instead.
    
    Change-Id: Iab63f1eaada1f4945507d6bdd05dc6171e6afbab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110029
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 78258d758776..2604aa043114 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -805,6 +805,11 @@ bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt )
                     SystemWindow* pClientWindow = static_cast<SystemWindow*>(pBorderWindow->ImplGetClientWindow());
                     pClientWindow->TitleButtonClick( TitleButton::Menu );
                 }
+
+                maFrameData.mnMenuState &= ~DrawButtonFlags::Pressed;
+                pBorderWindow->InvalidateBorder();
+
+                bTracking = false;
             }
             else if ( maFrameData.mnHitTest & BorderWindowHitTest::Hide )
             {