X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a2e4f4afa72e4d0df325d4cf742fa1bab16456d..8981608c698da2cb217b6cdeffad77011a99bf7c:/src/html/m_list.cpp

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index e441b0ebd1..97864acc7c 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -6,13 +6,9 @@
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
 
 #include "wx/wxprec.h"
 
-
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
@@ -53,7 +49,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 +85,7 @@ class wxHtmlListCell : public wxHtmlContainerCell
         wxHtmlListItemStruct *m_RowInfo;
         void ReallocRows(int rows);
         void ComputeMinMaxWidths();
+        int ComputeMaxBase(wxHtmlCell *cell);
         int m_ListmarkWidth;
 
     public:
@@ -111,6 +109,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 +138,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 +166,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;
 
@@ -229,9 +253,9 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
             else
             {
                 c->SetAlignHor(wxHTML_ALIGN_RIGHT);
-                wxString mark;
-                mark.Printf(wxT("%i."), m_Numbering);
-                c->InsertCell(new wxHtmlWordCell(mark, *(m_WParser->GetDC())));
+                wxString markStr;
+                markStr.Printf(wxT("%i. "), m_Numbering);
+                c->InsertCell(new wxHtmlWordCell(markStr, *(m_WParser->GetDC())));
             }
             m_WParser->CloseContainer();