X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index a661db2cc5..9ae76f328e 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -2,7 +2,6 @@ // Name: src/html/htmlcell.cpp // Purpose: wxHtmlCell - basic element of HTML output // Author: Vaclav Slavik -// RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -196,20 +195,34 @@ wxCursor wxHtmlCell::GetCursor() const } #endif // WXWIN_COMPATIBILITY_2_6 -wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const +wxCursor +wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface* WXUNUSED(window)) const +{ + // This is never called directly, only from GetMouseCursorAt() and we + // return an invalid cursor by default to let it delegate to the window. + return wxNullCursor; +} + +wxCursor +wxHtmlCell::GetMouseCursorAt(wxHtmlWindowInterface *window, + const wxPoint& relPos) const { #if WXWIN_COMPATIBILITY_2_6 // NB: Older versions of wx used GetCursor() virtual method in place of // GetMouseCursor(interface). This code ensures that user code that - // overriden GetCursor() continues to work. The trick is that the base + // overridden GetCursor() continues to work. The trick is that the base // wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we - // know that GetCursor() was overriden iff it returns valid cursor. + // know that GetCursor() was overridden iff it returns valid cursor. wxCursor cur = GetCursor(); - if (cur.Ok()) + if (cur.IsOk()) return cur; #endif // WXWIN_COMPATIBILITY_2_6 - if ( GetLink() ) + const wxCursor curCell = GetMouseCursor(window); + if ( curCell.IsOk() ) + return curCell; + + if ( GetLink(relPos.x, relPos.y) ) { return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Link); } @@ -220,11 +233,16 @@ wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const } -bool wxHtmlCell::AdjustPagebreak(int *pagebreak, - wxArrayInt& WXUNUSED(known_pagebreaks)) const +bool +wxHtmlCell::AdjustPagebreak(int *pagebreak, + const wxArrayInt& WXUNUSED(known_pagebreaks), + int pageHeight) const { - if ((!m_CanLiveOnPagebreak) && - m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) + // Notice that we always break the cells bigger than the page height here + // as otherwise we wouldn't be able to break them at all. + if ( m_Height <= pageHeight && + (!m_CanLiveOnPagebreak && + m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) ) { *pagebreak = m_PosY; return true; @@ -237,8 +255,7 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak, void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link) { - if (m_Link) delete m_Link; - m_Link = NULL; + wxDELETE(m_Link); if (link.GetHref() != wxEmptyString) m_Link = new wxHtmlLinkInfo(link); } @@ -477,17 +494,10 @@ void wxHtmlWordCell::SetSelectionPrivPos(const wxDC& dc, wxHtmlSelection *s) con this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition, p1, p2); - wxPoint p(0, m_Word.length()); - if ( this == s->GetFromCell() ) - p.x = p1; // selection starts here + s->SetFromCharacterPos (p1); // selection starts here if ( this == s->GetToCell() ) - p.y = p2; // selection ends here - - if ( this == s->GetFromCell() ) - s->SetFromPrivPos(p); - if ( this == s->GetToCell() ) - s->SetToPrivPos(p); + s->SetToCharacterPos (p2); // selection ends here } @@ -499,7 +509,7 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info, if ( toSelection ) { - dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); + dc.SetBackgroundMode(wxSOLID); dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg)); dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg)); dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg), @@ -507,10 +517,12 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info, } else { - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + const int mode = info.GetState().GetBgMode(); + dc.SetBackgroundMode(mode); dc.SetTextForeground(fg); dc.SetTextBackground(bg); - dc.SetBackground(wxBrush(bg, wxBRUSHSTYLE_SOLID)); + if ( mode != wxTRANSPARENT ) + dc.SetBackground(wxBrush(bg, mode)); } } @@ -534,23 +546,18 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int w, h; int ofs = 0; - wxPoint priv = (this == s->GetFromCell()) ? - s->GetFromPrivPos() : s->GetToPrivPos(); - // NB: this is quite a hack: in order to compute selection boundaries // (in word's characters) we must know current font, which is only // possible inside rendering code. Therefore we update the // information here and store it in wxHtmlSelection so that // ConvertToText can use it later: - if ( priv == wxDefaultPosition ) + if ( !s->AreFromToCharacterPosSet () ) { SetSelectionPrivPos(dc, s); - priv = (this == s->GetFromCell()) ? - s->GetFromPrivPos() : s->GetToPrivPos(); } - int part1 = priv.x; - int part2 = priv.y; + int part1 = s->GetFromCell()==this ? s->GetFromCharacterPos() : 0; + int part2 = s->GetToCell()==this ? s->GetToCharacterPos() : m_Word.Length(); if ( part1 > 0 ) { @@ -580,16 +587,7 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, { wxHtmlSelectionState selstate = info.GetState().GetSelectionState(); // Not changing selection state, draw the word in single mode: - if ( selstate != wxHTML_SEL_OUT && - dc.GetBackgroundMode() != wxBRUSHSTYLE_SOLID ) - { - SwitchSelState(dc, info, true); - } - else if ( selstate == wxHTML_SEL_OUT && - dc.GetBackgroundMode() == wxBRUSHSTYLE_SOLID ) - { - SwitchSelState(dc, info, false); - } + SwitchSelState(dc, info, selstate != wxHTML_SEL_OUT); dc.DrawText(m_Word, x + m_PosX, y + m_PosY); drawSelectionAfterCell = (selstate != wxHTML_SEL_OUT); } @@ -635,9 +633,6 @@ wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const { if ( s && (this == s->GetFromCell() || this == s->GetToCell()) ) { - wxPoint priv = this == s->GetFromCell() ? s->GetFromPrivPos() - : s->GetToPrivPos(); - // VZ: we may be called before we had a chance to re-render ourselves // and in this case GetFrom/ToPrivPos() is not set yet -- assume // that this only happens in case of a double/triple click (which @@ -645,10 +640,10 @@ wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const // entire contents of the cell in this case // // TODO: but this really needs to be fixed in some better way later... - if ( priv != wxDefaultPosition ) + if ( s->AreFromToCharacterPosSet() ) { - const int part1 = priv.x; - const int part2 = priv.y; + const int part1 = s->GetFromCell()==this ? s->GetFromCharacterPos() : 0; + const int part2 = s->GetToCell()==this ? s->GetToCharacterPos() : m_Word.Length(); if ( part1 == part2 ) return wxEmptyString; return GetPartAsText(part1, part2); @@ -734,7 +729,7 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe m_AlignVer = wxHTML_ALIGN_BOTTOM; m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0; m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT; - m_UseBkColour = false; + m_BkColour = wxNullColour; m_Border = 0; m_MinHeight = 0; m_MinHeightAlign = wxHTML_ALIGN_TOP; @@ -790,11 +785,13 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const } -bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, - wxArrayInt& known_pagebreaks) const +bool +wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, + const wxArrayInt& known_pagebreaks, + int pageHeight) const { if (!m_CanLiveOnPagebreak) - return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks); + return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, pageHeight); wxHtmlCell *c = GetFirstChild(); bool rt = false; @@ -802,7 +799,7 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, while (c) { - if (c->AdjustPagebreak(&pbrk, known_pagebreaks)) + if (c->AdjustPagebreak(&pbrk, known_pagebreaks, pageHeight)) rt = true; c = c->GetNext(); } @@ -871,7 +868,7 @@ void wxHtmlContainerCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ @@ -879,7 +876,7 @@ void wxHtmlContainerCell::Layout(int w) s_indent = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); - // my own layouting: + // my own layout: wxHtmlCell *cell = m_Cells, *line = m_Cells; while (cell != NULL) @@ -1112,7 +1109,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, int xlocal = x + m_PosX; int ylocal = y + m_PosY; - if (m_UseBkColour) + if (m_BkColour.IsOk()) { wxBrush myb = wxBrush(m_BkColour, wxBRUSHSTYLE_SOLID); @@ -1126,7 +1123,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, if (m_Border == 1) { - // draw thin border using lines + // draw thin border using lines wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID); wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID); @@ -1138,10 +1135,10 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1); } else if (m_Border> 0) - { + { wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID); wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID); - + // draw upper left corner // 0---------------5 // | / @@ -1149,7 +1146,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, // | | // | 2 // |/ - // 1 + // 1 wxPoint poly[6]; poly[0].x =m_PosX; poly[0].y = m_PosY ; @@ -1162,7 +1159,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, dc.SetBrush(mybrush1); dc.SetPen(*wxTRANSPARENT_PEN); dc.DrawPolygon(6, poly, x, y); - + // draw lower right corner reusing point 1,2,4 and 5 // 5 // /| @@ -1176,11 +1173,11 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, poly[3].x = poly[4].x; poly[3].y = poly[2].y; dc.DrawPolygon(6, poly, x, y); - // smooth color transition like firefox + // smooth color transition like firefox wxColour borderMediumColour( (m_BorderColour1.Red() + m_BorderColour2.Red()) /2 , (m_BorderColour1.Green() + m_BorderColour2.Green()) /2 , - (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2 + (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2 ); wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID); dc.SetPen(mypen3); @@ -1233,10 +1230,7 @@ void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y, wxColour wxHtmlContainerCell::GetBackgroundColour() { - if (m_UseBkColour) - return m_BkColour; - else - return wxNullColour; + return m_BkColour; } @@ -1561,17 +1555,23 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, if (m_Flags & wxHTML_CLR_BACKGROUND) { state.SetBgColour(m_Colour); - if (state.GetSelectionState() != wxHTML_SEL_IN) - { - dc.SetTextBackground(m_Colour); - dc.SetBackground(wxBrush(m_Colour, wxBRUSHSTYLE_SOLID)); - } - else - { - wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour); - dc.SetTextBackground(c); - dc.SetBackground(wxBrush(c, wxBRUSHSTYLE_SOLID)); - } + state.SetBgMode(wxSOLID); + const wxColour c = state.GetSelectionState() == wxHTML_SEL_IN + ? info.GetStyle().GetSelectedTextBgColour(m_Colour) + : m_Colour; + dc.SetTextBackground(c); + dc.SetBackground(c); + dc.SetBackgroundMode(wxSOLID); + } + if (m_Flags & wxHTML_CLR_TRANSPARENT_BACKGROUND) + { + state.SetBgColour(m_Colour); + state.SetBgMode(wxTRANSPARENT); + const wxColour c = state.GetSelectionState() == wxHTML_SEL_IN + ? info.GetStyle().GetSelectedTextBgColour(m_Colour) + : m_Colour; + dc.SetTextBackground(c); + dc.SetBackgroundMode(wxTRANSPARENT); } }