X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad9835c97c10c0d7de345e3a7a7c0fc2776eb2cb..9d55bfef2cb35ac07972e76c786d265c9b35d230:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index ace347c57a..e0ca15d66e 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -15,17 +15,18 @@ #if wxUSE_HTML && wxUSE_STREAMS -#ifndef WXPRECOMP +#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 @@ -219,7 +220,8 @@ wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const } -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) @@ -354,7 +356,11 @@ IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, 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; } @@ -380,6 +386,16 @@ void wxHtmlWordCell::Split(const wxDC& dc, wxPoint pt2 = (selTo == wxDefaultPosition) ? wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos(); + // 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; @@ -392,19 +408,26 @@ void wxHtmlWordCell::Split(const wxDC& dc, pt2.x = m_Width; // 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) ; while( i < len && pt1.x >= widths[i] ) i++ ; -#else // __WXMAC__ + 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++; @@ -413,18 +436,25 @@ void wxHtmlWordCell::Split(const wxDC& dc, #endif // __WXMAC__/!__WXMAC__ // in selection: + // (include character under caret only if in first half of width) unsigned j = i; #ifdef __WXMAC__ while( j < len && pt2.x >= widths[j] ) j++ ; -#else // __WXMAC__ + 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++; @@ -699,32 +729,28 @@ 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); @@ -887,12 +913,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() ) { @@ -904,11 +930,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() ) @@ -1488,8 +1525,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, + _T("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); }