enlarged <UL> bullets a bit and nuked this weirdness

about using rectangles where the rest of the world uses circles...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2002-06-28 22:34:11 +00:00
parent 3709456403
commit ee66bc1fac

View File

@ -48,7 +48,7 @@ class wxHtmlListmarkCell : public wxHtmlCell
wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID) wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
{ {
m_Width = dc->GetCharWidth(); m_Width = dc->GetCharHeight();
m_Height = dc->GetCharHeight(); m_Height = dc->GetCharHeight();
m_Descent = 0; m_Descent = 0;
} }
@ -58,12 +58,8 @@ wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCe
void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2)) void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
{ {
dc.SetBrush(m_Brush); dc.SetBrush(m_Brush);
//dc.DrawEllipse(x + m_PosX + m_Width / 4, y + m_PosY + m_Height / 4, m_Width / 2, m_Width / 2); dc.DrawEllipse(x + m_PosX + m_Width / 3, y + m_PosY + m_Height / 3,
// This looks better IMHO (JACS) -- I tried to get ellipses/circles working but they can (m_Width / 3), (m_Width / 3));
// just look terrible, at least on Windows. TODO: maybe have configurable bullets,
// possibly with the app supplying bitmaps.
int size = (int) ((m_Width / 2.0) + 0.5);
dc.DrawRectangle(x + m_PosX + (m_Width - size)/2, y + m_PosY + (m_Height - size)/ 2, size, size);
} }