优化搜索框失焦

Control/UserControls/PannelCard/LeftCardControl.xaml

@@ -80,6 +80,7 @@
              BorderThickness="1"
              Effect="{DynamicResource EffectShadow2}" 
              Margin="5,0,0,5"
+             MouseDown="MyCard_MouseDown"
              >
         <hc:Card.Background>
             <SolidColorBrush Color="#FFFFFFFF" hc:GeometryEffect.GeometryEffect="20" Opacity="{Binding AppConfig.CardOpacity, Mode=TwoWay, Converter={StaticResource OpcityConvert}}">
@@ -130,7 +131,7 @@
 
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <StackPanel Tag="{Binding}">
+                        <StackPanel Tag="{Binding}" MouseDown="ListBoxItem_MouseDown">
                             <TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
                                     HorizontalAlignment="Left"
                                     Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=35}"

Control/UserControls/PannelCard/LeftCardControl.xaml.cs

@@ -349,6 +349,29 @@ namespace GeekDesk.Control.UserControls.PannelCard
             }
         }
 
+        /// <summary>
+        /// 点击菜单后  隐藏搜索框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListBoxItem_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (RunTimeStatus.SEARCH_BOX_SHOW) {
+                MainWindow.mainWindow.HidedSearchBox();
+            }
+        }
 
+        /// <summary>
+        /// 隐藏搜索框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void MyCard_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (RunTimeStatus.SEARCH_BOX_SHOW)
+            {
+                MainWindow.mainWindow.HidedSearchBox();
+            }
+        }
     }
 }

Control/UserControls/PannelCard/RightCardControl.xaml

@@ -20,6 +20,14 @@
             </Style.Triggers>
         </Style>-->
 
+        <Storyboard x:Key="Custom1Transition" x:Shared="False">
+            <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+                <DoubleAnimation.EasingFunction>
+                    <ElasticEase Oscillations="1"/>
+                </DoubleAnimation.EasingFunction>
+            </DoubleAnimation>
+        </Storyboard>
+
         <Style x:Key="ImageStyle" TargetType="Image">
             <Setter Property="Width"   Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageWidth, Mode=OneWay}"/>
             <Setter Property="Height"  Value="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageHeight, Mode=OneWay}"/>
@@ -116,7 +124,12 @@
                                                      MouseEnter="StackPanel_MouseEnter"
                                                      MouseLeave="StackPanel_MouseLeave"
                                                      >
-                                    <Image Style="{StaticResource ImageStyle}"  RenderOptions.BitmapScalingMode="HighQuality"/>
+                                    <!--<StackPanel Background="#00FFFFFF"
+                                                MouseEnter="CursorPanel_MouseEnter"
+                                                MouseLeave="CursorPanel_MouseLeave"
+                                                Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.ImageWidth, Mode=OneWay}">-->
+                                            <Image Style="{StaticResource ImageStyle}"  
+                                                   RenderOptions.BitmapScalingMode="HighQuality"/>
                                             <TextBlock MaxWidth="80"
                                                        Margin="0,5,0,0"
                                                        MaxHeight="40"
@@ -127,6 +140,8 @@
                                                        VerticalAlignment="Center" 
                                                        Foreground="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type Window}},Path=DataContext.AppConfig.TextColor}"
                                                        Text="{Binding Name}"/>
+                                    <!--</StackPanel>-->
+                                    
                                 </hc:SimpleStackPanel>
                             </DataTemplate>
                         </ListBox.ItemTemplate>
@@ -158,6 +173,7 @@
                    VirtualizingPanel.IsVirtualizing="True"  
                    VirtualizingPanel.IsContainerVirtualizable="True"
                    >
+                    <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom1Transition}">
                         <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
                              BorderThickness="0"
                              Padding="0,10,0,0"
@@ -221,6 +237,8 @@
                                 </DataTemplate>
                             </ListBox.ItemTemplate>
                         </ListBox>
+                    </hc:TransitioningContentControl>
+                    
 
                 </WrapPanel>
 

Control/UserControls/PannelCard/RightCardControl.xaml.cs

@@ -603,5 +603,25 @@ namespace GeekDesk.Control.UserControls.PannelCard
                 MainWindow.mainWindow.HidedSearchBox();
             }
         }
+
+        /// <summary>
+        /// 设置光标
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CursorPanel_MouseEnter(object sender, MouseEventArgs e)
+        {
+            this.Cursor = Cursors.Hand;
+        }
+
+        /// <summary>
+        /// 设置光标
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CursorPanel_MouseLeave(object sender, MouseEventArgs e)
+        {
+            this.Cursor = Cursors.Arrow;
+        }
     }
 }