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

Relates tdf#130778 - Branding for 7.0

Browse Source 
Better splash screen images
Start center image depending on initial size

Change-Id: I18823e04537bb217eaa7610c71c8021907dbbb94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92583
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
Heiko Tietze
2020-04-20 17:04:16 +02:00
committed by Heiko Tietze
parent 86f9825f25
commit 951b7eef88
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
icon-themes/colibre/brand/intro-highres.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 128 KiB

BIN
icon-themes/colibre/brand/intro.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 85 KiB

BIN
icon-themes/colibre/brand_dev/intro-highres.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 124 KiB

BIN
icon-themes/colibre/brand_dev/intro.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 83 KiB

8
instsetoo_native/CustomTarget_setup.mk
View File

@@ -137,10 +137,10 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressBarColor=0,0,0' \ && echo 'ProgressBarColor=0,0,0' \
&& echo 'ProgressFrameColor=102,102,102' \ && echo 'ProgressFrameColor=102,102,102' \
&& echo 'ProgressPosition=30,145' \ && echo 'ProgressPosition=30,145' \
&& echo 'ProgressSize=265,8' \ && echo 'ProgressSize=385,8' \
&& echo 'ProgressPositionHigh=46,212' \ && echo 'ProgressPositionHigh=30,200' \
&& echo 'ProgressSizeHigh=617,12' \ && echo 'ProgressSizeHigh=650,12' \
&& echo 'ProgressTextBaseline=160' \ && echo 'ProgressTextBaseline=150' \
&& echo 'ProgressTextColor=0,0,0' \ && echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \ && echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \ && echo 'SecureUserConfigCompress=true' \

8
sfx2/source/control/recentdocsview.cxx
View File

@@ -136,8 +136,6 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
setItemMaxTextLength( 30 ); setItemMaxTextLength( 30 );
setItemDimensions( mnItemMaxSize, mnItemMaxSize, gnTextHeight, gnItemPadding ); setItemDimensions( mnItemMaxSize, mnItemMaxSize, gnTextHeight, gnItemPadding );
maWelcomeImage = SfxApplication::GetApplicationLogo(500);
maFillColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maFillColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get());
maTextColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); maTextColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get());
maHighlightColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); maHighlightColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get());
@@ -355,6 +353,12 @@ void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
if (mItemList.empty()) if (mItemList.empty())
{ {
if (maWelcomeImage.IsEmpty())
{
const long aWidth(aRect.GetWidth() > aRect.getHeight() ? aRect.GetHeight()/2 : aRect.GetWidth()/2);
maWelcomeImage = SfxApplication::GetApplicationLogo(aWidth);
}
// No recent files to be shown yet. Show a welcome screen. // No recent files to be shown yet. Show a welcome screen.
rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR); rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
SetMessageFont(rRenderContext); SetMessageFont(rRenderContext);