Skip to content

Commit 4992cb0

Browse files
bevanweissbarnson
authored andcommitted
Lines in WixUI are too short for standard dialog widths. Increase them by 3 pixels. Fixes wixtoolset/issues#2691 Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
1 parent 988d1d4 commit 4992cb0

25 files changed

Lines changed: 42 additions & 42 deletions

src/ext/UI/test/WixToolsetTest.UI/TestData/InstallDir_SpecialDlg/Package.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<Publish Event="SpawnDialog" Value="CancelDlg" />
3333
</Control>
3434
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
35-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
36-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
35+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
36+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
3737
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="My Special Dialog &amp; Stuff" />
3838
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="&#x2714; A dialog where special stuff happens" />
3939
</Dialog>

src/ext/UI/wixlib/AdvancedWelcomeEulaDlg.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<UI>
77
<Dialog Id="AdvancedWelcomeEulaDlg" Width="370" Height="270" Title="!(loc.AdvancedWelcomeEulaDlg_Title)">
88
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdvancedWelcomeEulaDlgBannerBitmap)" />
9-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
9+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
1010
<Control Id="Title" Type="Text" X="20" Y="10" Width="300" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.AdvancedWelcomeEulaDlgTitle)" />
1111
<Control Id="DescriptionPerMachine" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerMachine)" ShowCondition="ALLUSERS" />
1212
<Control Id="DescriptionPerUser" Type="Text" X="20" Y="202" Width="330" Height="31" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.AdvancedWelcomeEulaDlgDescriptionPerUser)" ShowCondition="NOT ALLUSERS" />

src/ext/UI/wixlib/BrowseDlg.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="98" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
2525
<Control Id="PathLabel" Type="Text" X="25" Y="190" Width="320" Height="10" TabSkip="no" Text="!(loc.BrowseDlgPathLabel)" />
2626
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.BrowseDlgBannerBitmap)" />
27-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
28-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
27+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
28+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
2929
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgDescription)" />
3030
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.BrowseDlgTitle)" />
3131
</Dialog>

src/ext/UI/wixlib/CustomizeDlg.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
</Control>
2727
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.CustomizeDlgBannerBitmap)" />
2828
<Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20" Text="!(loc.CustomizeDlgText)" />
29-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
30-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
29+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
30+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
3131
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
3232
<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
3333
<Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="118" />

src/ext/UI/wixlib/DiskCostDlg.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</Control>
1111
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.DiskCostDlgBannerBitmap)" />
1212
<Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="50" Text="!(loc.DiskCostDlgText)" />
13-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
14-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
13+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
14+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
1515
<Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgDescription)" />
1616
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.DiskCostDlgTitle)" />
1717
<Control Id="VolumeList" Type="VolumeCostList" X="20" Y="100" Width="330" Height="120" Sunken="yes" Fixed="yes" Remote="yes" Text="!(loc.DiskCostDlgVolumeList)" />

src/ext/UI/wixlib/ExitDialog.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
1010
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
1111
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
12-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
12+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
1313
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
1414
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
1515
<Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]" ShowCondition="WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed" />

src/ext/UI/wixlib/FatalError.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
1212
<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.FatalErrorBitmap)" />
1313
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
14-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
14+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
1515
<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorTitle)" />
1616
<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorDescription1) !(loc.FatalErrorDescription2)" />
1717
</Dialog>

src/ext/UI/wixlib/FeaturesDlg.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<Publish Event="SpawnDialog" Value="CancelDlg" />
4242
</Control>
4343
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FeaturesDlgBannerBitmap)" />
44-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
45-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
44+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
45+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
4646
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FeaturesDlgDescription)" />
4747
<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FeaturesDlgTitle)" />
4848
<Control Id="ItemDescription" Type="Text" X="20" Y="180" Width="330" Height="24" Transparent="yes" NoPrefix="yes" Text="!(loc.FeaturesDlgItemDescription)">

src/ext/UI/wixlib/FilesInUse.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</Control>
1717
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.FilesInUseBannerBitmap)" />
1818
<Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="30" Text="!(loc.FilesInUseText)" />
19-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
20-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
19+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
20+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
2121
<Control Id="Description" Type="Text" X="20" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseDescription)" />
2222
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUseTitle)" />
2323
<Control Id="List" Type="ListBox" X="20" Y="87" Width="330" Height="130" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />

src/ext/UI/wixlib/InstallDirDlg.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
1515
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
1616
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
17-
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
18-
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
17+
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="373" Height="0" />
18+
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="373" Height="0" />
1919

2020
<Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
2121
<Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />

0 commit comments

Comments
 (0)