mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#87905: Use darker background colour for master view

Browse Source 
for the area behind the slide, that is

Change-Id: Ie020f43a81e5eaa257c20d0a7b6feffce1614205
Reviewed-on: https://gerrit.libreoffice.org/16466
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Philippe Jung <phil.jung@free.fr>
This commit is contained in:
Katarina Behrens 2015-06-25 09:47:37 +02:00
parent af8143bc40
commit 1c481fe652
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sd/source/ui/inc/DrawViewShell.hxx
View File

@ -388,6 +388,9 @@ public:
OUString GetSidebarContextName() const; OUString GetSidebarContextName() const;
const Color& GetAppBackgroundColor() const { return mnAppBackgroundColor; }
void SetAppBackgroundColor( Color nNewColor ) { mnAppBackgroundColor = nNewColor; }
//move this method to ViewShell. //move this method to ViewShell.
//void NotifyAccUpdate(); //void NotifyAccUpdate();
protected: protected:
@ -519,6 +522,9 @@ private:
::std::unique_ptr< ViewOverlayManager > mpViewOverlayManager; ::std::unique_ptr< ViewOverlayManager > mpViewOverlayManager;
std::vector<std::unique_ptr<SdrExternalToolEdit>> m_ExternalEdits; std::vector<std::unique_ptr<SdrExternalToolEdit>> m_ExternalEdits;
// The colour of the area behind the slide (used to be called "Wiese")
Color mnAppBackgroundColor;
}; };
} // end of namespace sd } // end of namespace sd

10
sd/source/ui/view/drviews1.cxx
View File

@ -316,6 +316,7 @@ bool DrawViewShell::PrepareClose( bool bUI )
return true; return true;
} }
/** /**
* Set status (enabled/disabled) of menu SfxSlots * Set status (enabled/disabled) of menu SfxSlots
*/ */
@ -377,6 +378,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_COMMON_TASK); GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_COMMON_TASK);
} }
svtools::ColorConfig aColorConfig;
Color aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
if (meEditMode == EM_PAGE) if (meEditMode == EM_PAGE)
{ {
/****************************************************************** /******************************************************************
@ -402,6 +406,8 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
maTabControl->SetCurPageId(nActualPageNum + 1); maTabControl->SetCurPageId(nActualPageNum + 1);
SetAppBackgroundColor( aFillColor );
SwitchPage(nActualPageNum); SwitchPage(nActualPageNum);
} }
else else
@ -438,6 +444,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
} }
} }
aFillColor.DecreaseLuminance( 64 );
SetAppBackgroundColor( aFillColor );
maTabControl->SetCurPageId(nActualMasterPageNum + 1); maTabControl->SetCurPageId(nActualMasterPageNum + 1);
SwitchPage(nActualMasterPageNum); SwitchPage(nActualMasterPageNum);
} }
@ -477,6 +486,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
Invalidate( SID_TITLE_MASTERPAGE ); Invalidate( SID_TITLE_MASTERPAGE );
Invalidate( SID_NOTES_MASTERPAGE ); Invalidate( SID_NOTES_MASTERPAGE );
Invalidate( SID_HANDOUT_MASTERPAGE ); Invalidate( SID_HANDOUT_MASTERPAGE );
InvalidateWindows();
SetContextName(GetSidebarContextName()); SetContextName(GetSidebarContextName());
} }

8
sd/source/ui/view/drviews5.cxx
View File

@ -406,19 +406,13 @@ void DrawViewShell::PrePaint()
*/ */
void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
{ {
// Fill var FillColor here to have it available on later call
svtools::ColorConfig aColorConfig;
Color aFillColor;
aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
/* This is done before each text edit, so why not do it before every paint. /* 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 The default language is only used if the outliner only contains one
character in a symbol font */ character in a symbol font */
GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( GetDoc()->GetLanguage( EE_CHAR_LANGUAGE ) ); GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( GetDoc()->GetLanguage( EE_CHAR_LANGUAGE ) );
// Set Application Background color for usage in SdrPaintView(s) // Set Application Background color for usage in SdrPaintView(s)
mpDrawView->SetApplicationBackgroundColor(aFillColor); mpDrawView->SetApplicationBackgroundColor(GetAppBackgroundColor());
/* This is done before each text edit, so why not do it before every paint. /* 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 The default language is only used if the outliner only contains one

3
sd/source/ui/view/drviewsa.cxx
View File

@ -209,6 +209,9 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
mbPastePossible = false; mbPastePossible = false;
mbIsLayerModeActive = false; mbIsLayerModeActive = false;
svtools::ColorConfig aColorConfig;
mnAppBackgroundColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
mpFrameView->Connect(); mpFrameView->Connect();
OSL_ASSERT (GetViewShell()!=NULL); OSL_ASSERT (GetViewShell()!=NULL);