+fix: missing toolbar if started minimized

chrisxvin · Mar 2, 2024 · 54a7cfc · 54a7cfc
1 parent 8bcc760
commit 54a7cfc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/src/Dialogs.c b/src/Dialogs.c
@@ -703,9 +703,12 @@ void MinimizeWndToTray(HWND hWnd) {
     // Add the tray icon. If we add it before the call to DrawAnimatedRects,
     // the taskbar gets erased, but doesn't get redrawn until DAR finishes.
     // This looks untidy, so call the functions in this order
+    ShowNotifyIcon(hWnd, true);
+    SetNotifyIconTitle(hWnd);
 
     // Hide the window
     ShowWindow(hWnd, SW_HIDE);
+
     Globals.bMinimizedToTray = true;
 }
 
@@ -737,11 +740,13 @@ void RestoreWndFromTray(HWND hWnd) {
 
     SetActiveWindow(hWnd);
     SetForegroundWindow(hWnd);
-    Globals.bMinimizedToTray = false;
 
     // Remove the tray icon. As described above, remove the icon after the
     // call to DrawAnimatedRects, or the taskbar will not refresh itself
     // properly until DAR finished
+    ShowNotifyIcon(hWnd, false);
+
+    Globals.bMinimizedToTray = false;
 }
 
 void RestoreWndFromTaskbar(HWND hWnd)

diff --git a/src/Notepad3.c b/src/Notepad3.c
@@ -1893,6 +1893,8 @@ HWND InitInstance(const HINSTANCE hInstance, int nCmdShow)
     InitWindowCommon(hwndMain, true);
     SetDialogIconNP3(hwndMain);
 
+    //assert("Attach Debugger" && 0);
+
     // correct infos based on hwnd
     g_DefWinInfo = _GetDefaultWinInfoByStrg(hwndMain, Settings2.DefaultWindowPosition);
     s_WinCurrentWidth = g_IniWinInfo.cx;
@@ -1908,6 +1910,8 @@ HWND InitInstance(const HINSTANCE hInstance, int nCmdShow)
         SetWindowTransparentMode(hwndMain, true, Settings2.OpacityLevel);
     }
 
+    CreateBars(hwndMain, hInstance);
+
     SetMenu(hwndMain, (Settings.ShowMenubar ? Globals.hMainMenu : NULL));
     DrawMenuBar(hwndMain);
 
@@ -1941,24 +1945,22 @@ HWND InitInstance(const HINSTANCE hInstance, int nCmdShow)
     //~SnapToWinInfoPos(hwndMain, g_IniWinInfo, SCR_NORMAL, SW_HIDE); ~ instead set all needed properties  here:
     SetWindowPos(hwndMain, Settings.AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 
-    if (!s_flagStartAsTrayIcon) {
-        UpdateWindow(hwndMain);
-        if (!Settings.ShowTitlebar) {
-            SetWindowLong(hwndMain, GWL_STYLE, GetWindowLong(hwndMain, GWL_STYLE) & ~WS_CAPTION);
-        }
+    UpdateWindow(hwndMain);
+    if (!Settings.ShowTitlebar) {
+        SetWindowLong(hwndMain, GWL_STYLE, GetWindowLong(hwndMain, GWL_STYLE) & ~WS_CAPTION);
     }
-    else {
+
+    if (s_flagStartAsTrayIcon || (nCmdShow & SW_MINIMIZE)) {
         if (Settings.MinimizeToTray) {
             MinimizeWndToTray(hwndMain);
         }
         else {
             MinimizeWndToTaskbar(hwndMain);
-            nCmdShow = SW_MINIMIZE;
         }
-        ShowNotifyIcon(hwndMain, true);
-        SetNotifyIconTitle(hwndMain);
     }
-    ShowWindow(hwndMain, nCmdShow);
+    else {
+        ShowWindow(hwndMain, nCmdShow);
+    }
 
     bool bOpened = false;
 
@@ -3417,7 +3419,7 @@ LRESULT MsgEndSession(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
         // call SaveAllSettings() when Globals.hwndToolbar is still valid
         SaveAllSettings(false);
 
-        // Remove tray icon if necessary
+        // Remove tray icon in any case
         ShowNotifyIcon(hwnd, false);
 
         //if (IS_VALID_HANDLE(s_hEvent)) {
@@ -4100,7 +4102,7 @@ LRESULT MsgTrayMessage(HWND hwnd, WPARAM wParam, LPARAM lParam)
             RestoreWndFromTray(hwnd);
             ShowOwnedPopups(hwnd, true);
         } else if (iCmd == IDM_TRAY_EXIT) {
-            //ShowNotifyIcon(hwnd,false);
+            ShowNotifyIcon(hwnd,false);
             CloseApplication();
         }
     }
@@ -7628,8 +7630,6 @@ LRESULT MsgSysCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
         ShowOwnedPopups(hwnd, false);
         if (Settings.MinimizeToTray) {
             MinimizeWndToTray(hwnd);
-            ShowNotifyIcon(hwnd, true);
-            SetNotifyIconTitle(hwnd);
         }
         else {
             MinimizeWndToTaskbar(hwnd);