From 99df058a665ea04065a23e729ec79a2f23f79881 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 20 五月 2025 16:59:43 +0800
Subject: [PATCH] 优化

---
 WPFProject/PanuonWindow.xaml.cs |   61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/WPFProject/PanuonWindow.xaml.cs b/WPFProject/PanuonWindow.xaml.cs
index 375df69..71de9ee 100644
--- a/WPFProject/PanuonWindow.xaml.cs
+++ b/WPFProject/PanuonWindow.xaml.cs
@@ -7,7 +7,6 @@
 using Panuon.WPF.UI;
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
@@ -22,7 +21,7 @@
     {
         public PanuonWindow()
         {
-            Loaded += PanuonWindow_Loaded;
+            this.Loaded += PanuonWindow_Loaded;
         }
 
         private UserInfo currentUser;
@@ -41,7 +40,9 @@
             RefrshConfig();
             InitializeComponent();
             userMenu.Header = this.lang("App.Welcome", UserInfo.User.Name);
-            ShowMenu = true;
+            ShowMenu = false;
+            Application.Current.MainWindow = this;
+            SystemSetting.SystemSettingChanged += SystemSetting_SystemSettingChanged;
         }
 
         private void RefrshConfig()
@@ -90,23 +91,6 @@
             }
         }
 
-
-        private void Button_Click_2(object sender, RoutedEventArgs e)
-        {
-            ShowMenu = !ShowMenu;
-            //Button btn = (Button)sender;
-            //double temp = btn.RenderTransform.Value.Determinant;
-            //btn.RenderTransformOrigin = new Point(0.5, 0.5);
-            //ScaleTransform verticalFlipTransform = new ScaleTransform(1, temp * -1);
-            //btn.RenderTransform = verticalFlipTransform;
-            //menuTab.ChangeItemVisibility();
-        }
-
-        private void window_Loaded(object sender, RoutedEventArgs e)
-        {
-            SystemSetting.SystemSettingChanged += SystemSetting_SystemSettingChanged;
-        }
-
         private void SystemSetting_SystemSettingChanged(object sender, SystemSetting e)
         {
             RefrshConfig();
@@ -125,8 +109,10 @@
         }
 
         private void MenuItem_Click(object sender, RoutedEventArgs e)
-        {MenuItem mi = sender as MenuItem;
-            switch (mi.Name) {
+        {
+            MenuItem mi = sender as MenuItem;
+            switch (mi.Name)
+            {
                 case "MiLogout":
                     Logout();
                     break;
@@ -143,7 +129,8 @@
             if (MsgBoxHelper.WarnMessage(this, this.lang("App.MakeSureLogout")) == MessageBoxResult.OK)
             {
                 string path = Path.Combine(PathHelper.DatabaseFolder, "user.bin");
-                if (File.Exists(path)) { 
+                if (File.Exists(path))
+                {
                     File.Delete(path);
                 }
                 this.Closed -= window_Closed;
@@ -173,6 +160,34 @@
             Application.Current.Shutdown();
         }
 
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Button btn = sender as Button;
+            switch (btn.Name)
+            {
+                case "minBtn":
+                    this.Minimize();
+                    break;
+                case "maxBtn":
+                    this.Maximize();
+                    break;
+                case "closeBtn":
+                    this.Close();
+                    break;
+                case "BtnSwitchTheme":
+                    ShowMenu = !ShowMenu;
+                    //Button btn = (Button)sender;
+                    //double temp = btn.RenderTransform.Value.Determinant;
+                    //btn.RenderTransformOrigin = new Point(0.5, 0.5);
+                    //ScaleTransform verticalFlipTransform = new ScaleTransform(1, temp * -1);
+                    //btn.RenderTransform = verticalFlipTransform;
+                    //menuTab.ChangeItemVisibility();
+                    break;
+                default:
+                    break;
+            }
+        }
+
         //private void BaseWindow_Loaded(object sender, RoutedEventArgs e)
         //{
         //    var s = (Style)this.Resources["WindowButton"];

--
Gitblit v1.9.1