Commit 40398cec authored by Charlie Fenton's avatar Charlie Fenton
Browse files

MGR: fix a bug which made it difficult to select items when certain key fields...

MGR: fix a bug which made it difficult to select items when certain key fields are hidden (selection would always jump to item in top row)
parent 2c6aa097
......@@ -355,6 +355,15 @@ wxString CViewProjects::GetKeyValue1(int iRowIndex) {
return wxEmptyString;
}
if (m_iColumnIDToColumnIndex[COLUMN_PROJECT] < 0) {
// Column is hidden, so SynchronizeCacheItem() did not set its value
wxString strDocumentText = wxEmptyString;
GetDocProjectURL(m_iSortedIndexes[iRowIndex], strDocumentText);
if (!strDocumentText.IsSameAs(project->m_strProjectURL)) {
project->m_strProjectURL = strDocumentText;
}
}
return project->m_strProjectURL;
}
......
......@@ -314,6 +314,15 @@ wxString CViewTransfers::GetKeyValue1(int iRowIndex) {
return wxEmptyString;
}
if (m_iColumnIDToColumnIndex[COLUMN_FILE] < 0) {
// Column is hidden, so SynchronizeCacheItem() did not set its value
wxString strDocumentText = wxEmptyString;
GetDocFileName(m_iSortedIndexes[iRowIndex], strDocumentText);
if (!strDocumentText.IsSameAs(transfer->m_strFileName)) {
transfer->m_strFileName = strDocumentText;
}
}
return transfer->m_strFileName;
}
......@@ -325,6 +334,15 @@ wxString CViewTransfers::GetKeyValue2(int iRowIndex) {
return wxEmptyString;
}
if (m_iColumnIDToColumnIndex[COLUMN_PROJECT] < 0) {
// Column is hidden, so SynchronizeCacheItem() did not set its value
wxString strDocumentText = wxEmptyString;
GetDocProjectURL(m_iSortedIndexes[iRowIndex], strDocumentText);
if (!strDocumentText.IsSameAs(transfer->m_strProjectURL)) {
transfer->m_strProjectURL = strDocumentText;
}
}
return transfer->m_strProjectURL;
}
......
......@@ -370,6 +370,15 @@ wxString CViewWork::GetKeyValue1(int iRowIndex) {
return wxEmptyString;
}
if (m_iColumnIDToColumnIndex[COLUMN_NAME] < 0) {
// Column is hidden, so SynchronizeCacheItem() did not set its value
wxString strDocumentText = wxEmptyString;
GetDocName(m_iSortedIndexes[iRowIndex], strDocumentText);
if (!strDocumentText.IsSameAs(work->m_strName)) {
work->m_strName = strDocumentText;
}
}
return work->m_strName;
}
......@@ -381,6 +390,15 @@ wxString CViewWork::GetKeyValue2(int iRowIndex) {
return wxEmptyString;
}
if (m_iColumnIDToColumnIndex[COLUMN_PROJECT] < 0) {
// Column is hidden, so SynchronizeCacheItem() did not set its value
wxString strDocumentText = wxEmptyString;
GetDocProjectURL(m_iSortedIndexes[iRowIndex], strDocumentText);
if (!strDocumentText.IsSameAs(work->m_strProjectURL)) {
work->m_strProjectURL = strDocumentText;
}
}
return work->m_strProjectURL;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment