Skip to content

Commit 288ec7a

Browse files
Use single TextBlock for force squash warnings (#13)
1 parent 0e7c308 commit 288ec7a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/Views/ForceSquashAcrossMerges.axaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
Classes="bold"
1515
Text="{DynamicResource Text.ForceSquash.Title}"/>
1616
<StackPanel Margin="0,18,0,0">
17-
<TextBlock Text="{DynamicResource Text.ForceSquash.Warn1}" Foreground="Red"/>
18-
<TextBlock Margin="0,4,0,0" Text="{DynamicResource Text.ForceSquash.Warn2}"/>
19-
<TextBlock Margin="0,4,0,0" Text="{DynamicResource Text.ForceSquash.Warn3}"/>
20-
<TextBlock Margin="0,4,0,0" Text="{DynamicResource Text.ForceSquash.Warn4}"/>
21-
<TextBlock Margin="0,4,0,0" Text="{DynamicResource Text.ForceSquash.Warn5}"/>
17+
<TextBlock Foreground="Red" TextWrapping="Wrap">
18+
<Run Text="{DynamicResource Text.ForceSquash.Warn1}"/><LineBreak/>
19+
<Run Text="{DynamicResource Text.ForceSquash.Warn2}"/><LineBreak/>
20+
<Run Text="{DynamicResource Text.ForceSquash.Warn3}"/><LineBreak/>
21+
<Run Text="{DynamicResource Text.ForceSquash.Warn4}"/><LineBreak/>
22+
<Run Text="{DynamicResource Text.ForceSquash.Warn5}"/>
23+
</TextBlock>
2224
</StackPanel>
2325
<StackPanel Margin="0,18,0,0">
2426
<CheckBox Content="{DynamicResource Text.ForceSquash.CreateBackup}" IsChecked="{Binding CreateBackup, Mode=TwoWay}"/>

0 commit comments

Comments
 (0)