diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-20 20:26:24 +0900 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-10-26 09:20:52 +0000 |
commit | 406798f8aae3c0e305d6994fc82561a5002af0aa (patch) | |
tree | c69d6ff91c08290a4142152c0bf3c7ded9d1be9c /sd/source/ui/view | |
parent | 0b4be27b147485fb4d61d3398cbb3860e69f01c1 (diff) |
tdf#96948 Change color of the area behind Impress slide immediately
after saving Options > Application colours > Application background.
This fixes a regression from 1c481fe6522f4c7d883e77a4ac32f855b9bcb323.
Change-Id: I8dc0caf9e351c0b1bf2a10e9097d8f3e895f1471
Reviewed-on: https://gerrit.libreoffice.org/29957
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r-- | sd/source/ui/view/drviews1.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/drviews4.cxx | 11 | ||||
-rw-r--r-- | sd/source/ui/view/drviews5.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 11 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsk.cxx | 37 |
5 files changed, 46 insertions, 25 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 84696ce6b4fd..a5216754615a 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -380,10 +380,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_COMMON_TASK); } - svtools::ColorConfig aColorConfig; - Color aFillColor( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor ); - if (comphelper::LibreOfficeKit::isActive()) - aFillColor = COL_TRANSPARENT; + ConfigureAppBackgroundColor(); if (meEditMode == EditMode::Page) { @@ -410,8 +407,6 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) maTabControl->SetCurPageId(nActualPageNum + 1); - SetAppBackgroundColor( aFillColor ); - SwitchPage(nActualPageNum); //tdf#102343 re-enable common undo on switch back from master mode @@ -451,9 +446,6 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) } } - aFillColor.DecreaseLuminance( 64 ); - SetAppBackgroundColor( aFillColor ); - maTabControl->SetCurPageId(nActualMasterPageNum + 1); SwitchPage(nActualMasterPageNum); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index c8d526f23ada..5c95ce82afda 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include "DrawViewShell.hxx" -#include <comphelper/lok.hxx> #include <vcl/msgbox.hxx> #include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> @@ -342,14 +341,8 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) // is needed it is necessary to set it here. if (GetDoc()) { - svtools::ColorConfig aColorConfig; - Color aFillColor; - - aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor ); - if (comphelper::LibreOfficeKit::isActive()) - aFillColor = COL_TRANSPARENT; - - mpDrawView->SetApplicationBackgroundColor(aFillColor); + ConfigureAppBackgroundColor(); + mpDrawView->SetApplicationBackgroundColor( mnAppBackgroundColor ); } ViewShell::MouseMove(rMEvt, pWin); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index b3ce9775e306..7dca113d400e 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -414,7 +414,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) GetDoc()->GetDrawOutliner().SetDefaultLanguage( GetDoc()->GetLanguage( EE_CHAR_LANGUAGE ) ); // Set Application Background color for usage in SdrPaintView(s) - mpDrawView->SetApplicationBackgroundColor(GetAppBackgroundColor()); + mpDrawView->SetApplicationBackgroundColor( mnAppBackgroundColor ); /* This is done before each text edit, so why not do it before every paint. The default language is only used if the outliner only contains one diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index ad3c9b13d130..84ed10d6aa6f 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -20,7 +20,6 @@ #include "DrawViewShell.hxx" #include <com/sun/star/scanner/ScannerManager.hpp> #include <cppuhelper/implbase.hxx> -#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <editeng/sizeitem.hxx> #include <svx/svdlayer.hxx> @@ -128,10 +127,15 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas SetContextName(GetSidebarContextName()); doShow(); + + ConfigureAppBackgroundColor(); + SD_MOD()->GetColorConfig().AddListener(this); } DrawViewShell::~DrawViewShell() { + SD_MOD()->GetColorConfig().RemoveListener(this); + mpSelectionChangeHandler->Disconnect(); mpAnnotationManager.reset(); @@ -205,11 +209,6 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) mbPastePossible = false; mbIsLayerModeActive = false; - svtools::ColorConfig aColorConfig; - mnAppBackgroundColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor ); - if (comphelper::LibreOfficeKit::isActive()) - mnAppBackgroundColor = COL_TRANSPARENT; - mpFrameView->Connect(); OSL_ASSERT (GetViewShell()!=nullptr); diff --git a/sd/source/ui/view/drviewsk.cxx b/sd/source/ui/view/drviewsk.cxx new file mode 100644 index 000000000000..aaf11ddfb471 --- /dev/null +++ b/sd/source/ui/view/drviewsk.cxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "DrawViewShell.hxx" +#include "sdmod.hxx" + +#include <comphelper/lok.hxx> + +namespace sd { + +void DrawViewShell::ConfigurationChanged( utl::ConfigurationBroadcaster* pCb, sal_uInt32 ) +{ + ConfigureAppBackgroundColor( dynamic_cast<svtools::ColorConfig*>(pCb) ); +} + +void DrawViewShell::ConfigureAppBackgroundColor( svtools::ColorConfig *pColorConfig ) +{ + if (!pColorConfig) + pColorConfig = &SD_MOD()->GetColorConfig(); + Color aFillColor( pColorConfig->GetColorValue( svtools::APPBACKGROUND ).nColor ); + if (comphelper::LibreOfficeKit::isActive()) + aFillColor = COL_TRANSPARENT; + // tdf#87905 Use darker background color for master view + if (meEditMode == EditMode::MasterPage) + aFillColor.DecreaseLuminance( 64 ); + mnAppBackgroundColor = aFillColor; +} + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |