strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#90794 Position of progress bar on high res screens

Browse source 
Introduced two new consts

Change-Id: I15e01eabe9fd3225c36d06cbb59310a07a30f2c1
Reviewed-on: https://gerrit.libreoffice.org/45105
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Tested-by: Heiko Tietze <tietze.heiko@googlemail.com>
This commit is contained in:
heiko tietze 2017-11-22 19:05:29 +01:00 committed by Heiko Tietze
parent 2923cb0b5b
commit e27e6720ac
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
desktop/unx/source/splashx.c
View file

@ -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 )
{

2
instsetoo_native/CustomTarget_setup.mk
View file

@ -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' \

2
instsetoo_native/util/openoffice.lst.in
View file

@ -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