X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6460c5990b861a41ea675667b8f40d3f7e1a9b53..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/richtext/richtextctrl.cpp?ds=sidebyside diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index f7dfab511d..b330581885 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -49,26 +49,26 @@ #include "wx/app.h" WX_CHECK_BUILD_OPTIONS("wxRichTextCtrl") -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RETURN, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CHARACTER, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_DELETE, wxRichTextEvent ); - -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent ); - -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_LEFT_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_RIGHT_CLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_LEFT_DCLICK, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_RETURN, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_CHARACTER, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_DELETE, wxRichTextEvent ); + +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent ); + +wxDEFINE_EVENT( wxEVT_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_CONTENT_DELETED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_STYLE_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_PROPERTIES_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_BUFFER_RESET, wxRichTextEvent ); +wxDEFINE_EVENT( wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent ); #if wxRICHTEXT_USE_OWN_CARET @@ -264,7 +264,6 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va attributes.SetLineSpacing(10); attributes.SetParagraphSpacingAfter(10); attributes.SetParagraphSpacingBefore(0); - SetBasicStyle(attributes); int margin = 5; @@ -356,6 +355,8 @@ void wxRichTextCtrl::Init() m_selectionAnchorObject = NULL; m_selectionState = wxRichTextCtrlSelectionState_Normal; m_editable = true; + m_useVirtualAttributes = false; + m_verticalScrollbarEnabled = true; m_caretAtLineStart = false; m_dragging = false; #if wxUSE_DRAG_AND_DROP @@ -367,6 +368,7 @@ void wxRichTextCtrl::Init() m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD; m_caretPositionForDefaultStyle = -2; m_focusObject = & m_buffer; + m_scale = 1.0; } void wxRichTextCtrl::DoThaw() @@ -436,35 +438,44 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetFont(GetFont()); - // Paint the background - PaintBackground(dc); - - // wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize()); - wxRect drawingArea(GetUpdateRegion().GetBox()); - drawingArea.SetPosition(GetLogicalPoint(drawingArea.GetPosition())); + drawingArea.SetPosition(GetUnscaledPoint(GetLogicalPoint(drawingArea.GetPosition()))); + drawingArea.SetSize(GetUnscaledSize(drawingArea.GetSize())); - wxRect availableSpace(GetClientSize()); + wxRect availableSpace(GetUnscaledSize(GetClientSize())); wxRichTextDrawingContext context(& GetBuffer()); if (GetBuffer().IsDirty()) { + dc.SetUserScale(GetScale(), GetScale()); + GetBuffer().Layout(dc, context, availableSpace, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT); GetBuffer().Invalidate(wxRICHTEXT_NONE); + + dc.SetUserScale(1.0, 1.0); + SetupScrollbars(); } + // Paint the background + PaintBackground(dc); + wxRect clipRect(availableSpace); clipRect.x += GetBuffer().GetLeftMargin(); clipRect.y += GetBuffer().GetTopMargin(); clipRect.width -= (GetBuffer().GetLeftMargin() + GetBuffer().GetRightMargin()); clipRect.height -= (GetBuffer().GetTopMargin() + GetBuffer().GetBottomMargin()); + + clipRect = GetScaledRect(clipRect); clipRect.SetPosition(GetLogicalPoint(clipRect.GetPosition())); + dc.SetClippingRegion(clipRect); int flags = 0; if ((GetExtraStyle() & wxRICHTEXT_EX_NO_GUIDELINES) == 0) flags |= wxRICHTEXT_DRAW_GUIDELINES; + dc.SetUserScale(GetScale(), GetScale()); + GetBuffer().Draw(dc, context, GetBuffer().GetOwnRange(), GetSelection(), drawingArea, 0 /* descent */, flags); dc.DestroyClippingRegion(); @@ -479,6 +490,8 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) ((wxRichTextCaret*) GetCaret())->DoDraw(& dc); } #endif + + dc.SetUserScale(1.0, 1.0); } #if !wxRICHTEXT_USE_OWN_CARET @@ -575,7 +588,7 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; wxRichTextDrawingContext context(& GetBuffer()); - int hit = GetBuffer().HitTest(dc, context, event.GetLogicalPosition(dc), position, & hitObj, & contextObj); + int hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(event.GetLogicalPosition(dc)), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_HONOUR_ATOMIC); #if wxUSE_DRAG_AND_DROP // If there's no selection, or we're not inside it, this isn't an attempt to initiate Drag'n'Drop @@ -643,7 +656,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) wxRichTextObject* contextObj = NULL; wxRichTextDrawingContext context(& GetBuffer()); // Only get objects at this level, not nested, because otherwise we couldn't swipe text at a single level. - int hit = GetFocusObject()->HitTest(dc, context, logicalPt, position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS); + int hit = GetFocusObject()->HitTest(dc, context, GetUnscaledPoint(logicalPt), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_HONOUR_ATOMIC); #if wxUSE_DRAG_AND_DROP if (m_preDrag) @@ -655,7 +668,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) long position = 0; wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; - int hit = GetBuffer().HitTest(dc, context, event.GetLogicalPosition(dc), position, & hitObj, & contextObj); + int hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(event.GetLogicalPosition(dc)), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_HONOUR_ATOMIC); wxRichTextParagraphLayoutBox* oldFocusObject = GetFocusObject(); wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); if (container && container != GetFocusObject() && container->AcceptsFocus()) @@ -678,7 +691,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE)) { wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, + wxEVT_RICHTEXT_LEFT_CLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(position); @@ -739,13 +752,26 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) /// Mouse-movements void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) { + if (!event.Dragging() && m_dragging) + { + // We may have accidentally lost a mouse-up event, especially on Linux + m_dragging = false; + if (GetCapture() == this) + ReleaseMouse(); + } + #if wxUSE_DRAG_AND_DROP - // See if we're starting Drag'n'Drop - if (m_preDrag) + size_t distance = 0; + if (m_preDrag || m_dragging) { int x = m_dragStartPoint.x - event.GetPosition().x; int y = m_dragStartPoint.y - event.GetPosition().y; - size_t distance = abs(x) + abs(y); + distance = abs(x) + abs(y); + } + + // See if we're starting Drag'n'Drop + if (m_preDrag) + { #if wxUSE_DATETIME wxTimeSpan diff = wxDateTime::UNow() - m_dragStartTime; #endif @@ -827,7 +853,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) container = GetFocusObject(); } wxRichTextDrawingContext context(& GetBuffer()); - int hit = container->HitTest(dc, context, logicalPt, position, & hitObj, & contextObj, flags); + int hit = container->HitTest(dc, context, GetUnscaledPoint(logicalPt), position, & hitObj, & contextObj, flags); // See if we need to change the cursor @@ -851,6 +877,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) if (m_dragging #if wxUSE_DRAG_AND_DROP && !m_preDrag + && (distance > 4) #endif ) { @@ -861,7 +888,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) // Check for dragging across multiple containers long position2 = 0; wxRichTextObject* hitObj2 = NULL, *contextObj2 = NULL; - int hit2 = GetBuffer().HitTest(dc, context, logicalPt, position2, & hitObj2, & contextObj2, 0); + int hit2 = GetBuffer().HitTest(dc, context, GetUnscaledPoint(logicalPt), position2, & hitObj2, & contextObj2, 0); if (hit2 != wxRICHTEXT_HITTEST_NONE && !(hit2 & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj2 && hitObj != hitObj2) { // See if we can find a common ancestor @@ -928,10 +955,10 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) if (hitObj && m_dragging && hit != wxRICHTEXT_HITTEST_NONE && m_selectionState == wxRichTextCtrlSelectionState_Normal #if wxUSE_DRAG_AND_DROP && !m_preDrag + && (distance > 4) #endif ) { - // TODO: test closeness SetCaretPositionAfterClick(container, position, hit, true /* extend selection */); } } @@ -950,7 +977,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; wxRichTextDrawingContext context(& GetBuffer()); - int hit = GetFocusObject()->HitTest(dc, context, logicalPt, position, & hitObj, & contextObj); + int hit = GetFocusObject()->HitTest(dc, context, GetUnscaledPoint(logicalPt), position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_HONOUR_ATOMIC); if (hitObj && hitObj->GetContainer() != GetFocusObject()) { @@ -963,7 +990,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) } wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, + wxEVT_RICHTEXT_RIGHT_CLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(position); @@ -978,7 +1005,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event)) { wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, + wxEVT_RICHTEXT_LEFT_DCLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(m_caretPosition+1); @@ -994,7 +1021,7 @@ void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event)) void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event) { wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, + wxEVT_RICHTEXT_MIDDLE_CLICK, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(m_caretPosition+1); @@ -1112,82 +1139,8 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) // Must process this before translation, otherwise it's translated into a WXK_DELETE event. if (event.CmdDown() && event.GetKeyCode() == WXK_BACK) { - if (!IsEditable()) - { + if (!ProcessBackKey(event, flags)) return; - } - - if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange())) - { - return; - } - - BeginBatchUndo(_("Delete Text")); - - long newPos = m_caretPosition; - - bool processed = DeleteSelectedContent(& newPos); - - int deletions = 0; - if (processed) - deletions ++; - - // Submit range in character positions, which are greater than caret positions, - // so subtract 1 for deleted character and add 1 for conversion to character position. - if (newPos > -1) - { - if (event.CmdDown()) - { - long pos = wxRichTextCtrl::FindNextWordPosition(-1); - if (pos < newPos) - { - wxRichTextRange range(pos+1, newPos); - if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) - { - GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); - deletions ++; - } - processed = true; - } - } - - if (!processed) - { - wxRichTextRange range(newPos, newPos); - if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) - { - GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); - deletions ++; - } - } - } - - EndBatchUndo(); - - if (GetLastPosition() == -1) - { - GetFocusObject()->Reset(); - - m_caretPosition = -1; - PositionCaret(); - SetDefaultStyleToCursorStyle(); - } - - ScrollIntoView(m_caretPosition, WXK_LEFT); - - if (deletions > 0) - { - wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_DELETE, - GetId()); - cmdEvent.SetEventObject(this); - cmdEvent.SetFlags(flags); - cmdEvent.SetPosition(m_caretPosition+1); - cmdEvent.SetContainer(GetFocusObject()); - GetEventHandler()->ProcessEvent(cmdEvent); - } - - Update(); } else event.Skip(); @@ -1230,13 +1183,21 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) else GetFocusObject()->InsertNewlineWithUndo(& GetBuffer(), newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE); + // Automatically renumber list + bool isNumberedList = false; + wxRichTextRange numberedListRange = FindRangeForList(newPos+1, isNumberedList); + if (isNumberedList && numberedListRange != wxRichTextRange(-1, -1)) + { + NumberList(numberedListRange, NULL, wxRICHTEXT_SETSTYLE_RENUMBER|wxRICHTEXT_SETSTYLE_WITH_UNDO); + } + EndBatchUndo(); SetDefaultStyleToCursorStyle(); ScrollIntoView(m_caretPosition, WXK_RIGHT); wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_RETURN, + wxEVT_RICHTEXT_RETURN, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); @@ -1246,7 +1207,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) if (!GetEventHandler()->ProcessEvent(cmdEvent)) { // Generate conventional event - wxCommandEvent textEvent(wxEVT_COMMAND_TEXT_ENTER, GetId()); + wxCommandEvent textEvent(wxEVT_TEXT_ENTER, GetId()); InitCommandEvent(textEvent); GetEventHandler()->ProcessEvent(textEvent); @@ -1255,77 +1216,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) } else if (event.GetKeyCode() == WXK_BACK) { - long newPos = m_caretPosition; - - if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange())) - { - return; - } - - BeginBatchUndo(_("Delete Text")); - - bool processed = DeleteSelectedContent(& newPos); - - int deletions = 0; - if (processed) - deletions ++; - - // Submit range in character positions, which are greater than caret positions, - // so subtract 1 for deleted character and add 1 for conversion to character position. - if (newPos > -1) - { - if (event.CmdDown()) - { - long pos = wxRichTextCtrl::FindNextWordPosition(-1); - if (pos < newPos) - { - wxRichTextRange range(pos+1, newPos); - if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) - { - GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); - deletions ++; - } - processed = true; - } - } - - if (!processed) - { - wxRichTextRange range(newPos, newPos); - if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) - { - GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); - deletions ++; - } - } - } - - EndBatchUndo(); - - if (GetLastPosition() == -1) - { - GetFocusObject()->Reset(); - - m_caretPosition = -1; - PositionCaret(); - SetDefaultStyleToCursorStyle(); - } - - ScrollIntoView(m_caretPosition, WXK_LEFT); - - if (deletions > 0) - { - wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_DELETE, - GetId()); - cmdEvent.SetEventObject(this); - cmdEvent.SetFlags(flags); - cmdEvent.SetPosition(m_caretPosition+1); - cmdEvent.SetContainer(GetFocusObject()); - GetEventHandler()->ProcessEvent(cmdEvent); - } - - Update(); + ProcessBackKey(event, flags); } else if (event.GetKeyCode() == WXK_DELETE) { @@ -1386,10 +1277,10 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) ScrollIntoView(m_caretPosition, WXK_LEFT); - if (deletions > 0) + // Always send this event; wxEVT_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion. { wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_DELETE, + wxEVT_RICHTEXT_DELETE, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); @@ -1425,7 +1316,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) } wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_CHARACTER, + wxEVT_RICHTEXT_CHARACTER, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); @@ -1512,6 +1403,122 @@ bool wxRichTextCtrl::ProcessMouseMovement(wxRichTextParagraphLayoutBox* containe return false; } +// Processes the back key +bool wxRichTextCtrl::ProcessBackKey(wxKeyEvent& event, int flags) +{ + if (!IsEditable()) + { + return false; + } + + if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange())) + { + return false; + } + + wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true); + + // If we're at the start of a list item with a bullet, let's 'delete' the bullet, i.e. + // make it a continuation paragraph. + if (!HasSelection() && para && ((m_caretPosition+1) == para->GetRange().GetStart()) && + para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION) == 0) + { + wxRichTextParagraph* newPara = wxDynamicCast(para->Clone(), wxRichTextParagraph); + newPara->GetAttributes().SetBulletStyle(newPara->GetAttributes().GetBulletStyle() | wxTEXT_ATTR_BULLET_STYLE_CONTINUATION); + + wxRichTextAction* action = new wxRichTextAction(NULL, _("Remove Bullet"), wxRICHTEXT_CHANGE_STYLE, & GetBuffer(), GetFocusObject(), this); + action->SetRange(newPara->GetRange()); + action->SetPosition(GetCaretPosition()); + action->GetNewParagraphs().AppendChild(newPara); + // Also store the old ones for Undo + action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para)); + + GetBuffer().Invalidate(para->GetRange()); + GetBuffer().SubmitAction(action); + + // Automatically renumber list + bool isNumberedList = false; + wxRichTextRange numberedListRange = FindRangeForList(m_caretPosition, isNumberedList); + if (isNumberedList && numberedListRange != wxRichTextRange(-1, -1)) + { + NumberList(numberedListRange, NULL, wxRICHTEXT_SETSTYLE_RENUMBER|wxRICHTEXT_SETSTYLE_WITH_UNDO); + } + + Update(); + } + else + { + BeginBatchUndo(_("Delete Text")); + + long newPos = m_caretPosition; + + bool processed = DeleteSelectedContent(& newPos); + + int deletions = 0; + if (processed) + deletions ++; + + // Submit range in character positions, which are greater than caret positions, + // so subtract 1 for deleted character and add 1 for conversion to character position. + if (newPos > -1) + { + if (event.CmdDown()) + { + long pos = wxRichTextCtrl::FindNextWordPosition(-1); + if (pos < newPos) + { + wxRichTextRange range(pos+1, newPos); + if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) + { + GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); + deletions ++; + } + processed = true; + } + } + + if (!processed) + { + wxRichTextRange range(newPos, newPos); + if (CanDeleteRange(* GetFocusObject(), range.FromInternal())) + { + GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer()); + deletions ++; + } + } + } + + EndBatchUndo(); + + if (GetLastPosition() == -1) + { + GetFocusObject()->Reset(); + + m_caretPosition = -1; + PositionCaret(); + SetDefaultStyleToCursorStyle(); + } + + ScrollIntoView(m_caretPosition, WXK_LEFT); + + // Always send this event; wxEVT_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion. + { + wxRichTextEvent cmdEvent( + wxEVT_RICHTEXT_DELETE, + GetId()); + cmdEvent.SetEventObject(this); + cmdEvent.SetFlags(flags); + cmdEvent.SetPosition(m_caretPosition+1); + cmdEvent.SetContainer(GetFocusObject()); + GetEventHandler()->ProcessEvent(cmdEvent); + } + + Update(); + } + + return true; +} + /// Delete content if there is a selection, e.g. when pressing a key. bool wxRichTextCtrl::DeleteSelectedContent(long* newPos) { @@ -1712,7 +1719,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) if (ppuY != 0) syUnits = sy/ppuY; - wxRect rect = line->GetRect(); + wxRect rect = GetScaledRect(line->GetRect()); bool scrolled = false; @@ -1725,14 +1732,13 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) wxRichTextObject::GetTotalMargin(dc, & GetBuffer(), GetBuffer().GetAttributes(), leftMargin, rightMargin, topMargin, bottomMargin); } -// clientSize.y -= GetBuffer().GetBottomMargin(); - clientSize.y -= bottomMargin; + clientSize.y -= (int) (0.5 + bottomMargin * GetScale()); if (GetWindowStyle() & wxRE_CENTRE_CARET) { int y = rect.y - GetClientSize().y/2; int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); - if (y >= 0 && (y + clientSize.y) < GetBuffer().GetCachedSize().y) + if (y >= 0 && (y + clientSize.y) < (int) (0.5 + GetBuffer().GetCachedSize().y * GetScale())) { if (startYUnits != yUnits) { @@ -1771,11 +1777,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) scrolled = true; } } - else if (rect.y < (startY + GetBuffer().GetTopMargin())) + else if (rect.y < (startY + (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()))) { // Make it scroll so this item is at the top // of the window - int y = rect.y - GetBuffer().GetTopMargin(); + int y = rect.y - (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); if (startYUnits != yUnits) @@ -1791,11 +1797,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME || keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP ) { - if (rect.y < (startY + GetBuffer().GetBottomMargin())) + if (rect.y < (startY + (int) (0.5 + GetBuffer().GetBottomMargin() * GetScale()))) { // Make it scroll so this item is at the top // of the window - int y = rect.y - GetBuffer().GetTopMargin(); + int y = rect.y - (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()); int yUnits = (int) (0.5 + ((float) y)/(float) ppuY); if (startYUnits != yUnits) @@ -1847,11 +1853,12 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const startX = 0; startY = startY * ppuY; - wxRect rect = line->GetRect(); + wxRect rect = GetScaledRect(line->GetRect()); wxSize clientSize = GetClientSize(); - clientSize.y -= GetBuffer().GetBottomMargin(); + clientSize.y -= (int) (0.5 + GetBuffer().GetBottomMargin() * GetScale()); - return (rect.GetTop() >= (startY + GetBuffer().GetTopMargin())) && (rect.GetBottom() <= (startY + clientSize.y)); + return (rect.GetTop() >= (startY + (int) (0.5 + GetBuffer().GetTopMargin() * GetScale()))) && + (rect.GetBottom() <= (startY + clientSize.y)); } void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart) @@ -1974,7 +1981,7 @@ bool wxRichTextCtrl::MoveRight(int noPositions, int flags) // we want to adjust the caret position such that it is positioned at the // start of the next line, rather than jumping past the first character of the // line. - if (noPositions == 1 && !extendSel) + if (noPositions == 1) MoveCaretForward(oldPos); else SetCaretPosition(newPos); @@ -2001,7 +2008,7 @@ bool wxRichTextCtrl::MoveLeft(int noPositions, int flags) if (!extendSel) SelectNone(); - if (noPositions == 1 && !extendSel) + if (noPositions == 1) MoveCaretBack(oldPos); else SetCaretPosition(newPos); @@ -2082,8 +2089,9 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) } wxRichTextParagraphLayoutBox* container = GetFocusObject(); - int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS; + int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS|wxRICHTEXT_HITTEST_HONOUR_ATOMIC; + bool lineIsEmpty = false; if (notInThisObject) { // If we know we're navigating out of the current object, @@ -2104,7 +2112,11 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) { wxRichTextLine* lineObj = GetFocusObject()->GetLineForVisibleLineNumber(newLine); if (lineObj) + { pt.y = lineObj->GetAbsolutePosition().y + 2; + if (lineObj->GetRange().GetStart() == lineObj->GetRange().GetEnd()) + lineIsEmpty = true; + } else return false; } @@ -2136,6 +2148,15 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) } bool caretLineStart = true; + + // If the line is empty, there is only one possible position for the caret, + // so force the 'before' state so FindCaretPositionForCharacterPosition doesn't + // just return the same position. + if (lineIsEmpty) + { + hitTest &= ~wxRICHTEXT_HITTEST_AFTER; + hitTest |= wxRICHTEXT_HITTEST_BEFORE; + } long caretPosition = FindCaretPositionForCharacterPosition(newPos, hitTest, container, caretLineStart); long newSelEnd = caretPosition; bool extendSel; @@ -2190,7 +2211,7 @@ bool wxRichTextCtrl::MoveToParagraphStart(int flags) if (!extendSel) SelectNone(); - SetCaretPosition(newPos); + SetCaretPosition(newPos, true); PositionCaret(); SetDefaultStyleToCursorStyle(); @@ -2331,7 +2352,7 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags) static bool wxRichTextCtrlIsWhitespace(const wxString& str) { - return str == wxT(" ") || str == wxT("\t"); + return str == wxT(" ") || str == wxT("\t") || (!str.empty() && (str[0] == (wxChar) 160)); } // Finds the caret position for the next word @@ -2555,7 +2576,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop) if (IsFrozen()) return; - if (GetBuffer().IsEmpty()) + if (GetBuffer().IsEmpty() || !m_verticalScrollbarEnabled) { SetScrollbars(0, 0, 0, 0, 0, 0); return; @@ -2566,7 +2587,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop) int pixelsPerUnit = 5; wxSize clientSize = GetClientSize(); - int maxHeight = GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin(); + int maxHeight = (int) (0.5 + GetScale() * (GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin())); // Round up so we have at least maxHeight pixels int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5); @@ -2645,6 +2666,8 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size) bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType) { + SetFocusObject(& GetBuffer(), true); + bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType); if (success) m_filename = filename; @@ -2709,11 +2732,6 @@ wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image) // selection and ranges // ---------------------------------------------------------------------------- -void wxRichTextCtrl::SelectAll() -{ - SetSelection(-1, -1); -} - /// Select none void wxRichTextCtrl::SelectNone() { @@ -2855,7 +2873,7 @@ wxRichTextCtrl::FindContainerAtPoint(const wxPoint pt, long& position, int& hit, wxRichTextObject* contextObj = NULL; wxRichTextDrawingContext context(& GetBuffer()); - hit = GetBuffer().HitTest(dc, context, logicalPt, position, &hitObj, &contextObj, flags); + hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(logicalPt), position, &hitObj, &contextObj, flags); wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); return container; @@ -2924,6 +2942,8 @@ void wxRichTextCtrl::DoWriteText(const wxString& value, int flags) wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix); GetFocusObject()->InsertTextWithUndo(& GetBuffer(), m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + wxRichTextDrawingContext context(& GetBuffer()); + GetBuffer().Defragment(context); if ( flags & SetValue_SendEvent ) wxTextCtrl::SendTextUpdatedEvent(this); @@ -2994,6 +3014,13 @@ wxRichTextBox* wxRichTextCtrl::WriteTextBox(const wxRichTextAttr& textAttr) return box; } +wxRichTextField* wxRichTextCtrl::WriteField(const wxString& fieldType, const wxRichTextProperties& properties, + const wxRichTextAttr& textAttr) +{ + return GetFocusObject()->InsertFieldWithUndo(& GetBuffer(), m_caretPosition+1, fieldType, properties, + this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE, textAttr); +} + // Write a table at the current insertion point, returning the table. wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr, const wxRichTextAttr& cellAttr) { @@ -3146,6 +3173,7 @@ void wxRichTextCtrl::SetInsertionPoint(long pos) SelectNone(); m_caretPosition = pos - 1; + m_caretAtLineStart = true; PositionCaret(); @@ -3234,13 +3262,14 @@ void wxRichTextCtrl::Replace(long from, long to, SetSelection(from, to); - wxRichTextAttr attr = GetDefaultStyle(); + wxRichTextAttr attr(GetDefaultStyle()); DeleteSelectedContent(); SetDefaultStyle(attr); - DoWriteText(value, SetValue_SelectionOnly); + if (!value.IsEmpty()) + DoWriteText(value, SetValue_SelectionOnly); EndBatchUndo(); } @@ -3490,7 +3519,7 @@ int wxRichTextCtrl::PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool add { wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt)); wxRichTextDrawingContext context(& GetBuffer()); - int hit = GetBuffer().HitTest(dc, context, logicalPt, position, & hitObj, & contextObj); + int hit = GetBuffer().HitTest(dc, context, GetUnscaledPoint(logicalPt), position, & hitObj, & contextObj); if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER) { @@ -3584,9 +3613,9 @@ bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr return GetFocusObject()->SetStyle(range.ToInternal(), style); } -void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr) +void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags) { - GetFocusObject()->SetStyle(obj, textAttr); + GetFocusObject()->SetStyle(obj, textAttr, flags); } // extended style setting operation with flags including: @@ -3728,6 +3757,11 @@ void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container) wxRect caretRect; if (GetCaretPositionForIndex(GetCaretPosition(), caretRect, container)) { +#if !wxRICHTEXT_USE_OWN_CARET + caretRect = GetScaledRect(caretRect); +#endif + int topMargin = (int) (0.5 + GetScale()*GetBuffer().GetTopMargin()); + int bottomMargin = (int) (0.5 + GetScale()*GetBuffer().GetBottomMargin()); wxPoint newPt = caretRect.GetPosition(); wxSize newSz = caretRect.GetSize(); wxPoint pt = GetPhysicalPoint(newPt); @@ -3738,23 +3772,23 @@ void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container) GetCaret()->SetSize(newSz); // 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()))) + if (((pt.y + newSz.y) <= topMargin) || (pt.y >= (GetClientSize().y - bottomMargin))) { pt.x = -200; pt.y = -200; } - else if (pt.y < GetBuffer().GetTopMargin() && (pt.y + newSz.y) > GetBuffer().GetTopMargin()) + else if (pt.y < topMargin && (pt.y + newSz.y) > topMargin) { - newSz.y -= (GetBuffer().GetTopMargin() - pt.y); + newSz.y -= (topMargin - pt.y); if (newSz.y > 0) { - pt.y = GetBuffer().GetTopMargin(); + pt.y = topMargin; GetCaret()->SetSize(newSz); } } - else if (pt.y < (GetClientSize().y - GetBuffer().GetBottomMargin()) && (pt.y + newSz.y) > (GetClientSize().y - GetBuffer().GetBottomMargin())) + else if (pt.y < (GetClientSize().y - bottomMargin) && (pt.y + newSz.y) > (GetClientSize().y - bottomMargin)) { - newSz.y = GetClientSize().y - GetBuffer().GetBottomMargin() - pt.y; + newSz.y = GetClientSize().y - bottomMargin - pt.y; GetCaret()->SetSize(newSz); } @@ -3768,9 +3802,9 @@ void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container) bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container) { wxClientDC dc(this); - dc.SetFont(GetFont()); - PrepareDC(dc); + dc.SetUserScale(GetScale(), GetScale()); + dc.SetFont(GetFont()); wxPoint pt; int height = 0; @@ -3841,7 +3875,7 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect) { if (GetBuffer().IsDirty() || onlyVisibleRect) { - wxRect availableSpace(GetClientSize()); + wxRect availableSpace(GetUnscaledSize(GetClientSize())); if (availableSpace.width == 0) availableSpace.width = 10; if (availableSpace.height == 0) @@ -3851,21 +3885,24 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect) if (onlyVisibleRect) { flags |= wxRICHTEXT_LAYOUT_SPECIFIED_RECT; - availableSpace.SetPosition(GetLogicalPoint(wxPoint(0, 0))); + availableSpace.SetPosition(GetUnscaledPoint(GetLogicalPoint(wxPoint(0, 0)))); } wxClientDC dc(this); - dc.SetFont(GetFont()); PrepareDC(dc); + dc.SetFont(GetFont()); + dc.SetUserScale(GetScale(), GetScale()); wxRichTextDrawingContext context(& GetBuffer()); - GetBuffer().Defragment(); + GetBuffer().Defragment(context); GetBuffer().UpdateRanges(); // If items were deleted, ranges need recalculation GetBuffer().Layout(dc, context, availableSpace, availableSpace, flags); GetBuffer().Invalidate(wxRICHTEXT_NONE); - if (!IsFrozen()) + dc.SetUserScale(1.0, 1.0); + + if (!IsFrozen() && !onlyVisibleRect) SetupScrollbars(); } @@ -4105,7 +4142,7 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_RESET; - if (def->IsKindOf(CLASSINFO(wxRichTextListStyleDefinition))) + if (wxDynamicCast(def, wxRichTextListStyleDefinition)) { flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY; @@ -4125,7 +4162,7 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) bool isPara = false; // Make sure the attr has the style name - if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition))) + if (wxDynamicCast(def, wxRichTextParagraphStyleDefinition)) { isPara = true; attr.SetParagraphStyleName(def->GetName()); @@ -4135,12 +4172,12 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) // to change its style independently. flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY; } - else if (def->IsKindOf(CLASSINFO(wxRichTextCharacterStyleDefinition))) + else if (wxDynamicCast(def, wxRichTextCharacterStyleDefinition)) attr.SetCharacterStyleName(def->GetName()); - else if (def->IsKindOf(CLASSINFO(wxRichTextBoxStyleDefinition))) + else if (wxDynamicCast(def, wxRichTextBoxStyleDefinition)) attr.GetTextBoxAttr().SetBoxStyleName(def->GetName()); - if (def->IsKindOf(CLASSINFO(wxRichTextBoxStyleDefinition))) + if (wxDynamicCast(def, wxRichTextBoxStyleDefinition)) { if (GetFocusObject() && (GetFocusObject() != & GetBuffer())) { @@ -4227,7 +4264,7 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle() /// Returns the first visible position in the current view long wxRichTextCtrl::GetFirstVisiblePosition() const { - wxRichTextLine* line = GetFocusObject()->GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y); + wxRichTextLine* line = GetFocusObject()->GetLineAtYPosition(GetUnscaledPoint(GetLogicalPoint(wxPoint(0, 0))).y); if (line) return line->GetAbsoluteRange().GetStart(); else @@ -4313,6 +4350,61 @@ bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, co return GetFocusObject()->PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel); } +// Given a character position at which there is a list style, find the range +// encompassing the same list style by looking backwards and forwards. +wxRichTextRange wxRichTextCtrl::FindRangeForList(long pos, bool& isNumberedList) +{ + wxRichTextParagraphLayoutBox* focusObject = GetFocusObject(); + wxRichTextRange range = wxRichTextRange(-1, -1); + wxRichTextParagraph* para = focusObject->GetParagraphAtPosition(pos); + if (!para || !para->GetAttributes().HasListStyleName()) + return range; + else + { + wxString listStyle = para->GetAttributes().GetListStyleName(); + range = para->GetRange(); + + isNumberedList = para->GetAttributes().HasBulletNumber(); + + // Search back + wxRichTextObjectList::compatibility_iterator initialNode = focusObject->GetChildren().Find(para); + if (initialNode) + { + wxRichTextObjectList::compatibility_iterator startNode = initialNode->GetPrevious(); + while (startNode) + { + wxRichTextParagraph* p = wxDynamicCast(startNode->GetData(), wxRichTextParagraph); + if (p) + { + if (!p->GetAttributes().HasListStyleName() || p->GetAttributes().GetListStyleName() != listStyle) + break; + else + range.SetStart(p->GetRange().GetStart()); + } + + startNode = startNode->GetPrevious(); + } + + // Search forward + wxRichTextObjectList::compatibility_iterator endNode = initialNode->GetNext(); + while (endNode) + { + wxRichTextParagraph* p = wxDynamicCast(endNode->GetData(), wxRichTextParagraph); + if (p) + { + if (!p->GetAttributes().HasListStyleName() || p->GetAttributes().GetListStyleName() != listStyle) + break; + else + range.SetEnd(p->GetRange().GetEnd()); + } + + endNode = endNode->GetNext(); + } + } + } + return range; +} + /// Deletes the content in the given range bool wxRichTextCtrl::Delete(const wxRichTextRange& range) { @@ -4398,8 +4490,8 @@ bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextSelection& oldSel if (firstLine && lastLine) { wxSize clientSize = GetClientSize(); - wxPoint pt1 = GetPhysicalPoint(firstLine->GetAbsolutePosition()); - wxPoint pt2 = GetPhysicalPoint(lastLine->GetAbsolutePosition()) + wxPoint(0, lastLine->GetSize().y); + wxPoint pt1 = GetPhysicalPoint(GetScaledPoint(firstLine->GetAbsolutePosition())); + wxPoint pt2 = GetPhysicalPoint(GetScaledPoint(lastLine->GetAbsolutePosition())) + wxPoint(0, (int) (0.5 + lastLine->GetSize().y * GetScale())); pt1.x = 0; pt1.y = wxMax(0, pt1.y); @@ -4462,7 +4554,7 @@ bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setC SetDefaultStyleToCursorStyle(); wxRichTextEvent cmdEvent( - wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, + wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetPosition(m_caretPosition+1); @@ -4538,7 +4630,7 @@ bool wxRichTextDropSource::GiveFeedback(wxDragResult WXUNUSED(effect)) long position = 0; int hit = 0; wxRichTextObject* hitObj = NULL; - wxRichTextParagraphLayoutBox* container = m_rtc->FindContainerAtPoint(m_rtc->ScreenToClient(wxGetMousePosition()), position, hit, hitObj); + wxRichTextParagraphLayoutBox* container = m_rtc->FindContainerAtPoint(m_rtc->GetUnscaledPoint(m_rtc->ScreenToClient(wxGetMousePosition())), position, hit, hitObj); if (!(hit & wxRICHTEXT_HITTEST_NONE) && container && container->AcceptsFocus()) { @@ -4560,6 +4652,98 @@ bool wxRichTextCtrl::CanInsertContent(wxRichTextParagraphLayoutBox& WXUNUSED(con return true; } +void wxRichTextCtrl::EnableVerticalScrollbar(bool enable) +{ + m_verticalScrollbarEnabled = enable; + SetupScrollbars(); +} + +void wxRichTextCtrl::SetFontScale(double fontScale, bool refresh) +{ + GetBuffer().SetFontScale(fontScale); + if (refresh) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(); + } +} + +void wxRichTextCtrl::SetDimensionScale(double dimScale, bool refresh) +{ + GetBuffer().SetDimensionScale(dimScale); + if (refresh) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(); + } +} + +// Sets an overall scale factor for displaying and editing the content. +void wxRichTextCtrl::SetScale(double scale, bool refresh) +{ + m_scale = scale; + if (refresh) + { + GetBuffer().Invalidate(wxRICHTEXT_ALL); + Refresh(); + } +} + +// Get an unscaled point +wxPoint wxRichTextCtrl::GetUnscaledPoint(const wxPoint& pt) const +{ + if (GetScale() == 1.0) + return pt; + else + return wxPoint((int) (0.5 + double(pt.x) / GetScale()), (int) (0.5 + double(pt.y) / GetScale())); +} + +// Get a scaled point +wxPoint wxRichTextCtrl::GetScaledPoint(const wxPoint& pt) const +{ + if (GetScale() == 1.0) + return pt; + else + return wxPoint((int) (0.5 + double(pt.x) * GetScale()), (int) (0.5 + double(pt.y) * GetScale())); +} + +// Get an unscaled size +wxSize wxRichTextCtrl::GetUnscaledSize(const wxSize& sz) const +{ + if (GetScale() == 1.0) + return sz; + else + return wxSize((int) (0.5 + double(sz.x) / GetScale()), (int) (0.5 + double(sz.y) / GetScale())); +} + +// Get a scaled size +wxSize wxRichTextCtrl::GetScaledSize(const wxSize& sz) const +{ + if (GetScale() == 1.0) + return sz; + else + return wxSize((int) (0.5 + double(sz.x) * GetScale()), (int) (0.5 + double(sz.y) * GetScale())); +} + +// Get an unscaled rect +wxRect wxRichTextCtrl::GetUnscaledRect(const wxRect& rect) const +{ + if (GetScale() == 1.0) + return rect; + else + return wxRect((int) (0.5 + double(rect.x) / GetScale()), (int) (0.5 + double(rect.y) / GetScale()), + (int) (0.5 + double(rect.width) / GetScale()), (int) (0.5 + double(rect.height) / GetScale())); +} + +// Get a scaled rect +wxRect wxRichTextCtrl::GetScaledRect(const wxRect& rect) const +{ + if (GetScale() == 1.0) + return rect; + else + return wxRect((int) (0.5 + double(rect.x) * GetScale()), (int) (0.5 + double(rect.y) * GetScale()), + (int) (0.5 + double(rect.width) * GetScale()), (int) (0.5 + double(rect.height) * GetScale())); +} #if wxRICHTEXT_USE_OWN_CARET @@ -4617,8 +4801,9 @@ void wxRichTextCaret::DoMove() { if (m_richTextCtrl && m_refreshEnabled) { - wxRect rect(GetPosition(), GetSize()); - m_richTextCtrl->RefreshRect(rect, false); + wxRect rect(wxPoint(m_xOld, m_yOld), GetSize()); + wxRect scaledRect = m_richTextCtrl->GetScaledRect(rect); + m_richTextCtrl->RefreshRect(scaledRect, false); } } } @@ -4669,7 +4854,8 @@ void wxRichTextCaret::Refresh() if (m_richTextCtrl && m_refreshEnabled) { wxRect rect(GetPosition(), GetSize()); - m_richTextCtrl->RefreshRect(rect, false); + wxRect rectScaled = m_richTextCtrl->GetScaledRect(rect); + m_richTextCtrl->RefreshRect(rectScaled, false); } }