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

[Jan Holesovsky]

 include/vcl/salnativewidgets.hxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit d8212cc7160d0fc346126770e2791a467ebb6ad5
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Sep 2 18:53:34 2015 +0200

    opengl: Don't cache the menubar background.
    
    It can change based on the _toolbar_ size.  The toolbar itself is fine though;
    it may depend on the menubar size, but that should be constant.
    
    Change-Id: Id2c68c89f4ec0774bc74b8c4a5b9a5e59e22137f
    Reviewed-on: https://gerrit.libreoffice.org/18279
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index fb128d3..cc5db6f 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -287,6 +287,12 @@ public:
             case CTRL_CHECKBOX:
             case CTRL_RADIOBUTTON:
                 return false;
+
+            case CTRL_MENUBAR:
+                if (mnPart == PART_ENTIRE_CONTROL)
+                    return false;
+                break;
+
             default:
                 break;
         }