From 70e7f82ff5f25f255171efe40151acfb68736fd6 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 16 Mar 2025 18:10:45 +0900
Subject: [PATCH] Fix Blink

---
 Flow.Launcher/MainWindow.xaml.cs         | 43 +++++++++++++++++-------
 Flow.Launcher/ViewModel/MainViewModel.cs | 29 ++++++++--------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 04e7867b1..6087313c6 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -30,6 +30,8 @@ using Windows.Win32;
 using Window = System.Windows.Window;
 using System.Linq;
 using System.Windows.Shapes;
+using ModernWpf.Controls.Primitives;
+using System.Runtime.InteropServices;
 
 namespace Flow.Launcher
 {
@@ -827,29 +829,44 @@ namespace Flow.Launcher
 
         public void HideStartup()
         {
-            //_viewModel.MainWindowOpacity = 0.2; /*Fix Render Blinking */
+            IntPtr hwnd = new WindowInteropHelper(System.Windows.Application.Current.MainWindow).Handle;
+
             if (_settings.HideOnStartup)
             {
-                // 📌 최초 실행 시 창이 깜빡이는 문제 방지 (완전히 숨긴 상태로 시작)
-                //System.Windows.Application.Current.MainWindow.Visibility = Visibility.Hidden;
+                CloakWindow(System.Windows.Application.Current.MainWindow);
 
-                //Dispatcher.BeginInvoke((Action)(() =>
-                //{
-                //    _viewModel.Hide();
-                //    System.Windows.Application.Current.MainWindow.Visibility = Visibility.Collapsed;
-                //}), DispatcherPriority.Background);
-                _viewModel.Hide();
+                Dispatcher.BeginInvoke((Action)(() =>
+                {
+                    _viewModel.Hide();
+                    System.Windows.Application.Current.MainWindow.Visibility = Visibility.Collapsed;
+                }), DispatcherPriority.Background);
             }
             else
             {
-                // 📌 최초 실행 시 그림자 효과를 미리 적용하여 Show() 할 때 렌더링이 느려지지 않도록 함
-                //ThemeManager.Instance.SetBlurForWindow();
-                //ThemeManager.Instance.AutoDropShadow();
+                UncloakWindow(System.Windows.Application.Current.MainWindow);
                 _viewModel.Show();
-                //_viewModel.MainWindowOpacity = 1;
             }
         }
 
+        private const int DWMWA_CLOAK = 13;
+
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmSetWindowAttribute(IntPtr hwnd, int dwAttribute, ref int pvAttribute, int cbAttribute);
+
+        public static void CloakWindow(Window window)
+        {
+            IntPtr hwnd = new WindowInteropHelper(window).Handle;
+            int cloak = 1;
+            DwmSetWindowAttribute(hwnd, DWMWA_CLOAK, ref cloak, sizeof(int));
+        }
+
+        public static void UncloakWindow(Window window)
+        {
+            IntPtr hwnd = new WindowInteropHelper(window).Handle;
+            int cloak = 0;
+            DwmSetWindowAttribute(hwnd, DWMWA_CLOAK, ref cloak, sizeof(int));
+        }
+
         public Screen SelectedScreen()
         {
             Screen screen;
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 72ab1d0b6..cf0343319 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -28,6 +28,7 @@ using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using System.Windows.Threading;
 using System.Windows.Interop;
+using System.Runtime.InteropServices;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -1388,12 +1389,13 @@ namespace Flow.Launcher.ViewModel
                 {
                     IntPtr hWnd = new WindowInteropHelper(mainWindow).Handle;
 
-                    // 📌 창을 보이도록 설정 (Cloak 사용 안 함)
-                    //ShowWindow(hWnd, SW_SHOW);
+                    // 📌 DWM Cloak 해제 (창을 정상적으로 표시)
+                    int cloak = 0;
+                    DwmSetWindowAttribute(hWnd, 13, ref cloak, sizeof(int));
 
                     // 📌 UI 요소 복원
                     mainWindow.ClockPanel.Visibility = Visibility.Visible;
-                    //mainWindow.SearchIcon.Visibility = Visibility.Visible;
+                    mainWindow.ClockPanel.Opacity = 1;
                     SearchIconVisibility = Visibility.Visible;
                 }
 
@@ -1419,13 +1421,14 @@ namespace Flow.Launcher.ViewModel
 
             if (Application.Current.MainWindow is MainWindow mainWindow)
             {
-                // 📌 아이콘과 시계 Opacity를 0으로 설정하고 Visibility.Hidden 적용
+                IntPtr hWnd = new WindowInteropHelper(mainWindow).Handle;
+
+                // 📌 UI 요소 숨기기
                 Application.Current.Dispatcher.Invoke(() =>
                 {
                     mainWindow.ClockPanel.Opacity = 0;
                     mainWindow.SearchIcon.Opacity = 0;
                     mainWindow.ClockPanel.Visibility = Visibility.Hidden;
-                    //mainWindow.SearchIcon.Visibility = Visibility.Hidden;
                     SearchIconVisibility = Visibility.Hidden;
 
                     // 강제 UI 업데이트
@@ -1433,7 +1436,9 @@ namespace Flow.Launcher.ViewModel
                     mainWindow.SearchIcon.UpdateLayout();
                 }, DispatcherPriority.Render);
 
-                //await Task.Delay(10); // UI 반영 대기
+                // 📌 DWM Cloak 적용 (창을 완전히 숨김)
+                int cloak = 1;
+                DwmSetWindowAttribute(hWnd, 13, ref cloak, sizeof(int));
             }
 
             // 📌 텍스트 초기화 즉시 적용 + UI 강제 업데이트
@@ -1466,20 +1471,16 @@ namespace Flow.Launcher.ViewModel
                     break;
             }
 
-            //if (Application.Current.MainWindow is MainWindow mainWindow2)
-            //{
-            //    IntPtr hWnd = new WindowInteropHelper(mainWindow2).Handle;
-
-            //    // 📌 Cloak을 사용하지 않고 일반적인 `ShowWindow(SW_HIDE)` 사용 → Mica/Acrylic 유지됨
-            //    ShowWindow(hWnd, SW_HIDE);
-            //}
-
             // WPF 속성 업데이트
             MainWindowVisibilityStatus = false;
             MainWindowVisibility = Visibility.Collapsed;
             VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = false });
         }
 
+        // 📌 DWM API 추가 (P/Invoke)
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmSetWindowAttribute(IntPtr hwnd, int dwAttribute, ref int pvAttribute, int cbAttribute);
+
         /// <summary>
         /// Checks if Flow Launcher should ignore any hotkeys
         /// </summary>