AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed caret sizing problem around large objects by clipping the caret to the margins

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2011-09-29 12:05:21 +00:00
parent 82614b1a72
commit 423b9ba554
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/richtext/richtextctrl.cpp
View File

@ -3377,13 +3377,26 @@ void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container)
if (GetCaret()->GetSize() != newSz)
GetCaret()->SetSize(newSz);
int halfSize = newSz.y/2;
// If the caret is beyond the margin, hide it by moving it out of the way
if (((pt.y + halfSize) < GetBuffer().GetTopMargin()) || ((pt.y + halfSize) > (GetClientSize().y - GetBuffer().GetBottomMargin())))
// Adjust size so the caret size and position doesn't appear in the margins
if (((pt.y + newSz.y) <= GetBuffer().GetTopMargin()) || (pt.y >= (GetClientSize().y - GetBuffer().GetBottomMargin())))
{
pt.x = -200;
pt.y = -200;
}
else if (pt.y < GetBuffer().GetTopMargin() && (pt.y + newSz.y) > GetBuffer().GetTopMargin())
{
newSz.y -= (GetBuffer().GetTopMargin() - pt.y);
if (newSz.y > 0)
{
pt.y = GetBuffer().GetTopMargin();
GetCaret()->SetSize(newSz);
}
}
else if (pt.y < (GetClientSize().y - GetBuffer().GetBottomMargin()) && (pt.y + newSz.y) > (GetClientSize().y - GetBuffer().GetBottomMargin()))
{
newSz.y = GetClientSize().y - GetBuffer().GetBottomMargin() - pt.y;
GetCaret()->SetSize(newSz);
}
GetCaret()->Move(pt);
GetCaret()->Show();