Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

MGR: Continue work on Simple View to display the description if task has no slide show 

svn path=/trunk/boinc/; revision=24687
This commit is contained in:
Charlie Fenton 2011-11-30 03:15:07 +00:00
parent cd5878f5f8
commit 15e26b1bca
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientgui/sg_TaskPanel.cpp
View File

@ -75,10 +75,15 @@ void CScrolledTextBox::SetValue(const wxString& s) {
int lineHeight, visibleHeight, totalLines, visibleLines; int lineHeight, visibleHeight, totalLines, visibleLines;
wxString t = s; wxString t = s;
Fit();
if (!m_iAvailableWidth) { if (!m_iAvailableWidth) {
#ifdef __WXMAC__
m_TextSizer->Fit(this);
GetSize(&m_iAvailableWidth, &visibleHeight);
#else
Fit();
GetSize(&m_iAvailableWidth, &visibleHeight); GetSize(&m_iAvailableWidth, &visibleHeight);
m_iAvailableWidth -= 20; m_iAvailableWidth -= 20;
#endif
} }
// Delete sizer & its children (CTransparentStaticText objects) // Delete sizer & its children (CTransparentStaticText objects)
@ -91,6 +96,7 @@ void CScrolledTextBox::SetValue(const wxString& s) {
lineHeight = Wrap(t, m_iAvailableWidth, &totalLines); lineHeight = Wrap(t, m_iAvailableWidth, &totalLines);
visibleLines = visibleHeight / lineHeight; visibleLines = visibleHeight / lineHeight;
m_TextSizer->FitInside(this);
Enable(); Enable();
// SetScrollRate(1, lineHeight); // SetScrollRate(1, lineHeight);
// SetScrollbar(wxVERTICAL, 0, visibleLines, totalLines); // SetScrollbar(wxVERTICAL, 0, visibleLines, totalLines);