group/Plane.FormationCreator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

按钮的触发效果

Browse Source
This commit is contained in:
zxd 2019-01-04 12:19:25 +08:00
parent 1e69baaf9d
commit 32b60bb059
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plane.FormationCreator/Formation/FlightTask_TakeOff.cs
View File

@ -98,12 +98,13 @@ namespace Plane.FormationCreator.Formation
int copterIndex = SingleCopterInfos.IndexOf(info);
var copter = info.Copter;
await copter.UnlockAsync();
//等待起飞时间
while ((int)ts.TotalMilliseconds < (int)info.TakeOffWaitTime * 1000)
{
if (_flightTaskManager.IsPaused == true)
{
await copter.UnlockAsync();
await info.Copter.HoverAsync();
return;
}

35
Plane.FormationCreator/Styles/Button.xaml
View File

@ -31,6 +31,7 @@
RecognizesAccessKey="True" />
</Grid>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver"
Value="True">
@ -39,25 +40,33 @@
<Setter Property="Background"
Value="{StaticResource BackgroundHighlighted}" />
</Trigger>
<Trigger Property="IsPressed"
Value="True">
<Setter Property="Background"
Value="{StaticResource BackgroundNormal}" />
<Setter Property="BorderBrush"
Value="{StaticResource BorderBrushNormal}" />
</Trigger>
<Trigger Property="IsEnabled"
Value="False">
<Setter Property="Background"
Value="Transparent" />
</Trigger>
<Trigger Property="IsFocused"
Value="true">
<Setter Property="BorderBrush"
Value="{StaticResource BorderBrushHighlighted}" />
<Setter Property="Background"
Value="{StaticResource BackgroundHighlighted}" />
Value="{StaticResource BackgroundNormal}" />
</Trigger>
<Trigger Property="IsEnabled"
Value="False">
<Setter Property="Background"
Value="{StaticResource BackgroundNormal}" />
</Trigger>
<MultiTrigger >
<MultiTrigger.Conditions>
<Condition Property="IsFocused" Value="True"/>
<Condition Property="IsPressed" Value="False"/>
<Condition Property="IsEnabled" Value="True"/>
</MultiTrigger.Conditions>
<Setter Property="BorderBrush"
Value="{StaticResource BorderBrushHighlighted}" />
<Setter Property="Background"
Value="Transparent" />
</MultiTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>

4
Plane.FormationCreator/Styles/Colors.xaml
View File

@ -112,10 +112,10 @@
<!--General-->
<SolidColorBrush x:Key="BackgroundHighlighted"
Color="#54545C"
Color="#4682B4"
options:Freeze="True" />
<SolidColorBrush x:Key="BorderBrushHighlighted"
Color="#6A6A75"
Color="#6495ED"
options:Freeze="True" />
<SolidColorBrush x:Key="BackgroundSelected"
Color="#007ACC"

6
Plane.FormationCreator/Views/ModifyTaskView.xaml
View File

@ -66,8 +66,10 @@
</StackPanel.Resources>
<StackPanel>
<TextBlock Margin="5" Text="航点任务"/>
<Button Content="导入航点" Command="{Binding ImportWayPointCommand}" />
<Button Content="优化路线" Command="{Binding OptimizeRouteCommand}" />
<Button Content="导入航点" Command="{Binding ImportWayPointCommand}"
Visibility="Collapsed"/>
<Button Content="优化路线" Command="{Binding OptimizeRouteCommand}"
Visibility="Collapsed"/>
</StackPanel>
<Separator Margin="0,1"/>