From 006c98e5650b530e5220f279c1e803fefe69d40d Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 25 十一月 2025 15:47:33 +0800
Subject: [PATCH] 优化一些东西;

---
 WPFProject/Utils/MainToastHandler.cs |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/WPFProject/Utils/MainToastHandler.cs b/WPFProject/Utils/MainToastHandler.cs
index 3572136..9356303 100644
--- a/WPFProject/Utils/MainToastHandler.cs
+++ b/WPFProject/Utils/MainToastHandler.cs
@@ -2,6 +2,7 @@
 using Panuon.WPF.UI;
 using Panuon.WPF.UI.Configurations;
 using HMI.UI.Util;
+using System;
 
 namespace WPFProject.Utils
 {
@@ -15,11 +16,11 @@
             if (window is PanuonWindow pw)
             {
                 double num = 20 + (pw.menuTab.MenuVisibility == Visibility.Visible ? pw.menuTab.Menu.ActualHeight + pw.menuTab.SubMenu.ActualHeight : 0);
-                Toast.Show(pw, message, icon, position, num, durationMs, setting);
+                Show(pw, message, icon, position, num, durationMs, setting);
             }
             else if (window is WindowX wx)
             {
-                Toast.Show(wx, message, icon, position, 0, durationMs, setting);
+                Show(wx, message, icon, position, 0, durationMs, setting);
             }
         }
 
@@ -31,11 +32,11 @@
             if (window is PanuonWindow pw)
             {
                 double num = 20 + (pw.menuTab.MenuVisibility == Visibility.Visible ? pw.menuTab.Menu.ActualHeight + pw.menuTab.SubMenu.ActualHeight : 0);
-                Toast.Show(pw, message, icon, position, num, durationMs, setting);
+                Show(pw, message, icon, position, num, durationMs, setting);
             }
             else if (window is WindowX wx)
             {
-                Toast.Show(wx, message, icon, position, 0, durationMs, setting);
+                Show(wx, message, icon, position, 0, durationMs, setting);
             }
         }
 
@@ -45,11 +46,11 @@
             if (window is PanuonWindow pw)
             {
                 double num = 20 + (pw.menuTab.MenuVisibility == Visibility.Visible ? pw.menuTab.Menu.ActualHeight + pw.menuTab.SubMenu.ActualHeight : 0);
-                Toast.Show(pw, message, icon, position, num, durationMs, setting);
+                Show(pw, message, icon, position, num, durationMs, setting);
             }
             else if (window is WindowX wx)
             {
-                Toast.Show(wx, message, icon, position, 0, durationMs, setting);
+                Show(wx, message, icon, position, 0, durationMs, setting);
             }
         }
 
@@ -59,12 +60,17 @@
             if (window is PanuonWindow pw)
             {
                 double num = 20 + (pw.menuTab.MenuVisibility == Visibility.Visible ? pw.menuTab.Menu.ActualHeight + pw.menuTab.SubMenu.ActualHeight : 0);
-                Toast.Show(pw, message, icon, position, num, durationMs, setting);
+                Show(pw, message, icon, position, num, durationMs, setting);
             }
             else if (window is WindowX wx)
             {
-                Toast.Show(wx, message, icon, position, 0, durationMs, setting);
+                Show(wx, message, icon, position, 0, durationMs, setting);
             }
         }
+
+        private void Show(WindowX window, string message, MessageBoxIcon icon, ToastPosition position, double offset, int durationMs, ToastSetting setting)
+        {
+            Toast.Show(window, message, icon, position, offset, durationMs, setting);
+        }
     }
 }

--
Gitblit v1.9.1