Relates tdf#130778 - Branding for 7.0
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>
diff --git a/icon-themes/colibre/brand/intro-highres.png b/icon-themes/colibre/brand/intro-highres.png
index d27f885..8e11c7a 100644
--- a/icon-themes/colibre/brand/intro-highres.png
+++ b/icon-themes/colibre/brand/intro-highres.png
Binary files differ
diff --git a/icon-themes/colibre/brand/intro.png b/icon-themes/colibre/brand/intro.png
index 23ead5c..5c105f1 100644
--- a/icon-themes/colibre/brand/intro.png
+++ b/icon-themes/colibre/brand/intro.png
Binary files differ
diff --git a/icon-themes/colibre/brand_dev/intro-highres.png b/icon-themes/colibre/brand_dev/intro-highres.png
index acbb1b8..f830836 100644
--- a/icon-themes/colibre/brand_dev/intro-highres.png
+++ b/icon-themes/colibre/brand_dev/intro-highres.png
Binary files differ
diff --git a/icon-themes/colibre/brand_dev/intro.png b/icon-themes/colibre/brand_dev/intro.png
index db8139e..6c928c6 100644
--- a/icon-themes/colibre/brand_dev/intro.png
+++ b/icon-themes/colibre/brand_dev/intro.png
Binary files differ
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index d9f0d6d..27fd118 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -137,10 +137,10 @@
&& echo 'ProgressBarColor=0,0,0' \
&& echo 'ProgressFrameColor=102,102,102' \
&& echo 'ProgressPosition=30,145' \
&& echo 'ProgressSize=265,8' \
&& echo 'ProgressPositionHigh=46,212' \
&& echo 'ProgressSizeHigh=617,12' \
&& echo 'ProgressTextBaseline=160' \
&& echo 'ProgressSize=385,8' \
&& echo 'ProgressPositionHigh=30,200' \
&& echo 'ProgressSizeHigh=650,12' \
&& echo 'ProgressTextBaseline=150' \
&& echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index b4b5fea..468c03b 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -136,8 +136,6 @@
setItemMaxTextLength( 30 );
setItemDimensions( mnItemMaxSize, mnItemMaxSize, gnTextHeight, gnItemPadding );
maWelcomeImage = SfxApplication::GetApplicationLogo(500);
maFillColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get());
maTextColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get());
maHighlightColor = Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get());
@@ -355,6 +353,12 @@
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.
rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
SetMessageFont(rRenderContext);
