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

Fixed wrong positioning of marks and enumerations in lists of wxHTML.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-13 20:51:23 +00:00
parent c40aba837b
commit 8da2fe8b42
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -13,6 +13,7 @@ All (GUI):
- Fixed potential infinite loop when adjusting wxScrolledWindow scrollbars.
- Radio in menus do not send menu event for selections of already selected item.
- Fixed wrong positioning of marks and enumerations in lists of wxHTML.
wxMSW:

40
src/html/m_list.cpp
View File

@@ -53,7 +53,8 @@ wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCe
{
m_Width = dc->GetCharHeight();
m_Height = dc->GetCharHeight();
m_Descent = 0;
// bottom of list mark is lined with bottom of letters in next cell
m_Descent = m_Height / 3;
}
@@ -88,6 +89,7 @@ class wxHtmlListCell : public wxHtmlContainerCell
wxHtmlListItemStruct *m_RowInfo;
void ReallocRows(int rows);
void ComputeMinMaxWidths();
int ComputeMaxBase(wxHtmlCell *cell);
int m_ListmarkWidth;
public:
@@ -111,6 +113,23 @@ wxHtmlListCell::~wxHtmlListCell()
if (m_RowInfo) free(m_RowInfo);
}
int wxHtmlListCell::ComputeMaxBase(wxHtmlCell *cell)
{
if(!cell)
return 0;
wxHtmlCell *child = cell->GetFirstChild();
while(child)
{
int base = ComputeMaxBase( child );
if ( base > 0 ) return base + child->GetPosY();
child = child->GetNext();
}
return cell->GetHeight() - cell->GetDescent();
}
void wxHtmlListCell::Layout(int w)
{
wxHtmlCell::Layout(w);
@@ -123,11 +142,20 @@ void wxHtmlListCell::Layout(int w)
int vpos = 0;
for (int r = 0; r < m_NumRows; r++)
{
// do layout first time to layout contents and adjust pos
m_RowInfo[r].mark->Layout(m_ListmarkWidth);
m_RowInfo[r].mark->SetPos(m_IndentLeft, vpos);
m_RowInfo[r].cont->Layout(s_width - m_ListmarkWidth);
m_RowInfo[r].cont->SetPos(m_IndentLeft + m_ListmarkWidth, vpos);
vpos += wxMax(m_RowInfo[r].cont->GetHeight(), m_RowInfo[r].mark->GetHeight());
const int base_mark = ComputeMaxBase( m_RowInfo[r].mark );
const int base_cont = ComputeMaxBase( m_RowInfo[r].cont );
const int adjust_mark = vpos + wxMax(base_cont-base_mark,0);
const int adjust_cont = vpos + wxMax(base_mark-base_cont,0);
m_RowInfo[r].mark->SetPos(m_IndentLeft, adjust_mark);
m_RowInfo[r].cont->SetPos(m_IndentLeft + m_ListmarkWidth, adjust_cont);
vpos = wxMax(adjust_mark + m_RowInfo[r].mark->GetHeight(),
adjust_cont + m_RowInfo[r].cont->GetHeight());
}
m_Height = vpos;
}
@@ -142,8 +170,8 @@ void wxHtmlListCell::AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont
void wxHtmlListCell::ReallocRows(int rows)
{
m_RowInfo = (wxHtmlListItemStruct*) realloc(m_RowInfo, sizeof(wxHtmlListItemStruct) * rows);
m_RowInfo[rows - 1].mark = 0;
m_RowInfo[rows - 1].cont = 0;
m_RowInfo[rows - 1].mark = NULL;
m_RowInfo[rows - 1].cont = NULL;
m_RowInfo[rows - 1].minWidth = 0;
m_RowInfo[rows - 1].maxWidth = 0;