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

Fix positions tests

Browse Source
This commit is contained in:
Kvaz1r
2021-08-01 11:33:03 +03:00
parent 335d0bec0c
commit f7f6575bfb
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/univ/textctrl.cpp
View File

@@ -1192,6 +1192,13 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
// update the (cached) last position first as refresh functions use it // update the (cached) last position first as refresh functions use it
m_posLast += text.length() - to + from; m_posLast += text.length() - to + from;
#if defined(__WXMSW__)
// Take into account that every new line mark occupies
// two characters, not one.
if ( !HasFlag(wxTE_RICH | wxTE_RICH2) )
m_posLast += nReplaceCount - 1;
#endif // WXMSW
// we may optimize refresh if the number of rows didn't change - but if // we may optimize refresh if the number of rows didn't change - but if
// it did we have to refresh everything below the part we chanegd as // it did we have to refresh everything below the part we chanegd as
// well as it might have moved // well as it might have moved
@@ -1721,11 +1728,10 @@ wxTextPos wxTextCtrl::XYToPosition(wxTextCoord x, wxTextCoord y) const
} }
else // multiline else // multiline
{ {
if ( (size_t)y >= GetLineCount() ) size_t nLineCount = GetLineCount();
{
// this position is below the text if ((size_t)y >= nLineCount)
return GetLastPosition(); return -1;
}
wxTextPos pos = 0; wxTextPos pos = 0;
for ( size_t nLine = 0; nLine < (size_t)y; nLine++ ) for ( size_t nLine = 0; nLine < (size_t)y; nLine++ )
@@ -1733,14 +1739,16 @@ wxTextPos wxTextCtrl::XYToPosition(wxTextCoord x, wxTextCoord y) const
// +1 is because the positions at the end of this line and of the // +1 is because the positions at the end of this line and of the
// start of the next one are different // start of the next one are different
pos += GetLines()[nLine].length() + 1; pos += GetLines()[nLine].length() + 1;
#if defined(__WXMSW__)
if( !HasFlag(wxTE_RICH | wxTE_RICH2) && nLine + 1 != nLineCount)
pos += 1;
#endif // WXMSW
} }
// take into account also the position in line // out of the line
if ( (size_t)x > GetLines()[y].length() ) if ( (size_t)x > GetLines()[y].length() )
{ return -1;
// don't return position in the next line
x = GetLines()[y].length();
}
return pos + x; return pos + x;
} }
@@ -1767,15 +1775,24 @@ bool wxTextCtrl::PositionToXY(wxTextPos pos,
size_t nLineCount = GetLineCount(); size_t nLineCount = GetLineCount();
for ( size_t nLine = 0; nLine < nLineCount; nLine++ ) for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
{ {
// +1 is because the start the start of the next line is one // +1 is because the start of the next line is one
// position after the end of this one // position after the end of this one
wxTextPos posNew = posCur + GetLines()[nLine].length() + 1; wxTextPos posNew = posCur + GetLines()[nLine].length() + 1;
#if defined(__WXMSW__)
if( !HasFlag(wxTE_RICH | wxTE_RICH2) && nLine + 1 != nLineCount)
posNew += 1;
#endif // WXMSW
if ( posNew > pos ) if ( posNew > pos )
{ {
// we've found the line, now just calc the column // we've found the line, now just calc the column
if ( x ) if ( x )
*x = pos - posCur; *x = pos - posCur;
#if defined(__WXMSW__)
if ( !HasFlag(wxTE_RICH | wxTE_RICH2) && x && nLine + 1 != nLineCount && posNew - 1 == pos)
*x = pos - posCur - 1;
#endif // WXMSW
if ( y ) if ( y )
*y = nLine; *y = nLine;