Fleet Window proficiency icons

Yuubari · Nov 6, 2015 · 7a8bae7 · 7a8bae7
1 parent 7da8b58
commit 7a8bae7
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml
@@ -388,20 +388,25 @@
 															   Type="{Binding Item.Info.IconType, Mode=OneWay}"
 															   Width="14"
 															   Height="14" />
-											<TextBlock Grid.Column="2"
-													   Foreground="{DynamicResource ActiveForegroundBrushKey}"
-													   Style="{DynamicResource DefaultTextStyleKey}"
-													   Margin="5,1">
-												<Run Text="{Binding Item.Info.Name, Mode=OneWay}" />
-												<Run Text="{Binding Item.LevelText, Mode=OneWay}"
-													 Foreground="#FF45A9A5" />
-												<Run Foreground="{DynamicResource ForegroundBrushKey}">
-													<MultiBinding StringFormat="{}({0} {1})">
-														<Binding Source="{x:Static models:ResourceService.Current}" Path="Resources.Ship_Text_Adept" Mode="OneWay" />
-														<Binding Path="Item.Adept" Mode="OneWay" />
-													</MultiBinding>
-												</Run>
-											</TextBlock>
+											<StackPanel Grid.Column="2"
+														Orientation="Horizontal" >
+												<TextBlock Foreground="{DynamicResource ActiveForegroundBrushKey}"
+														   Style="{DynamicResource DefaultTextStyleKey}"
+														   Margin="5,1">
+													<Run Text="{Binding Item.Info.Name, Mode=OneWay}" />
+													<Run Text="{Binding Item.LevelText, Mode=OneWay}"
+														 Foreground="#FF45A9A5" />
+													<!--<Run Foreground="{DynamicResource ForegroundBrushKey}">
+														<MultiBinding StringFormat="{}({0} {1})">
+															<Binding Source="{x:Static models:ResourceService.Current}" Path="Resources.Ship_Text_Adept" Mode="OneWay" />
+															<Binding Path="Item.Adept" Mode="OneWay" />
+														</MultiBinding>
+													</Run>-->
+												</TextBlock>
+												<Viewbox>
+													<kcvc:AircraftProficiencyIcon Level="{Binding Path=Item.Adept, Mode=OneWay}" />
+												</Viewbox>
+											</StackPanel>
 										</Grid>
 										<DataTemplate.Triggers>
 											<DataTrigger Binding="{Binding Equipped}"