From 5c5a168468f81bc6016026aa36772f1e497e3372 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Wed, 20 Aug 2003 16:24:57 +0000 Subject: [PATCH] PATCH: [ 791924 ] Fix sorting when columns are reordered --- Src/DirView.cpp | 5 +++-- Src/readme.txt | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Src/DirView.cpp b/Src/DirView.cpp index fe8fd3fb4..fb7f5f0f9 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -437,13 +437,14 @@ void CDirView::OnColumnClick(NMHDR *pNMHDR, LRESULT *pResult) { // set sort parameters and handle ascending/descending NM_LISTVIEW* pNMListView = (NM_LISTVIEW*) pNMHDR; - if(pNMListView->iSubItem==m_sortColumn) + int sortcol = m_invcolorder[pNMListView->iSubItem]; + if (sortcol==m_sortColumn) { m_bSortAscending = !m_bSortAscending; } else { - m_sortColumn = pNMListView->iSubItem; + m_sortColumn = sortcol; // date columns get default descending sort. if(m_sortColumn==DV_LTIME || m_sortColumn==DV_RTIME) { diff --git a/Src/readme.txt b/Src/readme.txt index a0b2bc9f4..a13cde3fe 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2003-08-20 Perry + PATCH: [ 791924 ] Fix sorting when columns are reordered + WinMerge: DirView.cpp + 2003-08-20 Kimmo PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?) WinMerge: Merge.dsp OpenDlg.cpp -- 2.11.0