feat: 1. drag to panel address combobox opens the archive/dir; 2. mouse forward/backward key nav

CPP/7zip/UI/FileManager/Panel.cpp

@@ -3,6 +3,7 @@
 #include "StdAfx.h"
 
 #include <windowsx.h>
+#include <winuser.h>
 
 #include "../../../Common/IntToString.h"
 #include "../../../Common/StringConvert.h"
@@ -190,6 +191,23 @@ LRESULT CMyListView::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
     // return 0;
   }
   */
+  else if (message == WM_APPCOMMAND)
+  {
+    short p = GET_APPCOMMAND_LPARAM(lParam);
+    if (p == APPCOMMAND_BROWSER_BACKWARD) {
+      _panel->OpenParentFolder();
+      return 0;
+    }
+    if (p == APPCOMMAND_BROWSER_FORWARD) {
+      UStringVector folderHistory;
+      _panel->_appState->FolderHistory.GetList(folderHistory);
+      if (folderHistory.Size() >= 2) {
+        const UString x = folderHistory[1];
+        _panel->BindToPathAndRefresh(x);
+      }
+      return 0;
+    }
+  }
   else if (message == WM_KEYDOWN)
   {
     bool alt = IsKeyDown(VK_MENU);

CPP/7zip/UI/FileManager/Panel.h

@@ -312,8 +312,10 @@ class CPanel Z7_final: public NWindows::NControl::CWindow2
   unsigned _comboBoxID;
   UINT _statusBarID;
 
+  public:
   CAppState *_appState;
 
+  private:
   virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM lParam, LRESULT &result) Z7_override;
   virtual LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam) Z7_override;
   virtual bool OnCreate(CREATESTRUCT *createStruct) Z7_override;

CPP/7zip/UI/FileManager/PanelDrag.cpp

@@ -1,6 +1,7 @@
 // PanelDrag.cpp
 
 #include "StdAfx.h"
+#include <windef.h>
 
 #ifdef UNDER_CE
 #include <winuserm.h>
@@ -345,9 +346,9 @@ enum Enum_CmdId
   k_Cancel        = 1,
   k_Copy_Base     = 2, // to fs
   k_Copy_ToArc    = 3,
-  k_AddToArc      = 4
-  /*
+  k_AddToArc      = 4,
   k_OpenArc       = 8,
+  /*
   k_TestArc       = 9,
   k_ExtractFiles  = 10,
   k_ExtractHere   = 11
@@ -372,7 +373,7 @@ static const CCmdLangPair g_Pairs[] =
   { k_Copy_Base  | k_MenuFlag_Move,  IDS_MOVE },
   { k_Copy_ToArc | k_MenuFlag_Copy,  IDS_COPY_TO },
   // { k_Copy_ToArc | k_MenuFlag_Move,  IDS_MOVE_TO }, // IDS_CONTEXT_COMPRESS_TO
-  // { k_OpenArc,      IDS_CONTEXT_OPEN },
+  { k_OpenArc,      IDS_CONTEXT_OPEN },
   // { k_ExtractFiles, IDS_CONTEXT_EXTRACT },
   // { k_ExtractHere,  IDS_CONTEXT_EXTRACT_HERE },
   // { k_TestArc,      IDS_CONTEXT_TEST },
@@ -409,6 +410,7 @@ class CDropTarget Z7_final:
 
   CPanel *m_Panel;
   bool m_IsAppTarget;        // true, if we want to drop to app window (not to panel)
+  bool m_IsPanelAddressComboBoxOrBar;
 
   bool m_TargetPath_WasSent_ToDataObject;           // true, if TargetPath was sent
   bool m_TargetPath_NonEmpty_WasSent_ToDataObject;  // true, if non-empty TargetPath was sent
@@ -1828,6 +1830,7 @@ CDropTarget::CDropTarget():
       // m_SubFolderIndex(-1),
       m_Panel(NULL),
       m_IsAppTarget(false),
+      m_IsPanelAddressComboBoxOrBar(false),
       m_TargetPath_WasSent_ToDataObject(false),
       m_TargetPath_NonEmpty_WasSent_ToDataObject(false),
       m_Transfer_WasSent_ToDataObject(false),
@@ -1860,6 +1863,7 @@ void CDropTarget::ClearState()
   // m_DropHighlighted_SubFolderName.Empty();
   m_Panel = NULL;
   m_IsAppTarget = false;
+  m_IsPanelAddressComboBoxOrBar = false;
   m_TargetPath_WasSent_ToDataObject = false;
   m_TargetPath_NonEmpty_WasSent_ToDataObject = false;
   m_Transfer_WasSent_ToDataObject = false;
@@ -1945,6 +1949,7 @@ void CDropTarget::PositionCursor(const POINTL &ptl)
   // m_SubFolderIndex = -1;
   // m_DropHighlighted_SubFolderName.Empty();
   m_IsAppTarget = true;
+  m_IsPanelAddressComboBoxOrBar = false;
   m_Panel = NULL;
   m_PanelDropIsAllowed = false;
 
@@ -1969,6 +1974,19 @@ void CDropTarget::PositionCursor(const POINTL &ptl)
             m_IsAppTarget = false;
             if ((int)i == SrcPanelIndex)
               return; // we don't allow to drop to source panel
+
+            POINT pt3 = pt;
+            if (panel->ScreenToClient(&pt3)) {
+              HWND x = ::ChildWindowFromPointEx((HWND)*panel, pt3,
+                CWP_SKIPINVISIBLE | CWP_SKIPDISABLED);
+              if (x == (HWND)(panel->_headerToolBar)
+                || x == (HWND)(panel->_headerReBar)
+                || x == (HWND)(panel->_headerComboBox)
+              ) {
+                m_IsPanelAddressComboBoxOrBar = true;
+              }
+            }
+            
             break;
           }
         }
@@ -2570,6 +2588,10 @@ Z7_COMWF_B CDropTarget::Drop(IDataObject *dataObject, DWORD keyState,
     opEffect = GetEffect(keyState, pt, *effect);
     if (m_IsAppTarget)
       cmd = NDragMenu::k_AddToArc;
+    else if (m_Panel && m_IsPanelAddressComboBoxOrBar)
+    {
+      cmd = NDragMenu::k_OpenArc;
+    }
     else if (m_Panel)
     {
       if (IsFsFolderPath())
@@ -2671,6 +2693,12 @@ Z7_COMWF_B CDropTarget::Drop(IDataObject *dataObject, DWORD keyState,
     opEffect = DROPEFFECT_NONE;
     cmdEffect = DROPEFFECT_NONE;
   }
+  else if (cmd == NDragMenu::k_OpenArc)
+  {
+    if (m_SourcePaths.Size() > 0) {
+      m_Panel->BindToPathAndRefresh(m_SourcePaths.Front());
+    }
+  }
   else
   {
     if (m_GetTransfer_WasSuccess)

README.md

@@ -11,3 +11,16 @@ If the artifact gets expired, you may need to manually trigger it again somehow.
 - http://www.e7z.org/
 - https://github.com/glachancecmaisonneuve/Easy7-Zip
 - https://github.com/treysis/Easy-7-Zip-ZS
+
+### DevNote
+
+print message in a dialog
+
+```
+#include <winuser.h>
+#include <strsafe.h>
+
+char a[100] {};
+StringCbPrintfA(a, 100, "index=%u   SoleFolderIndex=%ull", _index, SoleFolderIndex);
+MessageBoxA(0, a, "AAA", MB_ICONERROR);
+```

build.cmd

@@ -128,7 +128,7 @@ IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> errorfile.txt
 popd
 
 powershell -Command Copy-Item .\out\*\*.exe,.\out\*\*.dll,.\out\*\*.pdb,.\out\*\*.sfx -Destination .\out\ -Verbose -Force
-explorer.exe %~dp0out
+rem explorer.exe %~dp0out
 
 rem clear errorlevel
 type nul