Merge branch 'master' of https://github.com/liscs/Mikoto

Author: liscs

Mikoto/Windows/MainWindow.xaml

@@ -21,21 +21,42 @@
         IsVisibleChanged="Window_IsVisibleChanged">
     <Grid Margin="5">
         <Grid.RowDefinitions>
+            <RowDefinition />
             <RowDefinition Height="8*" />
             <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
+        <StackPanel Orientation="Horizontal"
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top">
+            <Button Content="&#xE710;"
+                    FontFamily="Segoe MDL2 Assets"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Bottom"
+                    Foreground="{StaticResource MainBtnColor}"
+                    FontSize="40"
+                    Background="#01FFFFFF"
+                    Height="64"
+                    Width="64"
+                    Effect="{StaticResource EffectShadow5}"
+                    Click="AddGameButton_Click"
+                    BorderBrush="Transparent"
+                    ToolTip="{DynamicResource MainWindow_ScrollViewer_AddNewGame}" />
+        </StackPanel>
         <!--游戏列表-->
-        <hc:ScrollViewer Grid.Row="0"
+        <hc:ScrollViewer Grid.Row="1"
                          Grid.Column="0"
                          Grid.ColumnSpan="2"
-                         Margin="10,10,10,10.5"
+                         Margin="10"
                          HorizontalScrollBarVisibility="Auto"
-                         VerticalScrollBarVisibility="Hidden"
-                         hc:ScrollViewerAttach.Orientation="Horizontal">
+                         VerticalScrollBarVisibility="Disabled"
+                         hc:ScrollViewerAttach.Orientation="Horizontal"
+                         Effect="{Binding GameCollectionEffect}">
             <ItemsControl ItemsSource="{Binding GamePanelCollection}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
@@ -54,7 +75,9 @@
 
         <!--左下角-->
         <StackPanel Orientation="Horizontal"
-                    Grid.Row="1"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Bottom"
+                    Grid.Row="2"
                     Grid.Column="0">
             <Button Content="&#xE945;"
                     FontFamily="Segoe MDL2 Assets"
@@ -71,12 +94,11 @@
                     BorderBrush="Transparent"
                     ToolTip="{DynamicResource MainWindow_Tip_AutoStart}" />
 
-
         </StackPanel>
 
         <!--右下角-->
         <StackPanel Orientation="Horizontal"
-                    Grid.Row="1"
+                    Grid.Row="2"
                     Grid.Column="1"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Bottom">
@@ -172,20 +194,21 @@
         <hc:Drawer Name="GameInfoDrawer"
                    ShowMode="Press"
                    MaskCanClose="True"
-                   Dock="Left">
+                   Dock="Left"
+                   IsOpen="{Binding GameInfoDrawerIsOpen}">
             <Border Background="{DynamicResource PrimaryBackground}"
                     Width="300"
                     BorderBrush="{DynamicResource BorderBrush}">
                 <ScrollViewer>
                     <StackPanel>
-                        <DockPanel >
+                        <DockPanel>
                             <Button HorizontalAlignment="Left"
                                     BorderThickness="0"
                                     Foreground="{DynamicResource PrimaryForeground}"
                                     Content="&#xE713;"
                                     FontFamily="Segoe MDL2 Assets"
-                                    Click="OpenGameInfoFileBtn_Click" 
-                                    Visibility="{Binding GameInfoFileButtonVisibility}"/>
+                                    Click="OpenGameInfoFileBtn_Click"
+                                    Visibility="{Binding GameInfoFileButtonVisibility}" />
                             <Button HorizontalAlignment="Right"
                                     BorderThickness="0"
                                     Foreground="{DynamicResource PrimaryForeground}"

Mikoto/Windows/MainWindow.xaml.cs

@@ -17,6 +17,7 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Imaging;
 using MessageBox = HandyControl.Controls.MessageBox;
 
@@ -105,7 +106,6 @@ private void SetRandomBlurredBackground()
         private void InitGameLibraryPanel()
         {
             _viewModel.GamePanelCollection.Clear();
-            InitAddGamePanel();
             for (var i = 0; i < GameInfoList.Count; i++)
             {
                 AddGame(i);
@@ -141,6 +141,7 @@ private void AddGame(int gid)
                 CornerRadius = new CornerRadius(4),
                 Name = "game" + gid,
                 Width = 150,
+                Height = 120,
                 Child = gd,
                 Margin = new Thickness(3),
             };
@@ -151,43 +152,6 @@ private void AddGame(int gid)
             _viewModel.GamePanelCollection.Add(back);
         }
 
-        private void InitAddGamePanel()
-        {
-            var textBlock = new TextBlock()
-            {
-                Foreground = Brushes.White,
-                VerticalAlignment = VerticalAlignment.Center,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                TextWrapping = TextWrapping.Wrap,
-                FontSize = (double)Application.Current.Resources["SubHeadFontSize"]
-            };
-            textBlock.SetResourceReference(TextBlock.TextProperty, "MainWindow_ScrollViewer_AddNewGame");
-            var grid = new Grid();
-            grid.Children.Add(new Border()
-            {
-                Background = (SolidColorBrush)Application.Current.Resources["BoxBtnColor"],
-                CornerRadius = new CornerRadius(4),
-            });
-            grid.Children.Add(textBlock);
-            var border = new Border()
-            {
-                Name = "AddNewName",
-                Width = 150,
-                Child = grid,
-                Margin = new Thickness(3),
-                CornerRadius = new CornerRadius(4),
-            };
-            border.MouseEnter += Border_MouseEnter;
-            border.MouseLeave += Border_MouseLeave;
-            border.MouseLeftButtonDown += Border_MouseLeftButtonDown;
-            _viewModel.GamePanelCollection.Add(border);
-        }
-
-        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            AddNewGameDrawer.IsOpen = true;
-        }
-
         private WeakReference<SettingsWindow>? _settingsWindow;
 
         private void SettingsBtn_Click(object sender, RoutedEventArgs e)
@@ -258,10 +222,9 @@ private void Back_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
             GameNameTag.Tag = _gid;
             GameNameTag.Text = GameInfoList[_gid].GameName;
 
-
             _viewModel.LastStartTime = GameInfoList[_gid].LastPlayAt.ToString();
 
-            GameInfoDrawer.IsOpen = true;
+            _viewModel.GameInfoDrawerIsOpen = true;
             e.Handled = true;
         }
 
@@ -409,7 +372,7 @@ public static bool StartProcessAsAdmin(string fileName)
         }
         private void CloseDrawerBtn_Click(object sender, RoutedEventArgs e)
         {
-            GameInfoDrawer.IsOpen = false;
+            _viewModel.GameInfoDrawerIsOpen = false;
         }
 
         private async void StartBtn_Click(object sender, RoutedEventArgs e)
@@ -423,7 +386,7 @@ private async void StartBtn_Click(object sender, RoutedEventArgs e)
                 return;
             }
             Process.Start(path);
-            GameInfoDrawer.IsOpen = false;
+            _viewModel.GameInfoDrawerIsOpen = false;
             await StartTranslateByGid(_gid);
             Refresh();
         }
@@ -459,7 +422,7 @@ private async void LEStartBtn_Click(object sender, RoutedEventArgs e)
             p.UseShellExecute = false;
             p.WorkingDirectory = lePath;
             Process.Start(p);
-            GameInfoDrawer.IsOpen = false;
+            _viewModel.GameInfoDrawerIsOpen = false;
             await StartTranslateByGid(_gid);
             Refresh();
         }
@@ -473,7 +436,7 @@ private void DeleteGameBtn_Click(object sender, RoutedEventArgs e)
             {
                 GameHelper.DeleteGameByID(GameInfoList[_gid].GameID);
                 _viewModel.GamePanelCollection.Remove(_viewModel.GamePanelCollection.Where(p => p.Name == $"game{_gid}").First());
-                GameInfoDrawer.IsOpen = false;
+                _viewModel.GameInfoDrawerIsOpen = false;
             }
 
         }
@@ -654,6 +617,11 @@ private void OpenGameInfoFileBtn_Click(object sender, RoutedEventArgs e)
             string gameInfoFilePath = Path.Combine(Common.DataFolder, "games", $"{GameInfoList[_gid].GameID}.json");
             Process.Start(new ProcessStartInfo(gameInfoFilePath) { UseShellExecute = true });
         }
+
+        private void AddGameButton_Click(object sender, RoutedEventArgs e)
+        {
+            AddNewGameDrawer.IsOpen = true;
+        }
     }
 }
 

Mikoto/Windows/MainWindowViewModel.cs

@@ -1,16 +1,18 @@
-using Mikoto.Helpers.ViewModel;
+using Mikoto.Helpers.Graphics;
+using Mikoto.Helpers.ViewModel;
 using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media.Effects;
 
 namespace Mikoto.Windows
 {
     internal class MainWindowViewModel : ViewModelBase
     {
         public ObservableCollection<Border> GamePanelCollection { get; set; } = new();
 
-        private System.Windows.Visibility _LEEnabled;
-        public System.Windows.Visibility LEEnabled
+        private Visibility _LEEnabled;
+        public Visibility LEEnabled
         {
             get
             {
@@ -30,6 +32,28 @@ public System.Windows.Visibility LEEnabled
         private Visibility gameInfoFileButtonVisibility = Visibility.Collapsed;
 
         public Visibility GameInfoFileButtonVisibility { get => gameInfoFileButtonVisibility; set => SetProperty(ref gameInfoFileButtonVisibility, value); }
+
+        private Effect? _gameCollectionEffect = null;
+        public Effect? GameCollectionEffect { get => _gameCollectionEffect; set => SetProperty(ref _gameCollectionEffect, value); }
+
+        BlurEffect _blur = new BlurEffect();
+
+        private bool gameInfoDrawerIsOpen;
+        public bool GameInfoDrawerIsOpen
+        {
+            get => gameInfoDrawerIsOpen; set
+            {
+                if (value)
+                {
+                    GameCollectionEffect = _blur;
+                }
+                else
+                {
+                    GameCollectionEffect = null;
+                }
+                SetProperty(ref gameInfoDrawerIsOpen, value);
+            }
+        }
     }
 
 }