X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89e94a4bffda38bdb53d875f022982273f9580f2..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/html/htmlcell.cpp?ds=inline diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 2846a430b7..c775d9817f 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmlcell.cpp +// Name: src/html/htmlcell.cpp // Purpose: wxHtmlCell - basic element of HTML output // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -7,42 +7,29 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "htmlcell.h" -#endif - #include "wx/wxprec.h" -#include "wx/defs.h" - -#if wxUSE_HTML && wxUSE_STREAMS - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" #include "wx/brush.h" #include "wx/colour.h" #include "wx/dc.h" + #include "wx/settings.h" + #include "wx/module.h" + #include "wx/wxcrtvararg.h" #endif #include "wx/html/htmlcell.h" #include "wx/html/htmlwin.h" -#include "wx/settings.h" -#include "wx/module.h" -#include "wx/dynarray.h" #include -//----------------------------------------------------------------------------- -// Global variables -//----------------------------------------------------------------------------- - -static wxCursor *gs_cursorLink = NULL; -static wxCursor *gs_cursorText = NULL; - - //----------------------------------------------------------------------------- // Helper classes //----------------------------------------------------------------------------- @@ -94,6 +81,8 @@ wxHtmlCell::wxHtmlCell() : wxObject() m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0; + m_ScriptMode = wxHTML_SCRIPT_NORMAL; // or mode + m_ScriptBaseline = 0; // or baseline m_CanLiveOnPagebreak = true; m_Link = NULL; } @@ -103,37 +92,136 @@ wxHtmlCell::~wxHtmlCell() delete m_Link; } +// Update the descent value when whe are in a or . +// prevbase is the parent base +void wxHtmlCell::SetScriptMode(wxHtmlScriptMode mode, long previousBase) +{ + m_ScriptMode = mode; + + if (mode == wxHTML_SCRIPT_SUP) + m_ScriptBaseline = previousBase - (m_Height + 1) / 2; + else if (mode == wxHTML_SCRIPT_SUB) + m_ScriptBaseline = previousBase + (m_Height + 1) / 6; + else + m_ScriptBaseline = 0; + + m_Descent += m_ScriptBaseline; +} + +#if WXWIN_COMPATIBILITY_2_6 + +struct wxHtmlCellOnMouseClickCompatHelper; -void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, - const wxMouseEvent& event) +static wxHtmlCellOnMouseClickCompatHelper *gs_helperOnMouseClick = NULL; + +// helper for routing calls to new ProcessMouseClick() method to deprecated +// OnMouseClick() method +struct wxHtmlCellOnMouseClickCompatHelper { - wxHtmlLinkInfo *lnk = GetLink(x, y); - if (lnk != NULL) + wxHtmlCellOnMouseClickCompatHelper(wxHtmlWindowInterface *window_, + const wxPoint& pos_, + const wxMouseEvent& event_) + : window(window_), pos(pos_), event(event_), retval(false) + { + } + + bool CallOnMouseClick(wxHtmlCell *cell) + { + wxHtmlCellOnMouseClickCompatHelper *oldHelper = gs_helperOnMouseClick; + gs_helperOnMouseClick = this; + cell->OnMouseClick + ( + window ? window->GetHTMLWindow() : NULL, + pos.x, pos.y, + event + ); + gs_helperOnMouseClick = oldHelper; + return retval; + } + + wxHtmlWindowInterface *window; + const wxPoint& pos; + const wxMouseEvent& event; + bool retval; +}; +#endif // WXWIN_COMPATIBILITY_2_6 + +bool wxHtmlCell::ProcessMouseClick(wxHtmlWindowInterface *window, + const wxPoint& pos, + const wxMouseEvent& event) +{ + wxCHECK_MSG( window, false, wxT("window interface must be provided") ); + +#if WXWIN_COMPATIBILITY_2_6 + // NB: this hack puts the body of ProcessMouseClick() into OnMouseClick() + // (for which it has to pass the arguments and return value via a + // helper variable because these two methods have different + // signatures), so that old code overriding OnMouseClick will continue + // to work + wxHtmlCellOnMouseClickCompatHelper compat(window, pos, event); + return compat.CallOnMouseClick(this); +} + +void wxHtmlCell::OnMouseClick(wxWindow *, int, int, const wxMouseEvent& event) +{ + wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") ); + wxHtmlWindowInterface *window = gs_helperOnMouseClick->window; + const wxPoint& pos = gs_helperOnMouseClick->pos; +#endif // WXWIN_COMPATIBILITY_2_6 + + wxHtmlLinkInfo *lnk = GetLink(pos.x, pos.y); + bool retval = false; + + if (lnk) { wxHtmlLinkInfo lnk2(*lnk); lnk2.SetEvent(&event); lnk2.SetHtmlCell(this); - // note : this cast is legal because parent is *always* wxHtmlWindow - wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2); + window->OnHTMLLinkClicked(lnk2); + retval = true; } -} +#if WXWIN_COMPATIBILITY_2_6 + gs_helperOnMouseClick->retval = retval; +#else + return retval; +#endif // WXWIN_COMPATIBILITY_2_6 +} +#if WXWIN_COMPATIBILITY_2_6 wxCursor wxHtmlCell::GetCursor() const { + return wxNullCursor; +} +#endif // WXWIN_COMPATIBILITY_2_6 + +wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) 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 + // overridden GetCursor() continues to work. The trick is that the base + // wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we + // know that GetCursor() was overridden iff it returns valid cursor. + wxCursor cur = GetCursor(); + if (cur.IsOk()) + return cur; +#endif // WXWIN_COMPATIBILITY_2_6 + if ( GetLink() ) { - if ( !gs_cursorLink ) - gs_cursorLink = new wxCursor(wxCURSOR_HAND); - return *gs_cursorLink; + return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Link); } else - return *wxSTANDARD_CURSOR; + { + return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Default); + } } -bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const +bool wxHtmlCell::AdjustPagebreak(int *pagebreak, + wxArrayInt& WXUNUSED(known_pagebreaks)) const { if ((!m_CanLiveOnPagebreak) && m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) @@ -149,8 +237,7 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks) 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); } @@ -190,10 +277,11 @@ wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y, } -wxPoint wxHtmlCell::GetAbsPos() const +wxPoint wxHtmlCell::GetAbsPos(wxHtmlCell *rootCell) const { wxPoint p(m_PosX, m_PosY); - for (wxHtmlCell *parent = m_Parent; parent; parent = parent->m_Parent) + for (wxHtmlCell *parent = m_Parent; parent && parent != rootCell; + parent = parent->m_Parent) { p.x += parent->m_PosX; p.y += parent->m_PosY; @@ -201,6 +289,14 @@ wxPoint wxHtmlCell::GetAbsPos() const return p; } +wxHtmlCell *wxHtmlCell::GetRootCell() const +{ + wxHtmlCell *c = wxConstCast(this, wxHtmlCell); + while ( c->m_Parent ) + c = c->m_Parent; + return c; +} + unsigned wxHtmlCell::GetDepth() const { unsigned d = 0; @@ -245,7 +341,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const } } - wxFAIL_MSG(_T("Cells are in different trees")); + wxFAIL_MSG(wxT("Cells are in different trees")); return false; } @@ -256,10 +352,14 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell) -wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell() +wxHtmlWordCell::wxHtmlWordCell(const wxString& word, const wxDC& dc) : wxHtmlCell() { m_Word = word; - dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent); + wxCoord w, h, d; + dc.GetTextExtent(m_Word, &w, &h, &d); + m_Width = w; + m_Height = h; + m_Descent = d; SetCanLiveOnPagebreak(false); m_allowLinebreak = true; } @@ -276,7 +376,7 @@ void wxHtmlWordCell::SetPreviousWord(wxHtmlWordCell *cell) // Splits m_Word into up to three parts according to selection, returns // substring before, in and after selection and the points (in relative coords) // where s2 and s3 start: -void wxHtmlWordCell::Split(wxDC& dc, +void wxHtmlWordCell::Split(const wxDC& dc, const wxPoint& selFrom, const wxPoint& selTo, unsigned& pos1, unsigned& pos2) const { @@ -285,7 +385,16 @@ void wxHtmlWordCell::Split(wxDC& dc, wxPoint pt2 = (selTo == wxDefaultPosition) ? wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos(); - wxCoord charW, charH; + // if the selection is entirely within this cell, make sure pt1 < pt2 in + // order to make the rest of this function simpler: + if ( selFrom != wxDefaultPosition && selTo != wxDefaultPosition && + selFrom.x > selTo.x ) + { + wxPoint tmp = pt1; + pt1 = pt2; + pt2 = tmp; + } + unsigned len = m_Word.length(); unsigned i = 0; pos1 = 0; @@ -296,54 +405,69 @@ void wxHtmlWordCell::Split(wxDC& dc, pt1.x = 0; if ( pt2.y >= m_Height ) pt2.x = m_Width; -#ifdef __WXMAC__ + + // before selection: + // (include character under caret only if in first half of width) +#ifdef __WXMAC__ // implementation using PartialExtents to support fractional widths wxArrayInt widths ; dc.GetPartialTextExtents(m_Word,widths) ; -#endif - - // before selection: -#ifdef __WXMAC__ while( i < len && pt1.x >= widths[i] ) i++ ; -#else + if ( i < len ) + { + int charW = (i > 0) ? widths[i] - widths[i-1] : widths[i]; + if ( widths[i] - pt1.x < charW/2 ) + i++; + } +#else // !__WXMAC__ + wxCoord charW, charH; while ( pt1.x > 0 && i < len ) { dc.GetTextExtent(m_Word[i], &charW, &charH); pt1.x -= charW; - if ( pt1.x >= 0 ) + if ( pt1.x >= -charW/2 ) { pos1 += charW; i++; } } -#endif +#endif // __WXMAC__/!__WXMAC__ // in selection: + // (include character under caret only if in first half of width) unsigned j = i; -#ifdef __WXMAC__ +#ifdef __WXMAC__ while( j < len && pt2.x >= widths[j] ) j++ ; -#else + if ( j < len ) + { + int charW = (j > 0) ? widths[j] - widths[j-1] : widths[j]; + if ( widths[j] - pt2.x < charW/2 ) + j++; + } +#else // !__WXMAC__ pos2 = pos1; pt2.x -= pos2; while ( pt2.x > 0 && j < len ) { dc.GetTextExtent(m_Word[j], &charW, &charH); pt2.x -= charW; - if ( pt2.x >= 0 ) + if ( pt2.x >= -charW/2 ) { pos2 += charW; j++; } } -#endif +#endif // __WXMAC__/!__WXMAC__ pos1 = i; pos2 = j; + + wxASSERT( pos2 >= pos1 ); } -void wxHtmlWordCell::SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const +void wxHtmlWordCell::SetSelectionPrivPos(const wxDC& dc, wxHtmlSelection *s) const { unsigned p1, p2; @@ -352,17 +476,10 @@ void wxHtmlWordCell::SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition, p1, p2); - wxPoint p(0, m_Word.length()); - - if ( this == s->GetFromCell() ) - p.x = p1; // selection starts here - if ( this == s->GetToCell() ) - p.y = p2; // selection ends here - if ( this == s->GetFromCell() ) - s->SetFromPrivPos(p); + s->SetFromCharacterPos (p1); // selection starts here if ( this == s->GetToCell() ) - s->SetToPrivPos(p); + s->SetToCharacterPos (p2); // selection ends here } @@ -374,18 +491,18 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info, if ( toSelection ) { - dc.SetBackgroundMode(wxSOLID); + dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg)); dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg)); dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg), - wxSOLID)); + wxBRUSHSTYLE_SOLID)); } else { - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); dc.SetTextForeground(fg); dc.SetTextBackground(bg); - dc.SetBackground(wxBrush(bg, wxSOLID)); + dc.SetBackground(wxBrush(bg, wxBRUSHSTYLE_SOLID)); } } @@ -409,23 +526,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 ) { @@ -456,12 +568,12 @@ 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() != wxSOLID ) + dc.GetBackgroundMode() != wxBRUSHSTYLE_SOLID ) { SwitchSelState(dc, info, true); } else if ( selstate == wxHTML_SEL_OUT && - dc.GetBackgroundMode() == wxSOLID ) + dc.GetBackgroundMode() == wxBRUSHSTYLE_SOLID ) { SwitchSelState(dc, info, false); } @@ -494,14 +606,22 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, } } +wxCursor wxHtmlWordCell::GetMouseCursor(wxHtmlWindowInterface *window) const +{ + if ( !GetLink() ) + { + return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Text); + } + else + { + return wxHtmlCell::GetMouseCursor(window); + } +} 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 @@ -509,31 +629,79 @@ 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() ) { - int part1 = priv.x; - int part2 = priv.y; - return m_Word.Mid(part1, part2-part1); + 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); } //else: return the whole word below } - return m_Word; + return GetAllAsText(); } -wxCursor wxHtmlWordCell::GetCursor() const +wxString wxHtmlWordWithTabsCell::GetAllAsText() const { - if ( !GetLink() ) + return m_wordOrig; +} + +wxString wxHtmlWordWithTabsCell::GetPartAsText(int begin, int end) const +{ + // NB: The 'begin' and 'end' positions are in the _displayed_ text + // (stored in m_Word) and not in the text with tabs that should + // be copied to clipboard (m_wordOrig). + // + // NB: Because selection is performed on displayed text, it's possible + // to select e.g. "half of TAB character" -- IOW, 'begin' and 'end' + // may be in the middle of TAB character expansion into ' 's. In this + // case, we copy the TAB character to clipboard once. + + wxASSERT( begin < end ); + + const unsigned SPACES_PER_TAB = 8; + + wxString sel; + + int pos = 0; + wxString::const_iterator i = m_wordOrig.begin(); + + // find the beginning of text to copy: + for ( ; pos < begin; ++i ) { - if ( !gs_cursorText ) - gs_cursorText = new wxCursor(wxCURSOR_IBEAM); - return *gs_cursorText; + if ( *i == '\t' ) + { + pos += 8 - (m_linepos + pos) % SPACES_PER_TAB; + if ( pos >= begin ) + { + sel += '\t'; + } + } + else + { + ++pos; + } } - else - return wxHtmlCell::GetCursor(); + + // copy the content until we reach 'end': + for ( ; pos < end; ++i ) + { + const wxChar c = *i; + sel += c; + + if ( c == '\t' ) + pos += 8 - (m_linepos + pos) % SPACES_PER_TAB; + else + ++pos; + } + + return sel; } + //----------------------------------------------------------------------------- // wxHtmlContainerCell //----------------------------------------------------------------------------- @@ -551,7 +719,7 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0; m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT; m_UseBkColour = false; - m_UseBorder = false; + m_Border = 0; m_MinHeight = 0; m_MinHeightAlign = wxHTML_ALIGN_TOP; m_LastLayout = -1; @@ -606,37 +774,35 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const } - -bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks, int number_of_pages) const +bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, + wxArrayInt& known_pagebreaks) const { if (!m_CanLiveOnPagebreak) - return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, number_of_pages); + return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks); - else - { - wxHtmlCell *c = GetFirstChild(); - bool rt = false; - int pbrk = *pagebreak - m_PosY; + wxHtmlCell *c = GetFirstChild(); + bool rt = false; + int pbrk = *pagebreak - m_PosY; - while (c) - { - if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages)) - rt = true; - c = c->GetNext(); - } - if (rt) - *pagebreak = pbrk + m_PosY; - return rt; + while (c) + { + if (c->AdjustPagebreak(&pbrk, known_pagebreaks)) + rt = true; + c = c->GetNext(); } + if (rt) + *pagebreak = pbrk + m_PosY; + return rt; } - void wxHtmlContainerCell::Layout(int w) { wxHtmlCell::Layout(w); - if (m_LastLayout == w) return; + if (m_LastLayout == w) + return; + m_LastLayout = w; // VS: Any attempt to layout with negative or zero width leads to hell, // but we can't ignore such attempts completely, since it sometimes @@ -652,8 +818,6 @@ void wxHtmlContainerCell::Layout(int w) return; } - wxHtmlCell *cell = m_Cells, - *line = m_Cells; wxHtmlCell *nextCell; long xpos = 0, ypos = m_IndentTop; int xdelta = 0, ybasicpos = 0, ydiff; @@ -691,7 +855,7 @@ void wxHtmlContainerCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ @@ -699,7 +863,9 @@ 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) { switch (m_AlignVer) @@ -794,12 +960,12 @@ void wxHtmlContainerCell::Layout(int w) if ( step > 0 ) { // first count the cells which will get extra space - int total = 0; + int total = -1; const wxHtmlCell *c; if ( line != cell ) { - for ( c = line->GetNext(); c != cell; c = c->GetNext() ) + for ( c = line; c != cell; c = c->GetNext() ) { if ( c->IsLinebreakAllowed() ) { @@ -811,11 +977,22 @@ void wxHtmlContainerCell::Layout(int w) // and now extra space to those cells which merit it if ( total ) { - // first cell on line is not moved: - line->SetPos(line->GetPosX() + s_indent, - line->GetPosY() + ypos); + // first visible cell on line is not moved: + while (line !=cell && !line->IsLinebreakAllowed()) + { + line->SetPos(line->GetPosX() + s_indent, + line->GetPosY() + ypos); + line = line->GetNext(); + } + + if (line != cell) + { + line->SetPos(line->GetPosX() + s_indent, + line->GetPosY() + ypos); + + line = line->GetNext(); + } - line = line->GetNext(); for ( int n = 0; line != cell; line = line->GetNext() ) { if ( line->IsLinebreakAllowed() ) @@ -881,8 +1058,6 @@ void wxHtmlContainerCell::Layout(int w) m_MaxTotalWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); if (m_Width < MaxLineWidth) m_Width = MaxLineWidth; - - m_LastLayout = w; } void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info, @@ -917,13 +1092,13 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, dc.SetPen(*wxRED_PEN); dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height); #endif - + int xlocal = x + m_PosX; int ylocal = y + m_PosY; if (m_UseBkColour) { - wxBrush myb = wxBrush(m_BkColour, wxSOLID); + wxBrush myb = wxBrush(m_BkColour, wxBRUSHSTYLE_SOLID); int real_y1 = mMax(ylocal, view_y1); int real_y2 = mMin(ylocal + m_Height - 1, view_y2); @@ -933,10 +1108,11 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, dc.DrawRectangle(xlocal, real_y1, m_Width, real_y2 - real_y1 + 1); } - if (m_UseBorder) + if (m_Border == 1) { - wxPen mypen1(m_BorderColour1, 1, wxSOLID); - wxPen mypen2(m_BorderColour2, 1, wxSOLID); + // draw thin border using lines + wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID); + wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID); dc.SetPen(mypen1); dc.DrawLine(xlocal, ylocal, xlocal, ylocal + m_Height - 1); @@ -945,13 +1121,62 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, dc.DrawLine(xlocal + m_Width - 1, ylocal, xlocal + m_Width - 1, ylocal + m_Height - 1); 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 + // | / + // | 3-----------4 + // | | + // | 2 + // |/ + // 1 + + wxPoint poly[6]; + poly[0].x =m_PosX; poly[0].y = m_PosY ; + poly[1].x =m_PosX; poly[1].y = m_PosY + m_Height; + poly[2].x =m_PosX + m_Border; poly[2].y = poly[1].y - m_Border; + poly[3].x =poly[2].x ; poly[3].y = m_PosY + m_Border; + poly[4].x =m_PosX + m_Width - m_Border; poly[4].y = poly[3].y; + poly[5].x =m_PosX + m_Width; poly[5].y = m_PosY; + + 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 + // /| + // 4 | + // | | + // 2-----------3 | + // / | + // 1---------------0 + dc.SetBrush(mybrush2); + poly[0].x = poly[5].x; poly[0].y = poly[1].y; + poly[3].x = poly[4].x; poly[3].y = poly[2].y; + dc.DrawPolygon(6, poly, x, y); + + // 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 + ); + wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID); + dc.SetPen(mypen3); + dc.DrawLines(2, &poly[1], x, y - 1); // between 1 and 2 + dc.DrawLines(2, &poly[4], x, y - 1); // between 4 and 5 + } if (m_Cells) { // draw container's contents: for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) { - + // optimize drawing: don't render off-screen content: if ((ylocal + cell->GetPosY() <= view_y2) && (ylocal + cell->GetPosY() + cell->GetHeight() > view_y1)) @@ -1054,7 +1279,7 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale int wdi; wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == wxT('%')) + if (wd[wd.length()-1] == wxT('%')) { wxSscanf(wd.c_str(), wxT("%i%%"), &wdi); SetWidthFloat(wdi, wxHTML_UNITS_PERCENT); @@ -1139,13 +1364,34 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y, } -void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event) +bool wxHtmlContainerCell::ProcessMouseClick(wxHtmlWindowInterface *window, + const wxPoint& pos, + const wxMouseEvent& event) { - wxHtmlCell *cell = FindCellByPos(x, y); - if ( cell ) - cell->OnMouseClick(parent, x, y, event); +#if WXWIN_COMPATIBILITY_2_6 + wxHtmlCellOnMouseClickCompatHelper compat(window, pos, event); + return compat.CallOnMouseClick(this); } +void wxHtmlContainerCell::OnMouseClick(wxWindow*, + int, int, const wxMouseEvent& event) +{ + wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") ); + wxHtmlWindowInterface *window = gs_helperOnMouseClick->window; + const wxPoint& pos = gs_helperOnMouseClick->pos; +#endif // WXWIN_COMPATIBILITY_2_6 + + bool retval = false; + wxHtmlCell *cell = FindCellByPos(pos.x, pos.y); + if ( cell ) + retval = cell->ProcessMouseClick(window, pos, event); + +#if WXWIN_COMPATIBILITY_2_6 + gs_helperOnMouseClick->retval = retval; +#else + return retval; +#endif // WXWIN_COMPATIBILITY_2_6 +} wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const @@ -1302,13 +1548,13 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, if (state.GetSelectionState() != wxHTML_SEL_IN) { dc.SetTextBackground(m_Colour); - dc.SetBackground(wxBrush(m_Colour, wxSOLID)); + dc.SetBackground(wxBrush(m_Colour, wxBRUSHSTYLE_SOLID)); } else { wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour); dc.SetTextBackground(c); - dc.SetBackground(wxBrush(c, wxSOLID)); + dc.SetBackground(wxBrush(c, wxBRUSHSTYLE_SOLID)); } } } @@ -1374,8 +1620,15 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), c = c->GetParent(); } - ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty); - m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height); + wxScrolledWindow *scrolwin = + wxDynamicCast(m_Wnd->GetParent(), wxScrolledWindow); + wxCHECK_RET( scrolwin, + wxT("widget cells can only be placed in wxHtmlWindow") ); + + scrolwin->GetViewStart(&stx, &sty); + m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, + absy - wxHTML_SCROLL_STEP * sty, + m_Width, m_Height); } @@ -1451,29 +1704,4 @@ const wxHtmlCell* wxHtmlTerminalCellsInterator::operator++() return m_pos; } - - - - - - -//----------------------------------------------------------------------------- -// Cleanup -//----------------------------------------------------------------------------- - -class wxHtmlCellModule: public wxModule -{ -DECLARE_DYNAMIC_CLASS(wxHtmlCellModule) -public: - wxHtmlCellModule() : wxModule() {} - bool OnInit() { return true; } - void OnExit() - { - wxDELETE(gs_cursorLink); - wxDELETE(gs_cursorText); - } -}; - -IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellModule, wxModule) - #endif