Skip to content

Commit dd58860

Browse files
committed
VS Templates: Release v2.3.2
- Fix Grid layout usage across WPF dialogs (XAML)
1 parent 8c33822 commit dd58860

34 files changed

Lines changed: 38 additions & 56 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Source/Templates.2022/ProjectTemplates/WixSharp Managed Setup - Custom WPF UI (WiX3)/Dialogs/ExitDialog.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
<TextBlock
6565
x:Name="DialogTitleLabel"
66-
Grid.RowSpan="1"
66+
Grid.Row="0"
6767
Grid.Column="1"
6868
Margin="13,25,7,0"
6969
VerticalAlignment="Top"
@@ -74,7 +74,7 @@
7474
</TextBlock>
7575
<TextBlock
7676
x:Name="DialogDescription"
77-
Grid.Row="2"
77+
Grid.Row="1"
7878
Grid.Column="1"
7979
Margin="10"
8080
TextWrapping="WrapWithOverflow">
@@ -85,7 +85,7 @@
8585

8686
<Button
8787
x:Name="ViewLog"
88-
Grid.Row="2"
88+
Grid.Row="1"
8989
Margin="10,0"
9090
HorizontalAlignment="Left"
9191
VerticalAlignment="Center"
@@ -95,7 +95,7 @@
9595
</Button>
9696

9797
<Border
98-
Grid.Row="2"
98+
Grid.Row="1"
9999
HorizontalAlignment="Stretch"
100100
VerticalAlignment="Stretch"
101101
BorderBrush="Gray"

Source/Templates.2022/ProjectTemplates/WixSharp Managed Setup - Custom WPF UI (WiX3)/Dialogs/FeaturesDialog.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,12 @@
5555

5656
<Image
5757
x:Name="Banner"
58-
Grid.Row="1"
5958
Grid.ColumnSpan="2"
6059
HorizontalAlignment="Stretch"
6160
VerticalAlignment="Stretch"
6261
Source="{Binding Banner}" />
63-
<StackPanel Margin="9">
62+
<StackPanel Grid.Column="0" Margin="9">
6463
<TextBlock
65-
Grid.Column="0"
6664
FontSize="12"
6765
FontWeight="Bold">
6866
[CustomizeDlgTitle]
@@ -130,6 +128,7 @@
130128
<Button
131129
x:Name="Reset"
132130
Grid.Row="2"
131+
Grid.Column="0"
133132
Margin="0,10,0,0"
134133
HorizontalAlignment="Left"
135134
Click="Reset_Click"

Source/Templates.2022/ProjectTemplates/WixSharp Managed Setup - Custom WPF UI (WiX3)/Dialogs/InstallDirDialog.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@
2929

3030
<Image
3131
x:Name="Banner"
32-
Grid.Row="1"
3332
Grid.ColumnSpan="2"
3433
HorizontalAlignment="Stretch"
3534
VerticalAlignment="Stretch"
3635
Source="{Binding Banner}" />
37-
<StackPanel Margin="9">
36+
<StackPanel Grid.Column="0" Margin="9">
3837
<TextBlock
39-
Grid.Column="0"
4038
FontSize="12"
4139
FontWeight="Bold">
4240
[InstallDirDlgTitle]

0 commit comments

Comments
 (0)