[Libreoffice-commits] core.git: icon-themes/colibre instsetoo_native/CustomTarget_setup.mk sfx2/source

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro-highres.png     |binary
 icon-themes/colibre/brand/intro.png             |binary
 icon-themes/colibre/brand_dev/intro-highres.png |binary
 icon-themes/colibre/brand_dev/intro.png         |binary
 instsetoo_native/CustomTarget_setup.mk          |    8 ++++----
 sfx2/source/control/recentdocsview.cxx          |    8 ++++++--
 6 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 951b7eef8894bce7f119ecc0123c7e37fe6b4b4f
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Mon Apr 20 17:04:16 2020 +0200
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Tue Apr 21 17:04:50 2020 +0200

    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 at documentfoundation.org>

diff --git a/icon-themes/colibre/brand/intro-highres.png b/icon-themes/colibre/brand/intro-highres.png
index d27f8858dc6c..8e11c7a79399 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/intro.png b/icon-themes/colibre/brand/intro.png
index 23ead5c5fda1..5c105f155e99 100644
Binary files a/icon-themes/colibre/brand/intro.png and b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand_dev/intro-highres.png b/icon-themes/colibre/brand_dev/intro-highres.png
index acbb1b864d3c..f830836fe81d 100644
Binary files a/icon-themes/colibre/brand_dev/intro-highres.png and b/icon-themes/colibre/brand_dev/intro-highres.png differ
diff --git a/icon-themes/colibre/brand_dev/intro.png b/icon-themes/colibre/brand_dev/intro.png
index db8139e52abf..6c928c6100d9 100644
Binary files a/icon-themes/colibre/brand_dev/intro.png and b/icon-themes/colibre/brand_dev/intro.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index d9f0d6d51ac4..27fd118c4b9e 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -137,10 +137,10 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& 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 b4b5fea1c2ec..468c03b8b632 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -136,8 +136,6 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
     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 @@ void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
 
     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);