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

Fixes for incorrect selection, extra newline insertion when undoing deletion of selection,

Browse Source 
incorrect SetScrollbar optimization, insufficient refresh for operations on last line,
HasCharacter/ParagraphAttributes bug.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-02-02 22:19:33 +00:00
parent 7261371b17
commit 205a1ad98f
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/richtext/richtextbuffer.cpp
View File

@@ -2469,7 +2469,7 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
{ {
// Stop searching if we're beyond the range of interest // Stop searching if we're beyond the range of interest
if (para->GetRange().GetStart() > range.GetEnd()) if (para->GetRange().GetStart() > range.GetEnd())
return foundCount == matchingCount; return foundCount == matchingCount && foundCount != 0;
if (!para->GetRange().IsOutside(range)) if (!para->GetRange().IsOutside(range))
{ {
@@ -2478,7 +2478,12 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
while (node2) while (node2)
{ {
wxRichTextObject* child = node2->GetData(); wxRichTextObject* child = node2->GetData();
if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText))) // Allow for empty string if no buffer
wxRichTextRange childRange = child->GetRange();
if (childRange.GetLength() == 0 && GetRange().GetLength() == 1)
childRange.SetEnd(childRange.GetEnd()+1);
if (!childRange.IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
{ {
foundCount ++; foundCount ++;
wxTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes()); wxTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes());
@@ -2517,7 +2522,7 @@ bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange&
{ {
// Stop searching if we're beyond the range of interest // Stop searching if we're beyond the range of interest
if (para->GetRange().GetStart() > range.GetEnd()) if (para->GetRange().GetStart() > range.GetEnd())
return foundCount == matchingCount; return foundCount == matchingCount && foundCount != 0;
if (!para->GetRange().IsOutside(range)) if (!para->GetRange().IsOutside(range))
{ {
@@ -6959,8 +6964,12 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
// Detect last line in the buffer // Detect last line in the buffer
else if (!node2->GetNext() && para->GetRange().Contains(m_buffer->GetRange().GetEnd())) else if (!node2->GetNext() && para->GetRange().Contains(m_buffer->GetRange().GetEnd()))
{ {
foundEnd = true; // If deleting text, make sure we refresh below as well as above
lastY = pt.y + line->GetSize().y; if (positionOffset >= 0)
{
foundEnd = true;
lastY = pt.y + line->GetSize().y;
}
node2 = wxRichTextLineList::compatibility_iterator(); node2 = wxRichTextLineList::compatibility_iterator();
node = wxRichTextObjectList::compatibility_iterator(); node = wxRichTextObjectList::compatibility_iterator();

17
src/richtext/richtextctrl.cpp
View File

@@ -1079,7 +1079,15 @@ bool wxRichTextCtrl::DeleteSelectedContent(long* newPos)
if (HasSelection()) if (HasSelection())
{ {
long pos = m_selectionRange.GetStart(); long pos = m_selectionRange.GetStart();
GetBuffer().DeleteRangeWithUndo(m_selectionRange, this); wxRichTextRange range = m_selectionRange;
// SelectAll causes more to be selected than doing it interactively,
// and causes a new paragraph to be inserted. So for multiline buffers,
// don't delete the final position.
if (range.GetEnd() == GetLastPosition() && GetNumberOfLines() > 0)
range.SetEnd(range.GetEnd()-1);
GetBuffer().DeleteRangeWithUndo(range, this);
m_selectionRange.SetRange(-2, -2); m_selectionRange.SetRange(-2, -2);
if (newPos) if (newPos)
@@ -2059,7 +2067,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
return; return;
// Don't set scrollbars if there were none before, and there will be none now. // Don't set scrollbars if there were none before, and there will be none now.
if (oldPPUY != 0 && (oldVirtualSizeY < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y)) if (oldPPUY != 0 && (oldVirtualSizeY*oldPPUY < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y))
return; return;
// Move to previous scroll position if // Move to previous scroll position if
@@ -2589,10 +2597,9 @@ void wxRichTextCtrl::SetSelection(long from, long to)
else else
{ {
wxRichTextRange oldSelection = m_selectionRange; wxRichTextRange oldSelection = m_selectionRange;
m_selectionAnchor = from; m_selectionAnchor = from-1;
m_selectionRange.SetRange(from, to-1); m_selectionRange.SetRange(from, to-1);
// Have to subtract 2, one because of endPos+1 rule (SetSelection docs) and another to turn into caret position.
m_caretPosition = wxMax(-1, to-2); m_caretPosition = wxMax(-1, to-2);
RefreshForSelectionChange(oldSelection, m_selectionRange); RefreshForSelectionChange(oldSelection, m_selectionRange);
@@ -2810,7 +2817,7 @@ void wxRichTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event) void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
{ {
event.Enable(GetLastPosition() > 0); event.Enable(GetLastPosition() >= 0);
} }
void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event) void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)