CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码清理

Browse Source
This commit is contained in:
PrefacedCorg
2025-08-03 16:46:33 +08:00
parent 745b798d89
commit 11a5a7fdbe
73 changed files with 5733 additions and 3857 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_TrayIcon.cs
+64 -36
View File
@@ -1,24 +1,26 @@
using System;
using Hardcodet.Wpf.TaskbarNotification;
using Ink_Canvas.Helpers;
using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Forms;
using System.Windows.Interop;
using Hardcodet.Wpf.TaskbarNotification;
using Ink_Canvas.Helpers;
using iNKORE.UI.WPF.Modern.Controls;
using Application = System.Windows.Application;
using ContextMenu = System.Windows.Controls.ContextMenu;
using MenuItem = System.Windows.Controls.MenuItem;
namespace Ink_Canvas
{
public partial class App : Application {
public partial class App : Application
{
private void SysTrayMenu_Opened(object sender, RoutedEventArgs e) {
private void SysTrayMenu_Opened(object sender, RoutedEventArgs e)
{
var s = (ContextMenu)sender;
var FoldFloatingBarTrayIconMenuItemIconEyeOff =
(Image)((Grid)((MenuItem)s.Items[s.Items.Count-5]).Icon).Children[0];
(Image)((Grid)((MenuItem)s.Items[s.Items.Count - 5]).Icon).Children[0];
var FoldFloatingBarTrayIconMenuItemIconEyeOn =
(Image)((Grid)((MenuItem)s.Items[s.Items.Count - 5]).Icon).Children[1];
var FoldFloatingBarTrayIconMenuItemHeaderText =
@@ -26,64 +28,79 @@ namespace Ink_Canvas
var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
var HideICCMainWindowTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 9];
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded) {
if (mainWin.IsLoaded)
{
// 判斷是否在收納模式中
if (mainWin.isFloatingBarFolded) {
if (mainWin.isFloatingBarFolded)
{
FoldFloatingBarTrayIconMenuItemIconEyeOff.Visibility = Visibility.Hidden;
FoldFloatingBarTrayIconMenuItemIconEyeOn.Visibility = Visibility.Visible;
FoldFloatingBarTrayIconMenuItemHeaderText.Text = "退出收纳模式";
if (!HideICCMainWindowTrayIconMenuItem.IsChecked) {
if (!HideICCMainWindowTrayIconMenuItem.IsChecked)
{
ResetFloatingBarPositionTrayIconMenuItem.IsEnabled = false;
ResetFloatingBarPositionTrayIconMenuItem.Opacity = 0.5;
}
} else {
}
else
{
FoldFloatingBarTrayIconMenuItemIconEyeOff.Visibility = Visibility.Visible;
FoldFloatingBarTrayIconMenuItemIconEyeOn.Visibility = Visibility.Hidden;
FoldFloatingBarTrayIconMenuItemHeaderText.Text = "切换为收纳模式";
if (!HideICCMainWindowTrayIconMenuItem.IsChecked) {
if (!HideICCMainWindowTrayIconMenuItem.IsChecked)
{
ResetFloatingBarPositionTrayIconMenuItem.IsEnabled = true;
ResetFloatingBarPositionTrayIconMenuItem.Opacity = 1;
}
}
}
}
private void CloseAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
private void CloseAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
{
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded) {
if (mainWin.IsLoaded)
{
IsAppExitByUser = true;
Current.Shutdown();
// mainWin.BtnExit_Click(null,null);
}
}
private void RestartAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
private void RestartAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
{
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded) {
if (mainWin.IsLoaded)
{
IsAppExitByUser = true;
try {
try
{
// 启动新实例
string exePath = Process.GetCurrentProcess().MainModule.FileName;
ProcessStartInfo startInfo = new ProcessStartInfo();
startInfo.FileName = exePath;
startInfo.UseShellExecute = true;
// 启动进程但不等待
Process.Start(startInfo);
} catch (Exception ex) {
}
catch (Exception ex)
{
LogHelper.NewLog($"重启程序时出错: {ex.Message}");
}
// 退出当前实例
Current.Shutdown();
}
}
private void ForceFullScreenTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
private void ForceFullScreenTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
{
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded) {
if (mainWin.IsLoaded)
{
Ink_Canvas.MainWindow.MoveWindow(new WindowInteropHelper(mainWin).Handle, 0, 0,
Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height, true);
Ink_Canvas.MainWindow.ShowNewMessage($"已强制全屏化：{Screen.PrimaryScreen.Bounds.Width}x{Screen.PrimaryScreen.Bounds.Height}（缩放比例为{Screen.PrimaryScreen.Bounds.Width / SystemParameters.PrimaryScreenWidth}x{Screen.PrimaryScreen.Bounds.Height / SystemParameters.PrimaryScreenHeight}）");
@@ -94,29 +111,34 @@ namespace Ink_Canvas
{
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded)
if (mainWin.isFloatingBarFolded) mainWin.UnFoldFloatingBar_MouseUp(new object(),null);
else mainWin.FoldFloatingBar_MouseUp(new object(),null);
if (mainWin.isFloatingBarFolded) mainWin.UnFoldFloatingBar_MouseUp(new object(), null);
else mainWin.FoldFloatingBar_MouseUp(new object(), null);
}
private void ResetFloatingBarPositionTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
{
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded) {
if (mainWin.IsLoaded)
{
var isInPPTPresentationMode = false;
Dispatcher.Invoke(() => {
Dispatcher.Invoke(() =>
{
isInPPTPresentationMode = mainWin.BtnPPTSlideShowEnd.Visibility == Visibility.Visible;
});
if (!mainWin.isFloatingBarFolded) {
if (!mainWin.isFloatingBarFolded)
{
if (!isInPPTPresentationMode) mainWin.PureViewboxFloatingBarMarginAnimationInDesktopMode();
else mainWin.PureViewboxFloatingBarMarginAnimationInPPTMode();
}
}
}
private void HideICCMainWindowTrayIconMenuItem_Checked(object sender, RoutedEventArgs e) {
private void HideICCMainWindowTrayIconMenuItem_Checked(object sender, RoutedEventArgs e)
{
var mi = (MenuItem)sender;
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded) {
if (mainWin.IsLoaded)
{
mainWin.Hide();
var s = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
@@ -128,16 +150,20 @@ namespace Ink_Canvas
ResetFloatingBarPositionTrayIconMenuItem.Opacity = 0.5;
FoldFloatingBarTrayIconMenuItem.Opacity = 0.5;
ForceFullScreenTrayIconMenuItem.Opacity = 0.5;
} else {
}
else
{
mi.IsChecked = false;
}
}
private void HideICCMainWindowTrayIconMenuItem_UnChecked(object sender, RoutedEventArgs e) {
private void HideICCMainWindowTrayIconMenuItem_UnChecked(object sender, RoutedEventArgs e)
{
var mi = (MenuItem)sender;
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded) {
if (mainWin.IsLoaded)
{
mainWin.Show();
var s = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
@@ -149,7 +175,9 @@ namespace Ink_Canvas
ResetFloatingBarPositionTrayIconMenuItem.Opacity = 1;
FoldFloatingBarTrayIconMenuItem.Opacity = 1;
ForceFullScreenTrayIconMenuItem.Opacity = 1;
} else {
}
else
{
mi.IsChecked = false;
}
}