Bug 963282 - Stub blurbs during download aren't always a minimum of 3 lines. r=bbondy
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 24 Jan 2014 10:38:25 -0800
changeset 181102 2afb7bf0bf0b2481fbd4a69f92ff88c0c65d07ef
parent 181101 660fd9fb86fec90bd75944599ae8dcf644987774
child 181103 376538c22d1f0ebec730c51bc9158533091fdcdf
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs963282
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 963282 - Stub blurbs during download aren't always a minimum of 3 lines. r=bbondy
toolkit/mozapps/installer/windows/nsis/common.nsh
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -7556,20 +7556,20 @@
                                         i $R2|${DT_SINGLELINE})'
         System::Call '*$6(i, i, i .r8, i .r7)'
         System::Free $6
 
         ; Get the approximate number height needed to display the text starting
         ; with a minimum of 3 lines of text.
         StrCpy $9 $8
         StrCpy $R1 2 ; set the number of lines initially to 2
-        ${While} $9 > $0
+        ${Do}
           IntOp $R1 $R1 + 1 ; increment the number of lines
           IntOp $9 $8 / $R1
-        ${EndWhile}
+        ${LoopUntil} $9 < $0
         IntOp $7 $7 * $R1
 
         StrCpy $R0 $9
         ${Do}
           IntOp $R0 $R0 + 20
           System::Call '*(i, i, i R0, i r7) i .r6'
           System::Call 'user32::DrawTextW(i r4, t $\"$2$\", i r5, i r6, \
                                           i $R2|${DT_WORDBREAK}) i .R1'