[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

[Kshitij Pathania]

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

New commits:
commit 4b848a51e9b8bc59aeb327d5c8349a29b26c31dc
Author: Kshitij Pathania <kshitijpathania at gmail.com>
Date:   Thu May 31 14:35:32 2018 +0530

    tdf#107266 made background continous for menubar and notebookbar
    
    Change-Id: Ieed538741f2a252c8acf1e751bb2ddbe6361b2fa
    Reviewed-on: https://gerrit.libreoffice.org/55118
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 09cc173d59c0b79dca1ea11b37c858e8716062d3)
    Reviewed-on: https://gerrit.libreoffice.org/56991
    Tested-by: Jenkins

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 594b7471d038..c28b6ff4cd5a 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1781,6 +1781,21 @@ void ImplBorderWindow::Resize()
         if (mpNotebookBar)
         {
             long nNotebookBarHeight = mpNotebookBar->GetSizePixel().Height();
+
+            const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+            const BitmapEx aPersona = rStyleSettings.GetPersonaHeader();
+            // since size of notebookbar changes, to make common persona for menubar
+            // and notebookbar persona should be set again with changed coordinates
+            if (!aPersona.IsEmpty())
+                {
+                    Wallpaper aWallpaper(aPersona);
+                    aWallpaper.SetStyle(WallpaperStyle::TopRight);
+                    aWallpaper.SetRect(tools::Rectangle(Point(0, -nTopBorder),
+                           Size(aSize.Width() - nLeftBorder - nRightBorder,
+                                nNotebookBarHeight + nTopBorder)));
+                    mpNotebookBar->SetBackground(aWallpaper);
+                }
+
             mpNotebookBar->setPosSizePixel(
                     nLeftBorder, nTopBorder,
                     aSize.Width() - nLeftBorder - nRightBorder,