Skip to content

Commit 2ea310c

Browse files
VictoriousRaptorVictoriousRaptor
committed
Merge remote-tracking branch 'upstream/dev' into FixProgramUID
2 parents 225d002 + f8b009e commit 2ea310c

File tree

9 files changed

+373
-238
lines changed

9 files changed

+373
-238
lines changed

‎Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
117117
<Exec Command="taskkill /f /fi &quot;IMAGENAME eq Flow.Launcher.exe&quot;" />
118118
</Target>
119-
119+
120120
<Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
121121
<!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
122122

‎Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 86 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,31 +2044,43 @@
20442044
<Border Padding="{TemplateBinding Padding}">
20452045
<Grid Background="Transparent" SnapsToDevicePixels="False">
20462046
<Grid.ColumnDefinitions>
2047-
<ColumnDefinition Width="19" />
20482047
<ColumnDefinition Width="*" />
2048+
<ColumnDefinition Width="Auto" />
20492049
</Grid.ColumnDefinitions>
2050-
<Ellipse
2051-
x:Name="circle"
2052-
Width="19"
2053-
Height="19"
2054-
HorizontalAlignment="Center"
2055-
VerticalAlignment="Center"
2056-
Stroke="Transparent" />
2057-
<Path
2058-
x:Name="arrow"
2059-
HorizontalAlignment="Center"
2060-
VerticalAlignment="Center"
2061-
Data="M 1,1.5 L 4.5,5 L 8,1.5"
2062-
SnapsToDevicePixels="false"
2063-
Stroke="#666"
2064-
StrokeThickness="1" />
20652050
<ContentPresenter
2066-
Grid.Column="1"
2067-
Margin="4,0,0,0"
2068-
HorizontalAlignment="Left"
2069-
VerticalAlignment="Center"
2051+
Grid.Column="0"
2052+
Margin="0,0,0,0"
2053+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
2054+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
2055+
Content="{TemplateBinding Content}"
20702056
RecognizesAccessKey="True"
20712057
SnapsToDevicePixels="True" />
2058+
<Grid
2059+
x:Name="ChevronGrid"
2060+
Grid.Column="1"
2061+
Margin="0"
2062+
VerticalAlignment="Center"
2063+
Background="Transparent"
2064+
RenderTransformOrigin="0.5, 0.5">
2065+
<Grid.RenderTransform>
2066+
<RotateTransform Angle="0" />
2067+
</Grid.RenderTransform>
2068+
<Ellipse
2069+
x:Name="circle"
2070+
Width="19"
2071+
Height="19"
2072+
HorizontalAlignment="Center"
2073+
VerticalAlignment="Center"
2074+
Stroke="Transparent" />
2075+
<Path
2076+
x:Name="arrow"
2077+
HorizontalAlignment="Center"
2078+
VerticalAlignment="Center"
2079+
Data="M 1,1.5 L 4.5,5 L 8,1.5"
2080+
SnapsToDevicePixels="false"
2081+
Stroke="#666"
2082+
StrokeThickness="1" />
2083+
</Grid>
20722084
</Grid>
20732085
</Border>
20742086
<ControlTemplate.Triggers>
@@ -2077,12 +2089,12 @@
20772089
</Trigger>
20782090
<Trigger Property="IsMouseOver" Value="true">
20792091
<Setter TargetName="circle" Property="Stroke" Value="Transparent" />
2080-
<Setter TargetName="arrow" Property="Stroke" Value="#222" />
2092+
<Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color05B}" />
20812093
</Trigger>
20822094
<Trigger Property="IsPressed" Value="true">
20832095
<Setter TargetName="circle" Property="Stroke" Value="Transparent" />
20842096
<Setter TargetName="circle" Property="StrokeThickness" Value="1.5" />
2085-
<Setter TargetName="arrow" Property="Stroke" Value="#FF003366" />
2097+
<Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color17B}" />
20862098
</Trigger>
20872099
</ControlTemplate.Triggers>
20882100
</ControlTemplate>
@@ -2110,7 +2122,7 @@
21102122
x:Name="HeaderSite"
21112123
MinWidth="0"
21122124
MinHeight="0"
2113-
Margin="18,0,0,0"
2125+
Margin="18,0,18,0"
21142126
Padding="{TemplateBinding Padding}"
21152127
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
21162128
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -2127,19 +2139,62 @@
21272139
Foreground="{TemplateBinding Foreground}"
21282140
IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
21292141
Style="{StaticResource ExpanderDownHeaderStyle}" />
2130-
<ContentPresenter
2131-
x:Name="ExpandSite"
2132-
Margin="{TemplateBinding Padding}"
2133-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
2134-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
2135-
DockPanel.Dock="Bottom"
2136-
Focusable="false"
2137-
Visibility="Collapsed" />
2142+
<Border x:Name="ContentPresenterBorder">
2143+
<ContentPresenter
2144+
x:Name="ExpandSite"
2145+
Margin="{TemplateBinding Padding}"
2146+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
2147+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
2148+
DockPanel.Dock="Bottom"
2149+
Focusable="false" />
2150+
<Border.LayoutTransform>
2151+
<ScaleTransform ScaleY="0" />
2152+
</Border.LayoutTransform>
2153+
</Border>
21382154
</DockPanel>
21392155
</Border>
21402156
<ControlTemplate.Triggers>
21412157
<Trigger Property="IsExpanded" Value="true">
21422158
<Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
2159+
<Setter TargetName="ContentPresenterBorder" Property="BorderThickness" Value="0,1,0,0" />
2160+
<Trigger.EnterActions>
2161+
<BeginStoryboard>
2162+
<Storyboard>
2163+
<DoubleAnimation
2164+
Storyboard.TargetName="ContentPresenterBorder"
2165+
Storyboard.TargetProperty="(Border.LayoutTransform).(ScaleTransform.ScaleY)"
2166+
From="0.0"
2167+
To="1.0"
2168+
Duration="00:00:00.00" />
2169+
<DoubleAnimation
2170+
Storyboard.TargetName="ContentPresenterBorder"
2171+
Storyboard.TargetProperty="(Border.Opacity)"
2172+
From="0.0"
2173+
To="1.0"
2174+
Duration="00:00:00.00" />
2175+
</Storyboard>
2176+
</BeginStoryboard>
2177+
</Trigger.EnterActions>
2178+
<Trigger.ExitActions>
2179+
<BeginStoryboard>
2180+
<Storyboard>
2181+
<DoubleAnimation
2182+
Storyboard.TargetName="ContentPresenterBorder"
2183+
Storyboard.TargetProperty="(Border.LayoutTransform).(ScaleTransform.ScaleY)"
2184+
From="1.0"
2185+
To="0"
2186+
Duration="00:00:00.00" />
2187+
<!-- Animation 00:00:00.167 -->
2188+
<DoubleAnimation
2189+
Storyboard.TargetName="ContentPresenterBorder"
2190+
Storyboard.TargetProperty="(Border.Opacity)"
2191+
From="1.0"
2192+
To="0.0"
2193+
Duration="00:00:00.00" />
2194+
<!-- Animation 00:00:00.167 -->
2195+
</Storyboard>
2196+
</BeginStoryboard>
2197+
</Trigger.ExitActions>
21432198
</Trigger>
21442199
<Trigger Property="ExpandDirection" Value="Right">
21452200
<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />

0 commit comments

Comments
 (0)