tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 07:15:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add the document size column to the Windows Selection dialog

Browse Source 
Close #7905, close #7971
This commit is contained in:
eljefe7000 2020-02-23 09:56:06 -05:00 committed by Don HO
parent e9b0cfedfd
commit b9af79f86c
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
View File

@ -156,7 +156,7 @@ struct BufferEquivalent
bool compare(int i1, int i2) const bool compare(int i1, int i2) const
{ {
if (_iColumn >= 0 && _iColumn <= 2) if (_iColumn >= 0 && _iColumn <= 3)
{ {
BufferID bid1 = _pTab->getBufferByIndex(i1); BufferID bid1 = _pTab->getBufferByIndex(i1);
BufferID bid2 = _pTab->getBufferByIndex(i2); BufferID bid2 = _pTab->getBufferByIndex(i2);
@ -369,6 +369,16 @@ INT_PTR CALLBACK WindowsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPa
generic_strncpy(pLvdi->item.pszText, lang->getLangName(), len-1); generic_strncpy(pLvdi->item.pszText, lang->getLangName(), len-1);
} }
} }
else if (pLvdi->item.iSubItem == 3) // size
{
int docSize = buf->docLength();
string docSizeText = to_string(docSize);
wstring wstr = wstring(docSizeText.begin(), docSizeText.end());
const wchar_t * wstrp = wstr.c_str();
int docSizeTextLen = lstrlen(wstrp);
generic_strncpy(pLvdi->item.pszText, wstrp, docSizeTextLen);
pLvdi->item.pszText[docSizeTextLen] = 0;
}
} }
return TRUE; return TRUE;
} }
@ -521,6 +531,11 @@ BOOL WindowsDlg::onInitDialog()
lvColumn.cx = 50; lvColumn.cx = 50;
SendMessage(_hList, LVM_INSERTCOLUMN, 2, LPARAM(&lvColumn)); SendMessage(_hList, LVM_INSERTCOLUMN, 2, LPARAM(&lvColumn));
columnText = TEXT("\u21F5 ") + pNativeSpeaker->getAttrNameStr(TEXT("Size"), WD_ROOTNODE, WD_CLMNNAME);
lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str());
lvColumn.cx = 60;
SendMessage(_hList, LVM_INSERTCOLUMN, 3, LPARAM(&lvColumn));
fitColumnsToSize(); fitColumnsToSize();
if (_lastKnownLocation.bottom > 0 && _lastKnownLocation.right > 0) if (_lastKnownLocation.bottom > 0 && _lastKnownLocation.right > 0)
@ -598,6 +613,23 @@ void WindowsDlg::updateColumnNames()
lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str()); lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str());
lvColumn.cx = static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 2, 0)); lvColumn.cx = static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 2, 0));
SendMessage(_hList, LVM_SETCOLUMN, 2, LPARAM(&lvColumn)); SendMessage(_hList, LVM_SETCOLUMN, 2, LPARAM(&lvColumn));
columnText = pNativeSpeaker->getAttrNameStr(TEXT("Size"), WD_ROOTNODE, WD_CLMNTYPE);
if (_currentColumn != 3)
{
columnText = TEXT("\u21F5 ") + columnText;
}
else if (_reverseSort)
{
columnText = TEXT("\u25B3 ") + columnText;
}
else
{
columnText = TEXT("\u25BD ") + columnText;
}
lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str());
lvColumn.cx = static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 3, 0));
SendMessage(_hList, LVM_SETCOLUMN, 3, LPARAM(&lvColumn));
} }
void WindowsDlg::onSize(UINT nType, int cx, int cy) void WindowsDlg::onSize(UINT nType, int cx, int cy)
@ -674,6 +706,7 @@ void WindowsDlg::fitColumnsToSize()
int len = (rc.right - rc.left); int len = (rc.right - rc.left);
len -= static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 0, 0)); len -= static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 0, 0));
len -= static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 2, 0)); len -= static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 2, 0));
len -= static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 3, 0));
len -= GetSystemMetrics(SM_CXVSCROLL); len -= GetSystemMetrics(SM_CXVSCROLL);
len -= 1; len -= 1;
SendMessage(_hList, LVM_SETCOLUMNWIDTH, 1, len); SendMessage(_hList, LVM_SETCOLUMNWIDTH, 1, len);