зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1337856 Part 1 - Use a better up/down-scaling method for the stub installer background. r=agashlin
MozReview-Commit-ID: Ag02ni4nJ00 --HG-- extra : rebase_source : 391e57a31468a9215953ba0491756bff99bec1bd
This commit is contained in:
Matt Howell
Родитель
bef1791925
Коммит
5ed38fdf7f
|
|
@ -469,7 +469,8 @@ Function .onInit
|
|||
CreateFont $FontCheckbox "$0" "10" "400"
|
||||
|
||||
InitPluginsDir
|
||||
File /oname=$PLUGINSDIR\bgstub.bmp "bgstub.bmp"
|
||||
File /oname=$PLUGINSDIR\bgstub.jpg "bgstub.jpg"
|
||||
File /oname=$PLUGINSDIR\bgstub_2x.jpg "bgstub_2x.jpg"
|
||||
|
||||
SetShellVarContext all ; Set SHCTX to All Users
|
||||
; If the user doesn't have write access to the installation directory set
|
||||
|
|
@ -565,6 +566,26 @@ Function .onUserAbort
|
|||
Abort
|
||||
FunctionEnd
|
||||
|
||||
Function DrawBackgroundImage
|
||||
${NSD_CreateBitmap} 0 0 100% 100% ""
|
||||
Pop $HwndBgBitmapControl
|
||||
|
||||
; If the scaling factor is 100%, use the 1x image; the 2x images scaled down
|
||||
; by that much don't always look good because some of them use thinner lines
|
||||
; and a darker background (over which aliasing is more visible).
|
||||
System::Call 'user32::GetWindowDC(i $HWNDPARENT) i .r0'
|
||||
System::Call 'gdi32::GetDeviceCaps(i $0, i 88) i .r1' ; 88 = LOGPIXELSX
|
||||
System::Call 'user32::ReleaseDC(i $HWNDPARENT, i $0)'
|
||||
${If} $1 <= 96
|
||||
${SetStretchedImageOLE} $HwndBgBitmapControl $PLUGINSDIR\bgstub.jpg $BgBitmapImage
|
||||
${Else}
|
||||
${SetStretchedImageOLE} $HwndBgBitmapControl $PLUGINSDIR\bgstub_2x.jpg $BgBitmapImage
|
||||
${EndIf}
|
||||
|
||||
; transparent bg on control prevents flicker on redraw
|
||||
SetCtlColors $HwndBgBitmapControl ${INSTALL_BLURB_TEXT_COLOR} transparent
|
||||
FunctionEnd
|
||||
|
||||
Function createProfileCleanup
|
||||
Call ShouldPromptForProfileCleanup
|
||||
${Select} $ProfileCleanupPromptType
|
||||
|
|
@ -702,11 +723,7 @@ Function createProfileCleanup
|
|||
SendMessage $0 ${WM_SETFONT} $FontFooter 0
|
||||
SetCtlColors $0 ${INSTALL_BLURB_TEXT_COLOR} transparent
|
||||
|
||||
${NSD_CreateBitmap} 0 0 100% 100% ""
|
||||
Pop $HwndBgBitmapControl
|
||||
${NSD_SetStretchedImage} $HwndBgBitmapControl $PLUGINSDIR\bgstub.bmp $BgBitmapImage
|
||||
; transparent bg on control prevents flicker on redraw
|
||||
SetCtlColors $HwndBgBitmapControl ${INSTALL_BLURB_TEXT_COLOR} transparent
|
||||
Call DrawBackgroundImage
|
||||
|
||||
LockWindow off
|
||||
nsDialogs::Show
|
||||
|
|
@ -784,11 +801,7 @@ Function createInstall
|
|||
SendMessage $Progressbar ${PBM_SETMARQUEE} 1 \
|
||||
$ProgressbarMarqueeIntervalMS ; start=1|stop=0 interval(ms)=+N
|
||||
|
||||
${NSD_CreateBitmap} 0 0 100% 100% ""
|
||||
Pop $HwndBgBitmapControl
|
||||
${NSD_SetStretchedImage} $HwndBgBitmapControl $PLUGINSDIR\bgstub.bmp $BgBitmapImage
|
||||
; transparent bg on control prevents flicker on redraw
|
||||
SetCtlColors $HwndBgBitmapControl ${INSTALL_BLURB_TEXT_COLOR} transparent
|
||||
Call DrawBackgroundImage
|
||||
|
||||
GetDlgItem $0 $HWNDPARENT 1 ; Install button
|
||||
EnableWindow $0 0
|
||||
|
|
|
|||
|
|
@ -7403,18 +7403,39 @@
|
|||
!endif
|
||||
|
||||
/**
|
||||
* Modified version of the __NSD_SetStretchedImage macro from nsDialogs.nsh that
|
||||
* supports transparency. See nsDialogs documentation for additional info.
|
||||
* Draws an image file (BMP, GIF, or JPG) onto a bitmap control, with scaling.
|
||||
* Adapted from https://stackoverflow.com/a/13405711/1508094
|
||||
*
|
||||
* @param CONTROL bitmap control created by NSD_CreateBitmap
|
||||
* @param IMAGE path to image file to draw to the bitmap
|
||||
* @param HANDLE output bitmap handle which must be freed via NSD_FreeImage
|
||||
* after nsDialogs::Show has been called
|
||||
*/
|
||||
!macro __SetStretchedTransparentImage CONTROL IMAGE HANDLE
|
||||
Push $0
|
||||
Push $1
|
||||
Push $2
|
||||
Push $R0
|
||||
!macro __SetStretchedImageOLE CONTROL IMAGE HANDLE
|
||||
!ifndef IID_IPicture
|
||||
!define IID_IPicture {7BF80980-BF32-101A-8BBB-00AA00300CAB}
|
||||
!endif
|
||||
!ifndef SRCCOPY
|
||||
!define SRCCOPY 0xCC0020
|
||||
!endif
|
||||
!ifndef HALFTONE
|
||||
!define HALFTONE 4
|
||||
!endif
|
||||
|
||||
Push $0 ; HANDLE
|
||||
Push $1 ; memory DC
|
||||
Push $2 ; IPicture created from IMAGE
|
||||
Push $3 ; HBITMAP obtained from $2
|
||||
Push $4 ; BITMAPINFO obtained from $3
|
||||
Push $5 ; width of IMAGE
|
||||
Push $6 ; height of IMAGE
|
||||
Push $7 ; width of CONTROL
|
||||
Push $8 ; height of CONTROL
|
||||
Push $R0 ; CONTROL
|
||||
|
||||
StrCpy $R0 ${CONTROL} ; in case ${CONTROL} is $0
|
||||
StrCpy $1 ""
|
||||
StrCpy $2 ""
|
||||
StrCpy $7 ""
|
||||
StrCpy $8 ""
|
||||
|
||||
System::Call '*(i, i, i, i) i.s'
|
||||
Pop $0
|
||||
|
|
@ -7423,25 +7444,50 @@
|
|||
System::Call 'user32::GetClientRect(i R0, i r0)'
|
||||
System::Call '*$0(i, i, i .s, i .s)'
|
||||
System::Free $0
|
||||
Pop $1
|
||||
Pop $2
|
||||
Pop $7
|
||||
Pop $8
|
||||
${EndIf}
|
||||
|
||||
System::Call 'user32::LoadImageW(i 0, t s, i ${IMAGE_BITMAP}, i r1, i r2, \
|
||||
i ${MOZ_LOADTRANSPARENT}) i .s' "${IMAGE}"
|
||||
Pop $0
|
||||
SendMessage $R0 ${STM_SETIMAGE} ${IMAGE_BITMAP} $0
|
||||
|
||||
SetCtlColors $R0 "" transparent
|
||||
${NSD_AddExStyle} $R0 ${WS_EX_TRANSPARENT}|${WS_EX_TOPMOST}
|
||||
${If} $7 > 0
|
||||
${AndIf} $8 > 0
|
||||
System::Call 'oleaut32::OleLoadPicturePath(w"${IMAGE}",i0,i0,i0,g"${IID_IPicture}",*i.r2)i.r1'
|
||||
${If} $1 = 0
|
||||
System::Call 'user32::GetDC(i0)i.s'
|
||||
System::Call 'gdi32::CreateCompatibleDC(iss)i.r1'
|
||||
System::Call 'gdi32::CreateCompatibleBitmap(iss,ir7,ir8)i.r0'
|
||||
System::Call 'user32::ReleaseDC(i0,is)'
|
||||
System::Call '$2->3(*i.r3)i.r4' ; IPicture->get_Handle
|
||||
${If} $4 = 0
|
||||
System::Call 'gdi32::SetStretchBltMode(ir1,i${HALFTONE})'
|
||||
System::Call '*(&i40,&i1024)i.r4' ; BITMAP / BITMAPINFO
|
||||
System::Call 'gdi32::GetObject(ir3,i24,ir4)'
|
||||
System::Call 'gdi32::SelectObject(ir1,ir0)i.s'
|
||||
System::Call '*$4(i40,i.r5,i.r6,i0,i,i.s)' ; Grab size and bits-ptr AND init as BITMAPINFOHEADER
|
||||
System::Call 'gdi32::GetDIBits(ir1,ir3,i0,i0,i0,ir4,i0)' ; init BITMAPINFOHEADER
|
||||
System::Call 'gdi32::GetDIBits(ir1,ir3,i0,i0,i0,ir4,i0)' ; init BITMAPINFO
|
||||
System::Call 'gdi32::StretchDIBits(ir1,i0,i0,ir7,ir8,i0,i0,ir5,ir6,is,ir4,i0,i${SRCCOPY})'
|
||||
System::Call 'gdi32::SelectObject(ir1,is)'
|
||||
System::Free $4
|
||||
SendMessage $R0 ${STM_SETIMAGE} ${IMAGE_BITMAP} $0
|
||||
${EndIf}
|
||||
System::Call 'gdi32::DeleteDC(ir1)'
|
||||
System::Call '$2->2()' ; IPicture->release()
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
|
||||
Pop $R0
|
||||
Pop $8
|
||||
Pop $7
|
||||
Pop $6
|
||||
Pop $5
|
||||
Pop $4
|
||||
Pop $3
|
||||
Pop $2
|
||||
Pop $1
|
||||
Exch $0
|
||||
Pop ${HANDLE}
|
||||
!macroend
|
||||
!define SetStretchedTransparentImage "!insertmacro __SetStretchedTransparentImage"
|
||||
!define SetStretchedImageOLE "!insertmacro __SetStretchedImageOLE"
|
||||
|
||||
/**
|
||||
* Removes a single style from a control.
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче