[Libreoffice-commits] core.git: desktop/unx instsetoo_native/CustomTarget_setup.mk instsetoo_native/util

[heiko tietze]

 desktop/unx/source/splashx.c            |   19 ++++++++++++++++---
 instsetoo_native/CustomTarget_setup.mk  |    2 ++
 instsetoo_native/util/openoffice.lst.in |    2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit e27e6720ac1f7bb1e44872a7fd3cca5f3340b16a
Author: heiko tietze <tietze.heiko at gmail.com>
Date:   Wed Nov 22 19:05:29 2017 +0100

    tdf#90794 Position of progress bar on high res screens
    
    Introduced two new consts
    
    Change-Id: I15e01eabe9fd3225c36d06cbb59310a07a30f2c1
    Reviewed-on: https://gerrit.libreoffice.org/45105
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>
    Tested-by: Heiko Tietze <tietze.heiko at googlemail.com>

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 6bb98f965a91..8a1064e3673c 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -55,6 +55,8 @@ struct splash
     Colormap color_map;
     Window win;
     GC gc;
+    //true when intro-highres loaded successfully
+    sal_Bool bHasHiDpiImage;
 
 // Progress bar values
 // taken from desktop/source/splash/splash.cxx
@@ -611,12 +613,15 @@ static void splash_load_image( struct splash* splash, rtl_uString* pUAppPath )
         goto cleanup; /* success */
 
     /* load high resolution splash image */
+    splash->bHasHiDpiImage = sal_False;
     if (isHiDPI(splash))
     {
-        /* TODO- change progress bar parameters after getting size of intro-highres.png */
         strcpy (pSuffix, "intro-highres" IMG_SUFFIX);
         if ( splash_load_bmp( splash, pBuffer ) )
+        {
+            splash->bHasHiDpiImage = sal_True;
             goto cleanup; /* success */
+        }
     }
     /* load standard resolution splash image */
     strcpy (pSuffix, "intro" IMG_SUFFIX);
@@ -655,8 +660,16 @@ static void splash_load_defaults( struct splash* splash, rtl_uString* pAppPath,
     get_bootstrap_value( logo,  1, handle, "Logo" );
     get_bootstrap_value( bar,   3, handle, "ProgressBarColor" );
     get_bootstrap_value( frame, 3, handle, "ProgressFrameColor" );
-    get_bootstrap_value( pos,   2, handle, "ProgressPosition" );
-    get_bootstrap_value( size,  2, handle, "ProgressSize" );
+    if (isHiDPI(splash) && splash->bHasHiDpiImage)
+    {
+       get_bootstrap_value( pos,   2, handle, "ProgressPositionHigh" );
+       get_bootstrap_value( size,  2, handle, "ProgressSizeHigh" );
+    }
+    else
+    {
+       get_bootstrap_value( pos,   2, handle, "ProgressPosition" );
+       get_bootstrap_value( size,  2, handle, "ProgressSize" );
+    }
 
     if ( logo[0] == 0 )
     {
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index ee90c17c31c0..95de9f7202fa 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -126,6 +126,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'ProgressFrameColor=102,102,102' \
 		&& echo 'ProgressPosition=35,153' \
 		&& echo 'ProgressSize=444,8' \
+		&& echo 'ProgressPositionHigh=46,212' \
+		&& echo 'ProgressSizeHigh=617,12' \
 		&& echo 'ProgressTextBaseline=145' \
 		&& echo 'ProgressTextColor=255,255,255' \
 		&& echo 'SecureUserConfig=true' \
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 442cfca66c54..24bb9761f7f0 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -17,7 +17,9 @@ Globals
             SOLSUREPACKAGEPREFIX libreoffice
             PROGRESSBARCOLOR 0,0,0
             PROGRESSSIZE 444,8
+            PROGRESSSIZEHIGH 617,12
             PROGRESSPOSITION 35,153
+            PROGRESSPOSITIONHIGH 46,212
             PROGRESSFRAMECOLOR 102,102,102
             PROGRESSTEXTBASELINE 145
             PROGRESSTEXTCOLOR 255,255,255