Browse Source

add clear btn

Robert 10 months ago
parent
commit
26e5521cfc

+ 1 - 1
GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.2.0
+next-version: 1.3.0
 branches: {}
 ignore:
   sha: []

+ 4 - 4
VideoImageBuilder/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號
 // 設為預設,如下所示:
-// [assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
-[assembly: AssemblyInformationalVersion("dc9a947")]
+// [assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyInformationalVersion("fc2ebd4")]

+ 75 - 1
VideoImageBuilder/SubPage/VideoSelectUc.xaml

@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:VideoImageBuilder.SubPage"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d"
@@ -34,6 +34,43 @@
                 Text="{Binding VideoPath1, Mode=TwoWay}"
                 IsReadOnly="True"
                 Style="{StaticResource TextBoxRevealStyle}" />
+            <Grid
+                Width="35"
+                Height="35"
+                x:Name="uxClearBtn1"
+                MouseDown="uxClearButton_Click"
+                Background="Transparent">
+                <Grid.RenderTransform>
+                    <ScaleTransform ScaleX="1" ScaleY="1" CenterX="17.5" CenterY="17.5"/>
+                </Grid.RenderTransform>
+                <Grid.Triggers>
+                    <EventTrigger RoutedEvent="MouseDown" >
+                        <BeginStoryboard>
+                            <Storyboard Storyboard.TargetName="uxClearBtn1">
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleX)"
+                                    To="0.8" Duration="0:0:0.2"/>
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleY)"
+                                    To="0.8" Duration="0:0:0.2"/>
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleX)"
+                                    To="1" BeginTime="0:0:0.2" Duration="0:0:0.2"/>
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleY)"
+                                    To="1" BeginTime="0:0:0.2" Duration="0:0:0.2"/>
+                            </Storyboard>
+                        </BeginStoryboard>
+                    </EventTrigger>
+                </Grid.Triggers>
+                <md:PackIcon
+                    Width="25"
+                    Height="25"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center"
+                    Kind="CloseCircleOutline" 
+                />
+            </Grid>
         </StackPanel>
 
         <TextBlock
@@ -61,6 +98,43 @@
                 Text="{Binding VideoPath2, Mode=TwoWay}"
                 IsReadOnly="True"
                 Style="{StaticResource TextBoxRevealStyle}" />
+            <Grid
+                Width="35"
+                Height="35"
+                x:Name="uxClearBtn2"
+                MouseDown="uxClearButton_Click"
+                Background="Transparent">
+                <Grid.RenderTransform>
+                    <ScaleTransform ScaleX="1" ScaleY="1" CenterX="17.5" CenterY="17.5"/>
+                </Grid.RenderTransform>
+                <Grid.Triggers>
+                    <EventTrigger RoutedEvent="MouseDown" >
+                        <BeginStoryboard>
+                            <Storyboard Storyboard.TargetName="uxClearBtn2">
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleX)"
+                                    To="0.8" Duration="0:0:0.2"/>
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleY)"
+                                    To="0.8" Duration="0:0:0.2"/>
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleX)"
+                                    To="1" BeginTime="0:0:0.2" Duration="0:0:0.2"/>
+                                <DoubleAnimation
+                                    Storyboard.TargetProperty="RenderTransform.(ScaleTransform.ScaleY)"
+                                    To="1" BeginTime="0:0:0.2" Duration="0:0:0.2"/>
+                            </Storyboard>
+                        </BeginStoryboard>
+                    </EventTrigger>
+                </Grid.Triggers>
+                <md:PackIcon
+                    Width="25"
+                    Height="25"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center"
+                    Kind="CloseCircleOutline" 
+                />
+            </Grid>
         </StackPanel>
     </StackPanel>
 </UserControl>

+ 18 - 0
VideoImageBuilder/SubPage/VideoSelectUc.xaml.cs

@@ -58,5 +58,23 @@ namespace VideoImageBuilder.SubPage
                 }
             }
         }
+
+        private void uxClearButton_Click(object sender, RoutedEventArgs e)
+        {
+            FrameworkElement btn = sender as FrameworkElement;
+            if (btn is null)
+            {
+                return;
+            }
+
+            if (btn == uxClearBtn1)
+            {
+                context.VideoPath1 = string.Empty;
+            }
+            if (btn == uxClearBtn2)
+            {
+                context.VideoPath2 = string.Empty;
+            }
+        }
     }
 }