[ros-diffs] [reactos] 01/01: [EXPLORER] Hide Start Menu before Run dialog (#4823)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=802a87dfb2efcd1c1467af...

commit 802a87dfb2efcd1c1467af46c3a2a709124757f6
Author:     Katayama Hirofumi MZ [e-mail]
AuthorDate: Wed Nov 2 11:29:08 2022 +0900
Commit:     GitHub [e-mail]
CommitDate: Wed Nov 2 11:29:08 2022 +0900

[EXPLORER] Hide Start Menu before Run dialog (#4823)

- Add HideStartMenu helper method.
    - Hide Start Menu before opening Run dialog.
    CORE-13330
---
 base/shell/explorer/traywnd.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp
index d3774451270..75023294696 100644
--- a/base/shell/explorer/traywnd.cpp
+++ b/base/shell/explorer/traywnd.cpp
@@ -850,11 +850,17 @@ public:
         return TRUE;
     }

+    VOID HideStartMenu()
+    {
+        m_StartMenuPopup->OnSelect(MPOS_CANCELLEVEL);
+    }
+
     LRESULT HandleHotKey(DWORD id)
     {
         switch (id)
         {
         case IDHK_RUN:
+            HideStartMenu();
             DisplayRunFileDlg();
             break;
         case IDHK_HELP:
@@ -903,6 +909,7 @@ public:
                 // TODO:
                 break;
             case TRAYCMD_RUN_DIALOG:
+                HideStartMenu();
                 DisplayRunFileDlg();
                 break;
             case TRAYCMD_LOGOFF_DIALOG:
@@ -3062,13 +3069,9 @@ HandleTrayContextMenu:
             return FALSE;

if (::IsWindowVisible(hwndStartMenu))
-        {
-            m_StartMenuPopup->OnSelect(MPOS_CANCELLEVEL);
-        }
+            HideStartMenu();
         else
-        {
             PopupStartMenu();
-        }

return TRUE;
     }