Skip to content
This repository has been archived by the owner on Jul 23, 2019. It is now read-only.

Commit

Permalink
额外装备槽分隔符调整
Browse files Browse the repository at this point in the history
  • Loading branch information
@huoyaoyuan
huoyaoyuan committed Jan 7, 2017
1 parent ff708a3 commit e6d035d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
17 changes: 8 additions & 9 deletions AdmiralRoom/Views/FleetView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<ColumnDefinition Width="Auto" SharedSizeGroup="Condition"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="Charge"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="SlotItem"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="SlotExLock"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="SlotEx"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Margin="0,0,4,0" Orientation="Vertical">
Expand Down Expand Up @@ -262,15 +263,13 @@
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<StackPanel Grid.Column="6" Orientation="Horizontal" Visibility="{Binding SlotEx.HasItem, Converter={StaticResource VisibilityConverter}}">
<Rectangle Width="1" Margin="0,2,2,4" Fill="Gray"/>
<Canvas Width="36" Height="36">
<Image Canvas.Left="-6" Canvas.Top="-6"
Width="48" Height="48"
Source="{Binding SlotEx.Item.EquipInfo.Icon, Mode=OneWay}"
ToolTip="{Binding SlotEx.Item}"/>
</Canvas>
</StackPanel>
<Rectangle Grid.Column="6" Width="1" Margin="0,2,2,4" Fill="Gray" Visibility="{Binding SlotEx.IsLocked, Converter={StaticResource VisibilityConverter}, ConverterParameter=False}"/>
<Canvas Grid.Column="7" Width="36" Height="36" Visibility="{Binding SlotEx.HasItem, Converter={StaticResource VisibilityConverter}}">
<Image Canvas.Left="-6" Canvas.Top="-6"
Width="48" Height="48"
Source="{Binding SlotEx.Item.EquipInfo.Icon, Mode=OneWay}"
ToolTip="{Binding SlotEx.Item}"/>
</Canvas>
</Grid>
<Rectangle Height="1" Margin="2" Fill="Gray"/>
</StackPanel>
Expand Down
4 changes: 2 additions & 2 deletions AdmiralRoom/Views/Standalone/ShipCatalog.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Rectangle Width="1" Margin="0,1,1,2" Fill="Gray" Visibility="{Binding Item.SlotEx.HasItem, Converter={StaticResource VisibilityConverter}}"/>
<Canvas Width="15" Height="15">
<Rectangle Width="1" Margin="0,1,1,2" Fill="Gray" Visibility="{Binding Item.SlotEx.IsLocked, Converter={StaticResource VisibilityConverter}, ConverterParameter=False}"/>
<Canvas Width="15" Height="15" Visibility="{Binding Item.SlotEx.HasItem, Converter={StaticResource VisibilityConverter}}">
<Image Canvas.Left="-2.5" Canvas.Top="-2.5"
Width="20" Height="20"
Source="{Binding Item.SlotEx.Item.EquipInfo.Icon, Mode=OneWay}"
Expand Down

0 comments on commit e6d035d

Please sign in to comment.