Ruben 4 лет назад
Родитель
Сommit
31cc320110

+ 6 - 5
PicView/Views/UserControls/Buttons/FolderButton.xaml.cs

@@ -4,9 +4,6 @@ using static PicView.UILogic.UC;
 
 namespace PicView.Views.UserControls
 {
-    /// <summary>
-    /// Interaction logic for FolderButton.xaml
-    /// </summary>
     public partial class FolderButton : UserControl
     {
         public FolderButton()
@@ -15,9 +12,13 @@ namespace PicView.Views.UserControls
 
             // FileMenuButton
             FileMenuButton.PreviewMouseLeftButtonDown += (_, _) => MouseOverAnimations.PreviewMouseButtonDownAnim(FolderFill);
-            FileMenuButton.MouseEnter += (_, _) => MouseOverAnimations.ButtonMouseOverAnim(FolderFill);
-            FileMenuButton.MouseEnter += (_, _) => AnimationHelper.MouseEnterBgTexColor(FileMenuBg);
+            FileMenuButton.MouseEnter += (_, _) => MouseOverAnimations.ButtonMouseOverAnim(FolderFill);       
             FileMenuButton.MouseLeave += (_, _) => MouseOverAnimations.ButtonMouseLeaveAnim(FolderFill);
+        }
+
+        internal void BackgroundEvents()
+        {
+            FileMenuButton.MouseEnter += (_, _) => AnimationHelper.MouseEnterBgTexColor(FileMenuBg);
             FileMenuButton.MouseLeave += (_, _) => AnimationHelper.MouseLeaveBgTexColor(FileMenuBg);
             FileMenuButton.Click += Toggle_open_menu;
         }

+ 7 - 4
PicView/Views/Windows/MainWindow.xaml

@@ -10,9 +10,9 @@
     MinHeight="400"
     BorderBrush="{DynamicResource WindowBorderColorBrush}"
     BorderThickness="1"
+    Focusable="True"
     Foreground="{StaticResource MainColorBrush}"
     Style="{DynamicResource MyWindowStyle}"
-    Focusable="True"
     WindowStartupLocation="CenterScreen">
 
     <Window.Resources>
@@ -26,7 +26,7 @@
             Background="{StaticResource WindowBackgroundColorBrush}"
             DockPanel.Dock="Top">
 
-            <uc:Logo x:Name="Logo"/>
+            <uc:Logo x:Name="Logo" />
 
             <Rectangle
                 Width="1"
@@ -96,7 +96,7 @@
                     Height="1"
                     Fill="{StaticResource BorderBrush}" />
 
-                <uc:FolderButton Canvas.Left="1" />
+                <uc:FolderButton x:Name="FolderButton" Canvas.Left="1" />
 
                 <Rectangle
                     Canvas.Left="56"
@@ -431,7 +431,10 @@
                             Stretch="Fill" />
                     </Border>
                 </ScrollViewer>
-                <Canvas x:Name="topLayer" IsHitTestVisible="False" Canvas.ZIndex="3" />
+                <Canvas
+                    x:Name="topLayer"
+                    Canvas.ZIndex="3"
+                    IsHitTestVisible="False" />
             </Grid>
         </Border>
     </DockPanel>