[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

László Németh laszlo.nemeth at collabora.com
Thu Oct 8 00:20:08 PDT 2015


 vcl/source/window/menufloatingwindow.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48a7d0492dbae60d644dd7be9b1b0826fdf36f63
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Wed Sep 30 22:29:46 2015 +0200

    tdf#92702 Unable to select menu items that were initially off-screen
    
    Revert "Last item of menu with title cannot be hilighted"
    
    This reverts commit 8ced97caa409d6dc8f69230145e9c9f281fb84fe.
    
    (Cherry-picked from the commit 4f1dca5083c5a301181786b563b165f19a9dec7f)
    
    Change-Id: Ic8c2195d4791900ada0296215c335b9dc39db220
    Reviewed-on: https://gerrit.libreoffice.org/19048
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 972ec16..5ff6cc2 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -190,7 +190,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow
     long nY = GetInitialItemY();
     long nMouseY = rMEvt.GetPosPixel().Y();
     Size aOutSz = GetOutputSizePixel();
-    if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() + nY ) ) )
+    if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() - nY ) ) )
     {
         bool bHighlighted = false;
         size_t nCount = pMenu->pItemList->size();


More information about the Libreoffice-commits mailing list