Skip to content

feat:为托盘右键菜单添加设置入口 #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PANDAJSR wants to merge 4 commits into
base: beta
Choose a base branch
from
Open

feat:为托盘右键菜单添加设置入口 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
700aa08
软件设置内的贡献者列表添加了 PANDA-JSR
PANDAJSR Feb 14, 2026
bb4b8f4
Merge branch 'InkCanvasForClass:beta' into beta
PANDAJSR Feb 14, 2026
602fe48
Merge branch 'InkCanvasForClass:beta' into beta
PANDAJSR Mar 10, 2026
051509f
feat(tray): add separate entries for new/legacy settings
PANDAJSR Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Ink Canvas/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,26 @@
</Image>
</MenuItem.Icon>
</MenuItem>
<MenuItem Name="OpenNewSettingsTrayIconMenuItem" Click="OpenNewSettingsTrayIconMenuItem_Clicked">
<MenuItem.Header>
<ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
<TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="打开新设置" />
</ui:SimpleStackPanel>
</MenuItem.Header>
<MenuItem.Icon>
<Image Width="28" Height="28" Margin="-2" Source="/Resources/Icons-Fluent/ic_fluent_settings_24_regular.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Name="OpenOldSettingsTrayIconMenuItem" Click="OpenOldSettingsTrayIconMenuItem_Clicked">
<MenuItem.Header>
<ui:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
<TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="打开旧设置" />
</ui:SimpleStackPanel>
</MenuItem.Header>
<MenuItem.Icon>
<Image Width="28" Height="28" Margin="-2" Source="/Resources/Icons-Fluent/ic_fluent_settings_24_regular.png" />
</MenuItem.Icon>
</MenuItem>
<Separator Margin="0,3" />
<MenuItem Name="DisableAllHotkeysMenuItem" Click="DisableAllHotkeysMenuItem_Clicked">
<MenuItem.Header>
Expand Down
92 changes: 91 additions & 1 deletion Ink Canvas/MainWindow_cs/MW_TrayIcon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Forms;
Expand Down Expand Up @@ -37,7 +39,9 @@ private void SysTrayMenu_Opened(object sender, RoutedEventArgs e)
var FoldFloatingBarTrayIconMenuItemIconEyeOn = (Image)((Grid)((MenuItem)s.Items[s.Items.Count - 5]).Icon).Children[1];
var FoldFloatingBarTrayIconMenuItemHeaderText = (TextBlock)((SimpleStackPanel)((MenuItem)s.Items[s.Items.Count - 5]).Header).Children[0];
var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
var HideICCMainWindowTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 9];
var HideICCMainWindowTrayIconMenuItem = s.Items.OfType<MenuItem>()
.FirstOrDefault(mi => mi.Name == "HideICCMainWindowTrayIconMenuItem");
if (HideICCMainWindowTrayIconMenuItem == null) return;
var mainWin = (MainWindow)Current.MainWindow;
if (mainWin.IsLoaded)
{
Expand Down Expand Up @@ -84,6 +88,92 @@ private void SysTrayMenu_Opened(object sender, RoutedEventArgs e)
/// 1. 获取主窗口实例
/// 2. 如果主窗口已加载，且在无焦点模式下启用了始终置顶，则恢复主窗口的置顶状态
/// </remarks>
private bool EnsureMainWindowReadyForSettings(MainWindow mainWin)
{
if (mainWin?.IsLoaded != true)
{
return false;
}

var trayMenu = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
var hideMainWindowMenuItem = trayMenu?.Items.OfType<MenuItem>()
.FirstOrDefault(mi => mi.Name == "HideICCMainWindowTrayIconMenuItem");

if (hideMainWindowMenuItem != null && hideMainWindowMenuItem.IsChecked)
{
hideMainWindowMenuItem.IsChecked = false;
}
else if (!mainWin.IsVisible)
{
mainWin.Show();
}

if (mainWin.WindowState == WindowState.Minimized)
{
mainWin.WindowState = WindowState.Normal;
}

mainWin.Activate();
return true;
}

private bool IsLegacySettingsVisible(MainWindow mainWin)
{
try
{
var borderSettingsField = typeof(MainWindow).GetField("BorderSettings", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
var borderSettings = borderSettingsField?.GetValue(mainWin) as FrameworkElement;
return borderSettings?.Visibility == Visibility.Visible;
}
catch
{
return false;
}
}

private void OpenNewSettingsTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
{
var mainWin = Current.MainWindow as MainWindow;
if (!EnsureMainWindowReadyForSettings(mainWin))
{
return;
}

try
{
var method = typeof(MainWindow).GetMethod("BtnOpenNewSettings_Click", BindingFlags.NonPublic | BindingFlags.Instance);
method?.Invoke(mainWin, new object[] { null, null });
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"Open new settings from tray failed: {ex.Message}", LogHelper.LogType.Error);
}
}

private void OpenOldSettingsTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
{
var mainWin = Current.MainWindow as MainWindow;
if (!EnsureMainWindowReadyForSettings(mainWin))
{
return;
}

if (IsLegacySettingsVisible(mainWin))
{
return;
}

try
{
var method = typeof(MainWindow).GetMethod("BtnSettings_Click", BindingFlags.NonPublic | BindingFlags.Instance);
method?.Invoke(mainWin, new object[] { null, null });
}
catch (Exception ex)
{
LogHelper.WriteLogToFile($"Open old settings from tray failed: {ex.Message}", LogHelper.LogType.Error);
}
}

private void SysTrayMenu_Closed(object sender, RoutedEventArgs e)
{
var mainWin = (MainWindow)Current.MainWindow;
Expand Down
Loading