Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for fractional characters widths under Mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-09-04 12:52:46 +00:00
parent ff33410699
commit 89e94a4bff
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/html/htmlcell.cpp
View File

@@ -296,8 +296,17 @@ void wxHtmlWordCell::Split(wxDC& dc,
pt1.x = 0; pt1.x = 0;
if ( pt2.y >= m_Height ) if ( pt2.y >= m_Height )
pt2.x = m_Width; pt2.x = m_Width;
#ifdef __WXMAC__
// implementation using PartialExtents to support fractional widths
wxArrayInt widths ;
dc.GetPartialTextExtents(m_Word,widths) ;
#endif
// before selection: // before selection:
#ifdef __WXMAC__
while( i < len && pt1.x >= widths[i] )
i++ ;
#else
while ( pt1.x > 0 && i < len ) while ( pt1.x > 0 && i < len )
{ {
dc.GetTextExtent(m_Word[i], &charW, &charH); dc.GetTextExtent(m_Word[i], &charW, &charH);
@@ -308,9 +317,14 @@ void wxHtmlWordCell::Split(wxDC& dc,
i++; i++;
} }
} }
#endif
// in selection: // in selection:
unsigned j = i; unsigned j = i;
#ifdef __WXMAC__
while( j < len && pt2.x >= widths[j] )
j++ ;
#else
pos2 = pos1; pos2 = pos1;
pt2.x -= pos2; pt2.x -= pos2;
while ( pt2.x > 0 && j < len ) while ( pt2.x > 0 && j < len )
@@ -323,6 +337,7 @@ void wxHtmlWordCell::Split(wxDC& dc,
j++; j++;
} }
} }
#endif
pos1 = i; pos1 = i;
pos2 = j; pos2 = j;