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

[Miklos Vajna (via logerrit)]

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

New commits:
commit bdac08d52f7f264a5d67723cae63533493b3f580
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed May 22 14:51:07 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed May 22 20:34:21 2019 +0200

    tdf#108909 vcl menu bar window: fix missing highlight on mouse over
    
    Regression from commit 458a827e96523ac52d021f1fd3653b5a734940c0 (further
    refactor Menu to use RenderContext, 2015-05-15), the problem was that
    this highlight on the menu bar on mouse move was only part of the
    incremental paint, never the full paint.
    
    So when that commit removed incremental paint, we lost highlight on
    mouse move (move only, click is there).
    
    Later commit 843b9d5dba5098c2676491dda66bed31e57f4329 (VCL add support
    for rollover menubars, 2016-09-22) added this code back, conditionally
    for the case when there is not enough space for the menu bar
    horizontally.
    
    So fix the lack of highlight on plain mouse move by unconditionally
    highlighting the rolled over item, even if there is enough horizontal
    space.
    
    Change-Id: I357001f2e65f843444ed0ffbe470667dfc5d5aa3
    Reviewed-on: https://gerrit.libreoffice.org/72774
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 725de0794043..b32e38790cd4 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -946,7 +946,7 @@ void MenuBarWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
 
     if (nHighlightedItem != ITEMPOS_INVALID && pMenu && !pMenu->GetItemList()->GetDataFromPos(nHighlightedItem)->bHiddenOnGUI)
         HighlightItem(*pBuffer, nHighlightedItem);
-    else if (ImplGetSVData()->maNWFData.mbRolloverMenubar && nRolloveredItem != ITEMPOS_INVALID)
+    else if (nRolloveredItem != ITEMPOS_INVALID)
         HighlightItem(*pBuffer, nRolloveredItem);
 
     // in high contrast mode draw a separating line on the lower edge