X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf7d7ee7062f7f6028df40e43745235658e38b4d..a0cb0ba509fad1fb966d4d5277ff28071d7a8477:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 473eeca600..909584da20 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -47,7 +47,7 @@ wxHtmlCell::wxHtmlCell() : wxObject() wxHtmlCell::~wxHtmlCell() { - if (m_Link) delete m_Link; + delete m_Link; } @@ -60,8 +60,9 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, wxHtmlLinkInfo lnk2(*lnk); lnk2.SetEvent(&event); lnk2.SetHtmlCell(this); - ((wxHtmlWindow*)parent)->OnLinkClicked(lnk2); - // note : this overcasting is legal because parent is *always* wxHtmlWindow + + // note : this cast is legal because parent is *always* wxHtmlWindow + wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2); } } @@ -71,12 +72,12 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const { if ((!m_CanLiveOnPagebreak) && m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) - { + { *pagebreak = m_PosY; return TRUE; } - else - return FALSE; + + return FALSE; } @@ -91,18 +92,37 @@ void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link) -void wxHtmlCell::Layout(int w) +void wxHtmlCell::Layout(int WXUNUSED(w)) { SetPos(0, 0); } -const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const + +void wxHtmlCell::GetHorizontalConstraints(int *left, int *right) const +{ + if (left) + *left = m_PosX; + if (right) + *right = m_PosX + m_Width; +} + + + +const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const { return NULL; } +wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y) const +{ + if ( x >= 0 && x < m_Width && y >= 0 && y < m_Height ) + return wxConstCast(this, wxHtmlCell); + + return NULL; +} + //----------------------------------------------------------------------------- // wxHtmlWordCell @@ -117,7 +137,7 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell() -void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2)) { dc.DrawText(m_Word, x + m_PosX, y + m_PosY); } @@ -147,10 +167,12 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe wxHtmlContainerCell::~wxHtmlContainerCell() { - if (m_Cells) + wxHtmlCell *cell = m_Cells; + while ( cell ) { - for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) - delete cell; + wxHtmlCell *cellNext = cell->GetNext(); + delete cell; + cell = cellNext; } } @@ -205,12 +227,12 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const int pbrk = *pagebreak - m_PosY; while (c) - { - if (c->AdjustPagebreak(&pbrk)) + { + if (c->AdjustPagebreak(&pbrk)) rt = TRUE; c = c->GetNext(); } - if (rt) + if (rt) *pagebreak = pbrk + m_PosY; return rt; } @@ -220,10 +242,22 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const void wxHtmlContainerCell::Layout(int w) { - if (m_LastLayout == w) + wxHtmlCell::Layout(w); + + if (m_LastLayout == w) return; + + // VS: Any attempt to layout with negative or zero width leads to hell, + // but we can't ignore such attempts completely, since it sometimes + // happen (e.g. when trying how small a table can be). The best thing we + // can do is to set the width of child cells to zero + if (w < 1) { - wxHtmlCell::Layout(w); - return; + m_Width = 0; + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) + cell->Layout(0); + // this does two things: it recursively calls this code on all child + // contrainers and resets children's position to (0,0) + return; } wxHtmlCell *cell = m_Cells, *line = m_Cells; @@ -274,7 +308,7 @@ void wxHtmlContainerCell::Layout(int w) while (cell != NULL) { switch (m_AlignVer) - { + { case wxHTML_ALIGN_TOP : ybasicpos = 0; break; case wxHTML_ALIGN_BOTTOM : ybasicpos = - cell->GetHeight(); break; case wxHTML_ALIGN_CENTER : ybasicpos = - cell->GetHeight() / 2; break; @@ -291,7 +325,7 @@ void wxHtmlContainerCell::Layout(int w) // force new line if occured: if ((cell == NULL) || (xpos + cell->GetWidth() > s_width)) - { + { if (xpos > MaxLineWidth) MaxLineWidth = xpos; if (ysizeup < 0) ysizeup = 0; if (ysizedown < 0) ysizedown = 0; @@ -314,7 +348,7 @@ void wxHtmlContainerCell::Layout(int w) if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL) while (line != cell) - { + { line->SetPos(line->GetPosX() + xdelta, ypos + line->GetPosY()); line = line->GetNext(); @@ -326,7 +360,7 @@ void wxHtmlContainerCell::Layout(int w) if (step < 0) step = 0; xcnt--; if (xcnt > 0) while (line != cell) - { + { line->SetPos(line->GetPosX() + s_indent + (counter++ * step / xcnt), ypos + line->GetPosY()); @@ -348,12 +382,12 @@ void wxHtmlContainerCell::Layout(int w) if (m_Height < m_MinHeight) { if (m_MinHeightAlign != wxHTML_ALIGN_TOP) - { + { int diff = m_MinHeight - m_Height; if (m_MinHeightAlign == wxHTML_ALIGN_CENTER) diff /= 2; cell = m_Cells; while (cell) - { + { cell->SetPos(cell->GetPosX(), cell->GetPosY() + diff); cell = cell->GetNext(); } @@ -365,8 +399,6 @@ void wxHtmlContainerCell::Layout(int w) if (m_Width < MaxLineWidth) m_Width = MaxLineWidth; m_LastLayout = w; - - wxHtmlCell::Layout(w); } @@ -380,7 +412,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) { if (m_UseBkColour) - { + { wxBrush myb = wxBrush(m_BkColour, wxSOLID); int real_y1 = mMax(y + m_PosY, view_y1); @@ -392,7 +424,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) } if (m_UseBorder) - { + { wxPen mypen1(m_BorderColour1, 1, wxSOLID); wxPen mypen2(m_BorderColour2, 1, wxSOLID); @@ -404,7 +436,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1); } - if (m_Cells) + if (m_Cells) { for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) cell->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2); @@ -413,7 +445,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) // container invisible, just proceed font+color changing: else { - if (m_Cells) + if (m_Cells) { for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) cell->DrawInvisible(dc, x + m_PosX, y + m_PosY); @@ -425,7 +457,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y) { - if (m_Cells) + if (m_Cells) { for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) cell->DrawInvisible(dc, x + m_PosX, y + m_PosY); @@ -436,18 +468,12 @@ void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y) wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const { - wxHtmlCell *c = m_Cells; - int cx, cy, cw, ch; + wxHtmlCell *cell = FindCellByPos(x, y); - while (c) - { - cx = c->GetPosX(), cy = c->GetPosY(); - cw = c->GetWidth(), ch = c->GetHeight(); - if ((x >= cx) && (x < cx + cw) && (y >= cy) && (y < cy + ch)) - return c->GetLink(x - cx, y - cy); - c = c->GetNext(); - } - return NULL; + // VZ: I don't know if we should pass absolute or relative coords to + // wxHtmlCell::GetLink()? As the base class version just ignores them + // anyhow, it hardly matters right now but should still be clarified + return cell ? cell->GetLink(x, y) : NULL; } @@ -495,12 +521,12 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale wxString wd = tag.GetParam(wxT("WIDTH")); if (wd[wd.Length()-1] == wxT('%')) - { + { wxSscanf(wd.c_str(), wxT("%i%%"), &wdi); SetWidthFloat(wdi, wxHTML_UNITS_PERCENT); } else - { + { wxSscanf(wd.c_str(), wxT("%i"), &wdi); SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS); } @@ -513,7 +539,7 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) const { if (m_Cells) - { + { const wxHtmlCell *r = NULL; for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) @@ -526,25 +552,54 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co } +wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y) const +{ + for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() ) + { + int cx = cell->GetPosX(), + cy = cell->GetPosY(); + + if ( (cx <= x) && (cx + cell->GetWidth() > x) && + (cy <= y) && (cy + cell->GetHeight() > y) ) + { + return cell->FindCellByPos(x - cx, y - cy); + } + } + + return NULL; +} + void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event) { - if (m_Cells) + wxHtmlCell *cell = FindCellByPos(x, y); + if ( cell ) + cell->OnMouseClick(parent, x, y, event); +} + + + +void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const +{ + int cleft = m_PosX + m_Width, cright = m_PosX; // worst case + int l, r; + + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) { - wxHtmlCell *c = m_Cells; - while (c) - { - if ( (c->GetPosX() <= x) && - (c->GetPosY() <= y) && - (c->GetPosX() + c->GetWidth() > x) && - (c->GetPosY() + c->GetHeight() > y)) - { - c->OnMouseClick(parent, x - c->GetPosX(), y - c->GetPosY(), event); - break; - } - c = c->GetNext(); - } + cell->GetHorizontalConstraints(&l, &r); + if (l < cleft) + cleft = l; + if (r > cright) + cright = r; } + + cleft -= (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; + cright += (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight; + + if (left) + *left = cleft; + if (right) + *right = cright; } @@ -555,7 +610,7 @@ void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxM // wxHtmlColourCell //-------------------------------------------------------------------------------- -void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlColourCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2)) { if (m_Flags & wxHTML_CLR_FOREGROUND) dc.SetTextForeground(m_Colour); @@ -566,7 +621,7 @@ void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) } } -void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y) +void wxHtmlColourCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y)) { if (m_Flags & wxHTML_CLR_FOREGROUND) dc.SetTextForeground(m_Colour); @@ -584,12 +639,12 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y) // wxHtmlFontCell //-------------------------------------------------------------------------------- -void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlFontCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2)) { dc.SetFont(m_Font); } -void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y) +void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y)) { dc.SetFont(m_Font); } @@ -615,7 +670,7 @@ wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w) } -void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2)) { int absx = 0, absy = 0, stx, sty; wxHtmlCell *c = this; @@ -633,7 +688,7 @@ void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) -void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y) +void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y)) { int absx = 0, absy = 0, stx, sty; wxHtmlCell *c = this;