Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use too big width for wxHtmlHelpWindow navigation panel.

Browse Source 
The width of the navigation panel in wxHtmlHelpWindow could become arbitrarily
high if long items used. Avoid this by using a reasonably large but not too
big minimal width instead of determining it automatically from the items width.

Closes #13754.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-04-28 22:24:47 +00:00
parent 49b489e80f
commit a55602fafa
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/html/helpwnd.cpp
View File

@@ -60,6 +60,11 @@
// what is considered "small index"? // what is considered "small index"?
#define INDEX_IS_SMALL 1000 #define INDEX_IS_SMALL 1000
// minimum width for content tree and index
// (we cannot let minimum size be determined from content, else long titles
// make the help frame unusable)
const wxCoord CONTENT_TREE_INDEX_MIN_WIDTH = 150;
/* Motif defines this as a macro */ /* Motif defines this as a macro */
#ifdef Below #ifdef Below
#undef Below #undef Below
@@ -1033,6 +1038,9 @@ void wxHtmlHelpWindow::CreateContents()
imaged[it->level] = true; imaged[it->level] = true;
} }
} }
m_ContentsBox->SetMinSize(wxSize(CONTENT_TREE_INDEX_MIN_WIDTH,
m_ContentsBox->GetMinHeight()));
} }
void wxHtmlHelpWindow::CreateIndex() void wxHtmlHelpWindow::CreateIndex()
@@ -1056,6 +1064,9 @@ void wxHtmlHelpWindow::CreateIndex()
for (size_t i = 0; i < cnt; i++) for (size_t i = 0; i < cnt; i++)
m_IndexList->Append((*m_mergedIndex)[i].name, m_IndexList->Append((*m_mergedIndex)[i].name,
(char*)(&(*m_mergedIndex)[i])); (char*)(&(*m_mergedIndex)[i]));
m_IndexList->SetMinSize(wxSize(CONTENT_TREE_INDEX_MIN_WIDTH,
m_IndexList->GetMinHeight()));
} }
void wxHtmlHelpWindow::CreateSearch() void wxHtmlHelpWindow::CreateSearch()