From 45ecc3e4c4aeefd27b846c83d9765cae07a9bc09 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Thu, 20 Oct 2011 12:16:48 +0000 Subject: [PATCH] MGR: Force update of Task Selection List on reskin interface svn path=/trunk/boinc/; revision=24442 --- checkin_notes | 7 ++++++- clientgui/sg_TaskPanel.cpp | 7 ++++--- clientgui/sg_TaskPanel.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/checkin_notes b/checkin_notes index 879b932d82..97f35ef006 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7554,4 +7554,9 @@ Charlie 20 Oct 2011 Green_dot.png (added) Red_dot.png (added) Yellow_dot.png (added) - + +Charlie 20 Oct 2011 + - MGR: Force update of Task Selection List on reskin interface. + + clientgui/ + sg_TaskPanel.cpp,h diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp index 1ee087641e..45fbb94eb8 100755 --- a/clientgui/sg_TaskPanel.cpp +++ b/clientgui/sg_TaskPanel.cpp @@ -418,7 +418,7 @@ void CSimpleTaskPanel::Update(bool delayShow) { this->Layout(); } - UpdateTaskSelectionList(); + UpdateTaskSelectionList(false); // We now have valid result pointers, so extract our data int count = m_TaskSelectionCtrl->GetCount(); @@ -494,6 +494,7 @@ void CSimpleTaskPanel::Update(bool delayShow) { void CSimpleTaskPanel::ReskinInterface() { CSimplePanelBase::ReskinInterface(); m_SlideShowArea->AdvanceSlideShow(false); + UpdateTaskSelectionList(true); } @@ -682,7 +683,7 @@ void CSimpleTaskPanel::FindSlideShowFiles(TaskSelectionData *selData) { } -void CSimpleTaskPanel::UpdateTaskSelectionList() { +void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) { int i, j, count, newColor; TaskSelectionData *selData; RESULT* result; @@ -787,7 +788,7 @@ void CSimpleTaskPanel::UpdateTaskSelectionList() { newColor = redDot; } - if (newColor != selData->dotColor) { + if (reskin || (newColor != selData->dotColor)) { switch (newColor) { case greenDot: m_TaskSelectionCtrl->SetItemBitmap(j, *pSkinSimple->GetWorkunitRunningImage()->GetBitmap()); diff --git a/clientgui/sg_TaskPanel.h b/clientgui/sg_TaskPanel.h index 8200492a5f..097952c91f 100755 --- a/clientgui/sg_TaskPanel.h +++ b/clientgui/sg_TaskPanel.h @@ -98,7 +98,7 @@ class CSimpleTaskPanel : public CSimplePanelBase wxString GetStatusString(RESULT* result); wxString FormatTime(float fBuffer); void FindSlideShowFiles(TaskSelectionData *selData); - void UpdateTaskSelectionList(); + void UpdateTaskSelectionList(bool reskin); bool isRunning(RESULT* result); bool DownloadingResults(); bool Suspended();