Skip to content

Commit

Permalink
Merge remote-tracking branch 'Grabacr07/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yuubari
Yuubari committed Nov 19, 2016
2 parents 8fa3f2e + 3333d48 commit 1b8fa41
Show file tree
Hide file tree
Showing 19 changed files with 302 additions and 347 deletions.
11 changes: 11 additions & 0 deletions source/Grabacr07.KanColleViewer.Controls/Controls/ColorIndicator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ private static void LimitedValuePropertyChangedCallback(DependencyObject d, Depe

#endregion

#region Columns 依存関係プロパティ

public int Columns
{
get { return (int)this.GetValue(ColumnsProperty); }
set { this.SetValue(ColumnsProperty, value); }
}
public static readonly DependencyProperty ColumnsProperty =
DependencyProperty.Register(nameof(Columns), typeof(int), typeof(ColorIndicator), new UIPropertyMetadata(4));

#endregion

private void ChangeColor(LimitedValue value)
{
Expand Down
2 changes: 1 addition & 1 deletion source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency id="MetroRadiance.Core" version="2.1.0" />
<dependency id="MetroRadiance.Chrome" version="2.1.0" />
<dependency id="MetroRadiance" version="2.1.1" />
<dependency id="KanColleWrapper" version="1.2.7" />
<dependency id="KanColleWrapper" version="1.6.1" />
</dependencies>
</metadata>
<files>
Expand Down
4 changes: 2 additions & 2 deletions source/Grabacr07.KanColleViewer.Controls/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
[assembly: XmlnsDefinition("http://schemes.grabacr.net/winfx/2015/kancolleviewer/converters", "Grabacr07.KanColleViewer.Converters")]
[assembly: XmlnsDefinition("http://schemes.grabacr.net/winfx/2015/kancolleviewer/interactivity", "Grabacr07.KanColleViewer.Interactivity")]

[assembly: AssemblyVersion("1.3.1")]
[assembly: AssemblyInformationalVersion("1.3.1")]
[assembly: AssemblyVersion("1.3.2")]
[assembly: AssemblyInformationalVersion("1.3.2")]
54 changes: 50 additions & 4 deletions source/Grabacr07.KanColleViewer.Controls/Themes/Generic.ColorIndicator.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,67 @@

<Style TargetType="{x:Type controls:ColorIndicator}">
<Setter Property="Background"
Value="White" />
Value="{DynamicResource HighlightForegroundBrushKey}" />
<Setter Property="HorizontalContentAlignment"
Value="Left" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:ColorIndicator}">
<Grid Background="{TemplateBinding Background}">
<Border x:Name="PART_Track" />
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<Border x:Name="PART_Track"
Grid.Row="0"
Grid.RowSpan="2"
Background="{TemplateBinding Background}"
Opacity="0.4" />
<Border x:Name="PART_Indicator"
Grid.Row="0"
Grid.RowSpan="2"
Background="{TemplateBinding Foreground}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />

<ItemsControl Grid.Row="0"
ClipToBounds="True">
<ItemsControl.Resources>
<Style TargetType="{x:Type Rectangle}">
<Setter Property="Width"
Value="1" />
<Setter Property="HorizontalAlignment"
Value="Left" />
<Setter Property="Fill"
Value="{DynamicResource BackgroundBrushKey}" />
</Style>
</ItemsControl.Resources>
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Rows="1"
Columns="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:ColorIndicator}}, Path=Columns}" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemsSource>
<x:Array Type="{x:Type Rectangle}">
<Rectangle Width="0" />
<Rectangle />
<Rectangle />
<Rectangle />
<Rectangle />
<Rectangle />
<Rectangle />
<Rectangle />
<Rectangle />
<Rectangle />
<!-- Columns = 10 まで対応 -->
</x:Array>
</ItemsControl.ItemsSource>
</ItemsControl>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

</ResourceDictionary>
</ResourceDictionary>
127 changes: 109 additions & 18 deletions source/Grabacr07.KanColleViewer.Controls/Themes/Generic.SlotItemIcon.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,21 +638,21 @@
<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
<Viewbox>
<Grid>
<Path Width="33"
Height="25.972"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="4.99996, 17.0089, 0, 0"
Stretch="Uniform"
Fill="#FFBFDD9A"
Data="M 30.5467,19.8049L 21.5,40.8689L 12.4533,19.8049C 11.8853,18.4823 12.856,17.0089 14.296,17.0089L 28.704,17.0089C 30.144,17.0089 31.1146,18.4823 30.5467,19.8049 Z M 37.9999,42.981L 4.99996,42.981L 4.99996,40.8703L 37.9999,40.8703L 37.9999,42.981 Z "/>
<Ellipse Width="15.4584"
Height="15.4584"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="13.7707, 0.0191078, 0, 0"
Stretch="Uniform"
Fill="#FFBFDD9A"/>
<Path Width="33"
Height="25.972"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="4.99996, 17.0089, 0, 0"
Stretch="Uniform"
Fill="#FFBFDD9A"
Data="M 30.5467,19.8049L 21.5,40.8689L 12.4533,19.8049C 11.8853,18.4823 12.856,17.0089 14.296,17.0089L 28.704,17.0089C 30.144,17.0089 31.1146,18.4823 30.5467,19.8049 Z M 37.9999,42.981L 4.99996,42.981L 4.99996,40.8703L 37.9999,40.8703L 37.9999,42.981 Z " />
<Ellipse Width="15.4584"
Height="15.4584"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="13.7707, 0.0191078, 0, 0"
Stretch="Uniform"
Fill="#FFBFDD9A" />
</Grid>
</Viewbox>
</ControlTemplate>
Expand All @@ -679,8 +679,25 @@
<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
<Viewbox>
<Grid>
<Path Width="50.4377" Height="41.3333" HorizontalAlignment="Center" VerticalAlignment="Bottom" Stretch="Fill" StrokeThickness="1.33333" StrokeLineJoin="Round" Stroke="#606060" Fill="#FFFFFFFF" Data="M 8.07964,41C 1.97201,41 -0.340562,36.7825 2.93952,31.6443L 20.0353,4.85508C 23.3154,-0.283161 28.6832,-0.285927 31.9647,4.85231L 49.0605,31.6457C 52.3405,36.7853 50.028,41 43.9203,41L 8.07964,41 Z "/>
<Rectangle Width="21.3333" Height="15.3333" HorizontalAlignment="Center" VerticalAlignment="Bottom" Stretch="Fill" StrokeThickness="1.33333" StrokeLineJoin="Round" Stroke="#606060" Fill="#606060"/>
<Path Width="50.4377"
Height="41.3333"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
Stretch="Fill"
StrokeThickness="1.33333"
StrokeLineJoin="Round"
Stroke="#606060"
Fill="#FFFFFFFF"
Data="M 8.07964,41C 1.97201,41 -0.340562,36.7825 2.93952,31.6443L 20.0353,4.85508C 23.3154,-0.283161 28.6832,-0.285927 31.9647,4.85231L 49.0605,31.6457C 52.3405,36.7853 50.028,41 43.9203,41L 8.07964,41 Z " />
<Rectangle Width="21.3333"
Height="15.3333"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
Stretch="Fill"
StrokeThickness="1.33333"
StrokeLineJoin="Round"
Stroke="#606060"
Fill="#606060" />
</Grid>
</Viewbox>
</ControlTemplate>
Expand Down Expand Up @@ -729,7 +746,81 @@
</Setter.Value>
</Setter>
</Trigger>
<Trigger Property="Type"
Value="AmphibiousLandingCraft">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
<Path Stretch="Uniform"
Data="M56,278L56 375 69 389 83 389 97 417 97 444 125 472 153 472 153 458 167 403 181 403 194 458 153 458 153 472 222 472 222 458 222 403 264 403 250 458 222 458 222 472 278 472 278 458 278 403 306 403 319 458 278 458 278 472 347 472 347 458 333 403 361 403 375 458 347 458 347 472 403 472 403 458 389 403 417 403 431 444 403 458 403 472 431 458 444 458 486 431 542 431 583 389 597 361 611 319 611 306 347 319 389 292 444 292 444 264 347 264 319 208 264 208 236 292 208 292 194 264 208 250 194 222 181 222 194 181 181 181 167 222 153 222 139 250 167 250 153 264 139 292 z"
Fill="#FF9AA55D" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Trigger>
<Trigger Property="Type"
Value="LandBasedAttacker">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
<Viewbox>
<Grid>
<Path Data="M0,347L28 292 69 264 42 250 83 250 14 208 14 181 153 222 194 194 194 222 208 222 208 181 222 181 250 222 278 222 306 208 306 181 375 194 417 111 431 111 431 167 444 208 472 222 500 236 500 250 458 236 444 236 361 264 333 278 347 292 500 347 500 375 486 375 333 333 264 375 236 375 236 347 250 306 83 375 14 361 z"
Fill="#FF39B74E"
HorizontalAlignment="Left"
Height="139"
Stretch="Uniform"
VerticalAlignment="Top"
Width="235" />
<ed:RegularPolygon PointCount="6"
InnerRadius="1"
Stretch="Fill"
Stroke="Black"
StrokeThickness="2"
Fill="#FF39B74E"
Width="126"
Height="146"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="91.033,50.606,0,0" />
</Grid>
</Viewbox>
</ControlTemplate>
</Setter.Value>
</Setter>
</Trigger>
<Trigger Property="Type"
Value="LandBasedFighter">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:SlotItemIcon}">
<Viewbox>
<Grid>
<Path Data="M28,181L28 194 14 236 42 208 56 236 83 250 125 264 167 278 181 306 139 319 181 319 236 431 264 431 278 333 264 292 319 292 361 306 403 306 458 375 472 375 472 347 444 306 500 264 500 236 472 236 431 250 417 264 375 208 361 208 375 236 347 236 333 222 361 167 319 208 278 194 236 194 208 167 181 83 153 56 125 56 139 139 111 153 74 153 83 111 56 153 42 167 0 139 z"
Fill="#FF39B74E"
HorizontalAlignment="Left"
Height="139"
Stretch="Uniform"
VerticalAlignment="Top"
Width="235" />
<ed:RegularPolygon PointCount="6"
InnerRadius="1"
Stretch="Fill"
Stroke="Black"
StrokeThickness="2"
Fill="#FF39B74E"
Width="126"
Height="146"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="91.033,50.606,0,0" />
</Grid>
</Viewbox>
</ControlTemplate>
</Setter.Value>
</Setter>
</Trigger>
</Style.Triggers>
</Style>

</ResourceDictionary>
</ResourceDictionary>
2 changes: 1 addition & 1 deletion source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
ResourceDictionaryLocation.None,
ResourceDictionaryLocation.SourceAssembly)]

[assembly: AssemblyVersion("4.2.7.0")]
[assembly: AssemblyVersion("4.2.9.0")]
Loading

0 comments on commit 1b8fa41

Please sign in to comment.