]> git.saurik.com Git - wxWidgets.git/blob - src/html/m_list.cpp
lists rendering fixes (second part of patch 911377)
[wxWidgets.git] / src / html / m_list.cpp
1 /////////////////////////////////////////////////////////////////////////////
2 // Name: m_list.cpp
3 // Purpose: wxHtml module for lists
4 // Author: Vaclav Slavik
5 // RCS-ID: $Id$
6 // Copyright: (c) 1999 Vaclav Slavik
7 // Licence: wxWindows Licence
8 /////////////////////////////////////////////////////////////////////////////
9 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
10 #pragma implementation
11 #endif
12
13 #include "wx/wxprec.h"
14
15
16 #include "wx/defs.h"
17 #if wxUSE_HTML && wxUSE_STREAMS
18
19 #ifdef __BORLANDC__
20 #pragma hdrstop
21 #endif
22
23 #ifndef WXPRECOMP
24 #include "wx/brush.h"
25 #include "wx/dc.h"
26 #endif
27
28 #include "wx/html/forcelnk.h"
29 #include "wx/html/m_templ.h"
30
31 #include "wx/html/htmlcell.h"
32
33 FORCE_LINK_ME(m_list)
34
35
36 //-----------------------------------------------------------------------------
37 // wxHtmlListmarkCell
38 //-----------------------------------------------------------------------------
39
40 class wxHtmlListmarkCell : public wxHtmlCell
41 {
42 private:
43 wxBrush m_Brush;
44 public:
45 wxHtmlListmarkCell(wxDC *dc, const wxColour& clr);
46 void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
47 wxHtmlRenderingInfo& info);
48
49 DECLARE_NO_COPY_CLASS(wxHtmlListmarkCell)
50 };
51
52 wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
53 {
54 m_Width = dc->GetCharHeight();
55 m_Height = dc->GetCharHeight();
56 m_Descent = 0;
57 }
58
59
60
61 void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y,
62 int WXUNUSED(view_y1), int WXUNUSED(view_y2),
63 wxHtmlRenderingInfo& WXUNUSED(info))
64 {
65 dc.SetBrush(m_Brush);
66 dc.DrawEllipse(x + m_PosX + m_Width / 3, y + m_PosY + m_Height / 3,
67 (m_Width / 3), (m_Width / 3));
68 }
69
70 //-----------------------------------------------------------------------------
71 // wxHtmlListCell
72 //-----------------------------------------------------------------------------
73
74 struct wxHtmlListItemStruct
75 {
76 wxHtmlContainerCell *mark;
77 wxHtmlContainerCell *cont;
78 int minWidth;
79 int maxWidth;
80 };
81
82 class wxHtmlListCell : public wxHtmlContainerCell
83 {
84 private:
85 wxBrush m_Brush;
86
87 int m_NumRows;
88 wxHtmlListItemStruct *m_RowInfo;
89 void ReallocRows(int rows);
90 void ComputeMinMaxWidths();
91 int m_ListmarkWidth;
92
93 public:
94 wxHtmlListCell(wxHtmlContainerCell *parent);
95 virtual ~wxHtmlListCell();
96 void AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont);
97 virtual void Layout(int w);
98
99 DECLARE_NO_COPY_CLASS(wxHtmlListCell)
100 };
101
102 wxHtmlListCell::wxHtmlListCell(wxHtmlContainerCell *parent) : wxHtmlContainerCell(parent)
103 {
104 m_NumRows = 0;
105 m_RowInfo = 0;
106 m_ListmarkWidth = 0;
107 }
108
109 wxHtmlListCell::~wxHtmlListCell()
110 {
111 if (m_RowInfo) free(m_RowInfo);
112 }
113
114 void wxHtmlListCell::Layout(int w)
115 {
116 wxHtmlCell::Layout(w);
117
118 ComputeMinMaxWidths();
119 m_Width = wxMax(m_Width, wxMin(w, GetMaxTotalWidth()));
120
121 int s_width = m_Width - m_IndentLeft;
122
123 int vpos = 0;
124 for (int r = 0; r < m_NumRows; r++)
125 {
126 m_RowInfo[r].mark->Layout(m_ListmarkWidth);
127 m_RowInfo[r].mark->SetPos(m_IndentLeft, vpos);
128 m_RowInfo[r].cont->Layout(s_width - m_ListmarkWidth);
129 m_RowInfo[r].cont->SetPos(m_IndentLeft + m_ListmarkWidth, vpos);
130 vpos += wxMax(m_RowInfo[r].cont->GetHeight(), m_RowInfo[r].mark->GetHeight());
131 }
132 m_Height = vpos;
133 }
134
135 void wxHtmlListCell::AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont)
136 {
137 ReallocRows(++m_NumRows);
138 m_RowInfo[m_NumRows - 1].mark = mark;
139 m_RowInfo[m_NumRows - 1].cont = cont;
140 }
141
142 void wxHtmlListCell::ReallocRows(int rows)
143 {
144 m_RowInfo = (wxHtmlListItemStruct*) realloc(m_RowInfo, sizeof(wxHtmlListItemStruct) * rows);
145 m_RowInfo[rows - 1].mark = 0;
146 m_RowInfo[rows - 1].cont = 0;
147 m_RowInfo[rows - 1].minWidth = 0;
148 m_RowInfo[rows - 1].maxWidth = 0;
149
150 m_NumRows = rows;
151 }
152
153 void wxHtmlListCell::ComputeMinMaxWidths()
154 {
155 if (m_NumRows == 0) return;
156
157 m_MaxTotalWidth = 0;
158 m_Width = 0;
159
160 for (int r = 0; r < m_NumRows; r++)
161 {
162 wxHtmlListItemStruct& row = m_RowInfo[r];
163 row.mark->Layout(1);
164 row.cont->Layout(1);
165 int maxWidth = row.cont->GetMaxTotalWidth();
166 int width = row.cont->GetWidth();
167 if (row.mark->GetWidth() > m_ListmarkWidth)
168 m_ListmarkWidth = row.mark->GetWidth();
169 if (maxWidth > m_MaxTotalWidth)
170 m_MaxTotalWidth = maxWidth;
171 if (width > m_Width)
172 m_Width = width;
173 }
174 m_Width += m_ListmarkWidth + m_IndentLeft;
175 m_MaxTotalWidth += m_ListmarkWidth + m_IndentLeft;
176 }
177
178 //-----------------------------------------------------------------------------
179 // wxHtmlListcontentCell
180 //-----------------------------------------------------------------------------
181
182 class wxHtmlListcontentCell : public wxHtmlContainerCell
183 {
184 public:
185 wxHtmlListcontentCell(wxHtmlContainerCell *p) : wxHtmlContainerCell(p) {}
186 virtual void Layout(int w) {
187 // Reset top indentation, fixes <li><p>
188 SetIndent(0, wxHTML_INDENT_TOP);
189 wxHtmlContainerCell::Layout(w);
190 }
191 };
192
193 //-----------------------------------------------------------------------------
194 // The list handler:
195 //-----------------------------------------------------------------------------
196
197
198 TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
199
200 TAG_HANDLER_VARS
201 wxHtmlListCell *m_List;
202 int m_Numbering;
203 // this is number of actual item of list or 0 for dots
204
205 TAG_HANDLER_CONSTR(OLULLI)
206 {
207 m_Numbering = 0;
208 }
209
210 TAG_HANDLER_PROC(tag)
211 {
212 wxHtmlContainerCell *c;
213
214 // List Item:
215 if (m_List && tag.GetName() == wxT("LI"))
216 {
217 c = m_WParser->SetContainer(new wxHtmlContainerCell(m_List));
218 c->SetAlignVer(wxHTML_ALIGN_TOP);
219
220 wxHtmlContainerCell *mark = c;
221 c->SetWidthFloat(2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS);
222 if (m_Numbering == 0)
223 {
224 // Centering gives more space after the bullet
225 c->SetAlignHor(wxHTML_ALIGN_CENTER);
226 c->InsertCell(new wxHtmlListmarkCell(m_WParser->GetDC(), m_WParser->GetActualColor()));
227 }
228 else
229 {
230 c->SetAlignHor(wxHTML_ALIGN_RIGHT);
231 wxString mark;
232 mark.Printf(wxT("%i."), m_Numbering);
233 c->InsertCell(new wxHtmlWordCell(mark, *(m_WParser->GetDC())));
234 }
235 m_WParser->CloseContainer();
236
237 c = m_WParser->OpenContainer();
238
239 m_List->AddRow(mark, c);
240 c = m_WParser->OpenContainer();
241 m_WParser->SetContainer(new wxHtmlListcontentCell(c));
242
243 if (m_Numbering != 0) m_Numbering++;
244 }
245
246 // Begin of List (not-numbered): "UL", "OL"
247 else if (tag.GetName() == wxT("UL") || tag.GetName() == wxT("OL"))
248 {
249 int oldnum = m_Numbering;
250
251 if (tag.GetName() == wxT("UL")) m_Numbering = 0;
252 else m_Numbering = 1;
253
254 wxHtmlContainerCell *oldcont;
255 oldcont = c = m_WParser->OpenContainer();
256
257 wxHtmlListCell *oldList = m_List;
258 m_List = new wxHtmlListCell(c);
259 m_List->SetIndent(2 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);
260
261 ParseInner(tag);
262
263 m_WParser->SetContainer(oldcont);
264 m_WParser->CloseContainer();
265
266 m_Numbering = oldnum;
267 m_List = oldList;
268 return TRUE;
269 }
270 return false;
271
272 }
273
274 TAG_HANDLER_END(OLULLI)
275
276
277 TAGS_MODULE_BEGIN(List)
278
279 TAGS_MODULE_ADD(OLULLI)
280
281 TAGS_MODULE_END(List)
282
283 #endif