Skip to content

Commit f340f22

Browse files
author
John Simons
committed
Progress splash panel not displayed
1 parent 2bd24aa commit f340f22

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

src/ServiceControl.Config/UI/InstanceDetails/InstanceDetailsView.xaml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,44 +33,6 @@
3333
BorderBrush="{StaticResource Gray90Brush}"
3434
BorderThickness="0,1,0,0" />
3535

36-
<Border Grid.RowSpan="7"
37-
Grid.ColumnSpan="2"
38-
HorizontalAlignment="Stretch"
39-
VerticalAlignment="Stretch"
40-
Background="#CCFFFFFF"
41-
Visibility="{Binding InProgress,
42-
Converter={StaticResource boolToVis}}">
43-
<Border.Resources>
44-
<Style TargetType="{x:Type TextBlock}">
45-
<Setter Property="HorizontalAlignment" Value="Center" />
46-
<Setter Property="FontSize" Value="14" />
47-
</Style>
48-
</Border.Resources>
49-
50-
<Border HorizontalAlignment="Stretch"
51-
VerticalAlignment="Stretch"
52-
Background="White">
53-
<Grid>
54-
<Grid.RowDefinitions>
55-
<RowDefinition Height="*" />
56-
<RowDefinition Height="*" />
57-
<RowDefinition Height="*" />
58-
</Grid.RowDefinitions>
59-
60-
<TextBlock Grid.Row="0"
61-
FontWeight="Bold"
62-
Text="{Binding ProgressTitle}" />
63-
<ProgressBar Grid.Row="1"
64-
Width="420"
65-
Height="20"
66-
IsIndeterminate="{Binding ProgressIndeterminate}"
67-
Maximum="100"
68-
Value="{Binding ProgressPercent}" />
69-
<TextBlock Grid.Row="2" Text="{Binding ProgressMessage}" />
70-
</Grid>
71-
</Border>
72-
</Border>
73-
7436
<StackPanel Grid.Row="1"
7537
Grid.ColumnSpan="2"
7638
Orientation="Horizontal">
@@ -208,5 +170,43 @@
208170
<TextBlock FontSize="12px" Text="{Binding LogPath}" />
209171
</Hyperlink>
210172
</GroupBox>
173+
<Border Grid.Row="0"
174+
Grid.RowSpan="7"
175+
Grid.ColumnSpan="2"
176+
HorizontalAlignment="Stretch"
177+
VerticalAlignment="Stretch"
178+
Background="#CCFFFFFF"
179+
Visibility="{Binding InProgress,
180+
Converter={StaticResource boolToVis}}">
181+
<Border.Resources>
182+
<Style TargetType="{x:Type TextBlock}">
183+
<Setter Property="HorizontalAlignment" Value="Center" />
184+
<Setter Property="FontSize" Value="14" />
185+
</Style>
186+
</Border.Resources>
187+
188+
<Border HorizontalAlignment="Stretch"
189+
VerticalAlignment="Stretch"
190+
Background="White">
191+
<Grid>
192+
<Grid.RowDefinitions>
193+
<RowDefinition Height="*" />
194+
<RowDefinition Height="*" />
195+
<RowDefinition Height="*" />
196+
</Grid.RowDefinitions>
197+
198+
<TextBlock Grid.Row="0"
199+
FontWeight="Bold"
200+
Text="{Binding ProgressTitle}" />
201+
<ProgressBar Grid.Row="1"
202+
Width="420"
203+
Height="20"
204+
IsIndeterminate="{Binding ProgressIndeterminate}"
205+
Maximum="100"
206+
Value="{Binding ProgressPercent}" />
207+
<TextBlock Grid.Row="2" Text="{Binding ProgressMessage}" />
208+
</Grid>
209+
</Border>
210+
</Border>
211211
</Grid>
212212
</UserControl>

0 commit comments

Comments
 (0)