add:临时窗口显示

2026-04-05 15:49:06 +08:00
parent 24c6ca60a3
commit 1165e5bbf2
3 changed files with 120 additions and 2 deletions
@@ -1,4 +1,4 @@
-<Application x:Class="Ink_Canvas.App"
+<Application x:Class="Ink_Canvas.App"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="clr-namespace:Ink_Canvas"
@@ -32,6 +32,26 @@
                        </Image>
                    </MenuItem.Icon>
                </MenuItem>
+                <MenuItem Name="TempShowMainWindowTrayIconMenuItem" Click="TempShowMainWindowTrayIconMenuItem_Clicked">
+                    <MenuItem.Header>
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                            <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="显示主窗口（2分钟）" />
+                        </ikw:SimpleStackPanel>
+                    </MenuItem.Header>
+                    <MenuItem.Icon>
+                        <Image Width="28" Height="28" Margin="-2">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a" Geometry="F0 M24,24z M0,0z M5,6C4.73478,6 4.48043,6.10536 4.29289,6.29289 4.10536,6.48043 4,6.73478 4,7L4,17C4,17.2652 4.10536,17.5196 4.29289,17.7071 4.48043,17.8946 4.73478,18 5,18L19,18C19.2652,18 19.5196,17.8946 19.7071,17.7071 19.8946,17.5196 20,17.2652 20,17L20,7C20,6.73478 19.8946,6.48043 19.7071,6.29289 19.5196,6.10536 19.2652,6 19,6L5,6z M2.87868,4.87868C3.44129,4.31607,4.20435,4,5,4L19,4C19.7957,4 20.5587,4.31607 21.1213,4.87868 21.6839,5.44129 22,6.20435 22,7L22,17C22,17.7957 21.6839,18.5587 21.1213,19.1213 20.5587,19.6839 19.7957,20 19,20L5,20C4.20435,20 3.44129,19.6839 2.87868,19.1213 2.31607,18.5587 2,17.7956 2,17L2,7C2,6.20435,2.31607,5.44129,2.87868,4.87868z M5,8C5,7.44772,5.44772,7,6,7L6.01,7C6.56228,7 7.01,7.44772 7.01,8 7.01,8.55228 6.56228,9 6.01,9L6,9C5.44772,9,5,8.55228,5,8z M9,7C8.44772,7 8,7.44772 8,8 8,8.55228 8.44772,9 9,9L9.01,9C9.56228,9 10.01,8.55228 10.01,8 10.01,7.44772 9.56228,7 9.01,7L9,7z" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </MenuItem.Icon>
+                </MenuItem>
                <MenuItem Name="OpenSettingsTrayIconMenuItem" Click="OpenSettingsTrayIconMenuItem_Clicked">
                    <MenuItem.Header>
                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
@@ -82,6 +82,8 @@ namespace Ink_Canvas
        private static Cursor _cachedPenCursor = null;
        private static readonly object _cursorLock = new object();

+        internal static DateTime? TrayTemporaryShowUntilUtc;
+
        #region Window Initialization

        /// <summary>
@@ -4398,12 +4400,19 @@ namespace Ink_Canvas
        /// <summary>
        /// 检查是否应该显示主窗口（基于PPT模式和PPT放映状态）
        /// </summary>
-        private void CheckMainWindowVisibility()
+        internal void CheckMainWindowVisibility()
        {
            try
            {
                if (Settings.ModeSettings.IsPPTOnlyMode)
                {
+                    if (TrayTemporaryShowUntilUtc.HasValue && DateTime.UtcNow < TrayTemporaryShowUntilUtc.Value)
+                    {
+                        if (!IsVisible)
+                            Show();
+                        return;
+                    }
+
                    // 仅PPT模式：以 COM/UI 状态为主，Win32 检测全屏放映窗口（screenClass）作兜底，避免 COM 异常时无法唤出
                    bool comUiSlideShow = BtnPPTSlideShowEnd.Visibility == Visibility.Visible;
                    bool win32SlideShow = IsPowerPointSlideshowSurfacePresentWin32();
@@ -9,6 +9,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
 using System.Windows.Interop;
+using System.Windows.Threading;
 using Application = System.Windows.Application;
 using ContextMenu = System.Windows.Controls.ContextMenu;
 using MenuItem = System.Windows.Controls.MenuItem;
@@ -17,6 +18,11 @@ namespace Ink_Canvas
 {
    public partial class App : Application
    {
+        private const int TrayTemporaryShowMinutes = 2;
+
+        private DispatcherTimer _trayTemporaryShowTimer;
+
+        private bool _trayTemporaryShowRestoreHideChecked;

        /// <summary>
        /// 系统托盘菜单打开时的事件处理方法
@@ -131,6 +137,85 @@ namespace Ink_Canvas
            }
        }

+        private void TempShowMainWindowTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
+        {
+            var mainWin = Current.MainWindow as MainWindow;
+            if (mainWin?.IsLoaded != true)
+                return;
+
+            MenuItem hideItem = null;
+            try
+            {
+                var trayMenu = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
+                hideItem = trayMenu?.Items.OfType<MenuItem>()
+                    .FirstOrDefault(mi => mi.Name == "HideICCMainWindowTrayIconMenuItem");
+            }
+            catch
+            {
+            }
+
+            _trayTemporaryShowRestoreHideChecked = hideItem?.IsChecked == true;
+
+            EnsureMainWindowReadyForSettings(mainWin);
+
+            global::Ink_Canvas.MainWindow.TrayTemporaryShowUntilUtc = DateTime.UtcNow.AddMinutes(TrayTemporaryShowMinutes);
+
+            _trayTemporaryShowTimer?.Stop();
+            if (_trayTemporaryShowTimer == null)
+            {
+                _trayTemporaryShowTimer = new DispatcherTimer
+                {
+                    Interval = TimeSpan.FromMinutes(TrayTemporaryShowMinutes)
+                };
+                _trayTemporaryShowTimer.Tick += TrayTemporaryShowTimer_OnTick;
+            }
+            else
+            {
+                _trayTemporaryShowTimer.Interval = TimeSpan.FromMinutes(TrayTemporaryShowMinutes);
+            }
+
+            _trayTemporaryShowTimer.Start();
+        }
+
+        private void TrayTemporaryShowTimer_OnTick(object sender, EventArgs e)
+        {
+            _trayTemporaryShowTimer?.Stop();
+            global::Ink_Canvas.MainWindow.TrayTemporaryShowUntilUtc = null;
+
+            var mainWin = Current.MainWindow as MainWindow;
+            if (mainWin?.IsLoaded != true)
+            {
+                _trayTemporaryShowRestoreHideChecked = false;
+                return;
+            }
+
+            try
+            {
+                if (_trayTemporaryShowRestoreHideChecked)
+                {
+                    var trayMenu = ((TaskbarIcon)Current.Resources["TaskbarTrayIcon"]).ContextMenu;
+                    var hideItem = trayMenu?.Items.OfType<MenuItem>()
+                        .FirstOrDefault(mi => mi.Name == "HideICCMainWindowTrayIconMenuItem");
+                    if (hideItem != null)
+                        hideItem.IsChecked = true;
+                    else
+                        mainWin.Hide();
+                }
+                else
+                {
+                    mainWin.CheckMainWindowVisibility();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"托盘临时显示计时结束处理失败: {ex.Message}", LogHelper.LogType.Warning);
+            }
+            finally
+            {
+                _trayTemporaryShowRestoreHideChecked = false;
+            }
+        }
+
        private void OpenSettingsTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e)
        {
            var mainWin = Current.MainWindow as MainWindow;
@@ -326,6 +411,10 @@ namespace Ink_Canvas
        /// </remarks>
        private void HideICCMainWindowTrayIconMenuItem_Checked(object sender, RoutedEventArgs e)
        {
+            _trayTemporaryShowTimer?.Stop();
+            global::Ink_Canvas.MainWindow.TrayTemporaryShowUntilUtc = null;
+            _trayTemporaryShowRestoreHideChecked = false;
+
            var mi = (MenuItem)sender;
            var mainWin = (MainWindow)Current.MainWindow;
            if (mainWin != null && mainWin.IsLoaded)