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

15.11

Browse Source
This commit is contained in:
Igor Pavlov
2015-11-19 00:00:00 +00:00
committed by Kornel Lesiński
parent 7c8a265a15
commit e24f7fba53
70 changed files with 701 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,9 +83,9 @@ static inline const wchar_t *GetExtensionPtr(const UString &name)
void CPanel::SetSortRawStatus()
{
_isRawSortProp = false;
FOR_VECTOR (i, _properties)
FOR_VECTOR (i, _columns)
{
const CItemProperty &prop = _properties[i];
const CPropColumn &prop = _columns[i];
if (prop.ID == _sortID)
{
_isRawSortProp = prop.IsRawProp ? 1 : 0;
@@ -169,7 +169,7 @@ int CALLBACK CompareItems2(LPARAM lParam1, LPARAM lParam2, LPARAM lpData)
return ::CompareFileTime(&file1.MTime, &file2.MTime);
*/
// PROPID propID = panel->_properties[panel->_sortIndex].ID;
// PROPID propID = panel->_columns[panel->_sortIndex].ID;
NCOM::CPropVariant prop1, prop2;
// Name must be first property
@@ -215,7 +215,7 @@ void CPanel::SortItems(int index)
{
_sortIndex = index;
_ascending = true;
switch (_properties[_sortIndex].ID)
switch (_columns[_sortIndex].ID)
{
case kpidSize:
case kpidPackedSize:
@@ -229,13 +229,15 @@ void CPanel::SortItems(int index)
_listView.SortItems(CompareItems, (LPARAM)this);
_listView.EnsureVisible(_listView.GetFocusedItem(), false);
}
void CPanel::SortItemsWithPropID(PROPID propID)
{
int index = _properties.FindItemWithID(propID);
int index = _columns.FindItem_for_PropID(propID);
if (index >= 0)
SortItems(index);
}
*/
void CPanel::SortItemsWithPropID(PROPID propID)
{
if (propID == _sortID)
@@ -264,8 +266,8 @@ void CPanel::SortItemsWithPropID(PROPID propID)
void CPanel::OnColumnClick(LPNMLISTVIEW info)
{
/*
int index = _properties.FindItemWithID(_visibleProperties[info->iSubItem].ID);
int index = _columns.FindItem_for_PropID(_visibleColumns[info->iSubItem].ID);
SortItems(index);
*/
SortItemsWithPropID(_visibleProperties[info->iSubItem].ID);
SortItemsWithPropID(_visibleColumns[info->iSubItem].ID);
}