xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-13 04:11:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: go on cancel folder priority over file in comparison

Browse Source
This commit is contained in:
shunf4
2024-05-11 16:06:57 +08:00
parent 91f7e0cc57
commit 6b64d12e4e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CPP/7zip/UI/FileManager/BrowseDialog.cpp
View File

@@ -487,10 +487,10 @@ int CBrowseDialog::CompareItems(LPARAM lParam1, LPARAM lParam2)
const CFileInfo &f1 = _files[(int)lParam1]; const CFileInfo &f1 = _files[(int)lParam1];
const CFileInfo &f2 = _files[(int)lParam2]; const CFileInfo &f2 = _files[(int)lParam2];
bool isDir1 = f1.IsDir(); // bool isDir1 = f1.IsDir();
bool isDir2 = f2.IsDir(); // bool isDir2 = f2.IsDir();
if (isDir1 && !isDir2) return -1; // if (isDir1 && !isDir2) return -1;
if (isDir2 && !isDir1) return 1; // if (isDir2 && !isDir1) return 1;
int res = 0; int res = 0;
switch (_sortIndex) switch (_sortIndex)

4
CPP/7zip/UI/FileManager/PanelSort.cpp
View File

@@ -191,8 +191,8 @@ int CALLBACK CompareItems(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
CPanel *panel = (CPanel*)lpData; CPanel *panel = (CPanel*)lpData;
bool isDir1 = panel->IsItem_Folder((int)lParam1); // bool isDir1 = panel->IsItem_Folder((int)lParam1);
bool isDir2 = panel->IsItem_Folder((int)lParam2); // bool isDir2 = panel->IsItem_Folder((int)lParam2);
// if (isDir1 && !isDir2) return -1; // if (isDir1 && !isDir2) return -1;
// if (isDir2 && !isDir1) return 1; // if (isDir2 && !isDir1) return 1;