X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/603f702b4a0e19ffa27cffc52872efaac1aa8c54..8a07956565ddccd1720abf4e510945593128d774:/src/richtext/richtextctrl.cpp diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index dcb37f5227..34face1aa8 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/richtext/richeditctrl.cpp +// Name: src/richtext/richtextctrl.cpp // Purpose: A rich edit control // Author: Julian Smart // Modified by: @@ -230,7 +230,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va validator, name)) return false; - if (!GetFont().Ok()) + if (!GetFont().IsOk()) { SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } @@ -249,7 +249,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va attributes.SetLineSpacing(10); attributes.SetParagraphSpacingAfter(10); attributes.SetParagraphSpacingBefore(0); - + SetBasicStyle(attributes); int margin = 5; @@ -436,7 +436,7 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) int flags = 0; if ((GetExtraStyle() & wxRICHTEXT_EX_NO_GUIDELINES) == 0) flags |= wxRICHTEXT_DRAW_GUIDELINES; - + GetBuffer().Draw(dc, GetBuffer().GetOwnRange(), GetSelection(), drawingArea, 0 /* descent */, flags); dc.DestroyClippingRegion(); @@ -525,7 +525,7 @@ bool wxRichTextCtrl::SetCaretPositionAfterClick(wxRichTextParagraphLayoutBox* co MoveCaret(position, caretAtLineStart); SetDefaultStyleToCursorStyle(); - + return true; } @@ -552,7 +552,7 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) { SetFocusObject(container, false /* don't set caret position yet */); } - + m_dragStart = event.GetLogicalPosition(dc); m_dragging = true; CaptureMouse(); @@ -652,9 +652,9 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) wxPoint logicalPt = event.GetLogicalPosition(dc); wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; - + int flags = 0; - + // If we're dragging, let's only consider positions at this level; otherwise // selecting a range is not going to work. wxRichTextParagraphLayoutBox* container = & GetBuffer(); @@ -664,7 +664,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) container = GetFocusObject(); } int hit = container->HitTest(dc, logicalPt, position, & hitObj, & contextObj, flags); - + // See if we need to change the cursor { @@ -693,7 +693,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) event.Skip(); return; } - + if (m_dragging) { wxRichTextParagraphLayoutBox* commonAncestor = NULL; @@ -719,7 +719,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) // is the common ancestor. commonAncestor = wxDynamicCast(firstContainer->GetParent(), wxRichTextParagraphLayoutBox); } - + if (commonAncestor && commonAncestor->HandlesChildSelections()) { wxRichTextObject* p = hitObj2; @@ -761,7 +761,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) if (otherContainer->AcceptsFocus()) SetFocusObject(otherContainer, false /* don't set caret and clear selection */); - MoveCaret(-1, false); + MoveCaret(-1, false); SetDefaultStyleToCursorStyle(); } } @@ -778,7 +778,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) void wxRichTextCtrl::OnRightClick(wxMouseEvent& event) { SetFocus(); - + wxClientDC dc(this); PrepareDC(dc); dc.SetFont(GetFont()); @@ -1221,6 +1221,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) SetDefaultStyleToCursorStyle(); ScrollIntoView(m_caretPosition, WXK_RIGHT); + cmdEvent.SetPosition(m_caretPosition); GetEventHandler()->ProcessEvent(cmdEvent); Update(); @@ -1359,9 +1360,9 @@ bool wxRichTextCtrl::ExtendSelection(long oldPos, long newPos, int flags) return false; wxRichTextSelection oldSelection = m_selection; - + m_selection.SetContainer(GetFocusObject()); - + wxRichTextRange oldRange; if (m_selection.IsValid()) oldRange = m_selection.GetRange(); @@ -1390,7 +1391,7 @@ bool wxRichTextCtrl::ExtendSelection(long oldPos, long newPos, int flags) else newRange.SetRange(newPos+1, m_selectionAnchor); } - + m_selection.SetRange(newRange); RefreshForSelectionChange(oldSelection, m_selection); @@ -1434,7 +1435,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode) bool scrolled = false; wxSize clientSize = GetClientSize(); - + int leftMargin, rightMargin, topMargin, bottomMargin; { @@ -1568,7 +1569,7 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const wxSize clientSize = GetClientSize(); clientSize.y -= GetBuffer().GetBottomMargin(); - return (rect.GetBottom() > (startY + GetBuffer().GetTopMargin())) && (rect.GetTop() < (startY + clientSize.y)); + return (rect.GetTop() >= (startY + GetBuffer().GetTopMargin())) && (rect.GetBottom() <= (startY + clientSize.y)); } void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart) @@ -1780,7 +1781,7 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) long lineNumber = GetFocusObject()->GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart); wxPoint pt = GetCaret()->GetPosition(); - long newLine = lineNumber + noLines; + long newLine = lineNumber + noLines; bool notInThisObject = false; if (lineNumber != -1) @@ -1797,17 +1798,17 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) notInThisObject = true; } } - + wxRichTextParagraphLayoutBox* container = GetFocusObject(); - int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS; + int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS; if (notInThisObject) { // If we know we're navigating out of the current object, // try to find an object anywhere in the buffer at the new position (up or down a bit) container = & GetBuffer(); - hitTestFlags = 0; - + hitTestFlags &= ~wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS; + if (noLines > 0) // going down { pt.y = GetFocusObject()->GetPosition().y + GetFocusObject()->GetCachedSize().y + 2; @@ -1835,7 +1836,10 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) wxRichTextObject* contextObj = NULL; int hitTest = container->HitTest(dc, pt, newPos, & hitObj, & contextObj, hitTestFlags); - if (hitTest != wxRICHTEXT_HITTEST_NONE && hitObj) + if (hitObj && + ((hitTest & wxRICHTEXT_HITTEST_NONE) == 0) && + (! (hitObj == (& m_buffer) && ((hitTest & wxRICHTEXT_HITTEST_OUTSIDE) != 0))) // outside the buffer counts as 'do nothing' + ) { if (notInThisObject) { @@ -1843,11 +1847,11 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags) if (actualContainer && actualContainer != GetFocusObject() && actualContainer->AcceptsFocus()) { SetFocusObject(actualContainer, false /* don't set caret position yet */); - + container = actualContainer; } } - + bool caretLineStart = true; long caretPosition = FindCaretPositionForCharacterPosition(newPos, hitTest, container, caretLineStart); long newSelEnd = caretPosition; @@ -2200,6 +2204,19 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event) event.Skip(); } +// Force any pending layout due to large buffer +void wxRichTextCtrl::ForceDelayedLayout() +{ + if (m_fullLayoutRequired) + { + m_fullLayoutRequired = false; + m_fullLayoutTime = 0; + GetBuffer().Invalidate(wxRICHTEXT_ALL); + ShowPosition(m_fullLayoutSavedPosition); + Refresh(false); + Update(); + } +} /// Idle-time processing void wxRichTextCtrl::OnIdle(wxIdleEvent& event) @@ -2306,7 +2323,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop) void wxRichTextCtrl::PaintBackground(wxDC& dc) { wxColour backgroundColour = GetBackgroundColour(); - if (!backgroundColour.Ok()) + if (!backgroundColour.IsOk()) backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); // Clear the background @@ -2333,9 +2350,9 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size) if (sz.x < 1 || sz.y < 1) return false; - if (!m_bufferBitmap.Ok() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y) + if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y) m_bufferBitmap = wxBitmap(sz.x, sz.y); - return m_bufferBitmap.Ok(); + return m_bufferBitmap.IsOk(); } #endif @@ -2391,6 +2408,7 @@ bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType) wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text) { wxRichTextRange range = GetFocusObject()->AddParagraph(text); + GetBuffer().Invalidate(); LayoutContent(); return range; } @@ -2399,6 +2417,7 @@ wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text) wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image) { wxRichTextRange range = GetFocusObject()->AddImage(image); + GetBuffer().Invalidate(); LayoutContent(); return range; } @@ -2645,12 +2664,12 @@ bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock, const wx bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType, const wxRichTextAttr& textAttr) { - if (bitmap.Ok()) + if (bitmap.IsOk()) { wxRichTextImageBlock imageBlock; wxImage image = bitmap.ConvertToImage(); - if (image.Ok() && imageBlock.MakeImageBlock(image, bitmapType)) + if (image.IsOk() && imageBlock.MakeImageBlock(image, bitmapType)) return WriteImage(imageBlock, textAttr); } @@ -2684,7 +2703,7 @@ wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichText wxRichTextTable* table = new wxRichTextTable; table->SetAttributes(tableAttr); table->SetParent(& GetBuffer()); // set parent temporarily for AddParagraph to use correct style - + table->CreateTable(rows, cols); table->SetParent(NULL); @@ -3007,12 +3026,12 @@ void wxRichTextCtrl::Redo() bool wxRichTextCtrl::CanUndo() const { - return GetCommandProcessor()->CanUndo(); + return GetCommandProcessor()->CanUndo() && IsEditable(); } bool wxRichTextCtrl::CanRedo() const { - return GetCommandProcessor()->CanRedo(); + return GetCommandProcessor()->CanRedo() && IsEditable(); } // ---------------------------------------------------------------------------- @@ -3153,9 +3172,9 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event) wxRichTextObject* hitObj = NULL; wxRichTextObject* contextObj = NULL; int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj); - + m_contextMenuPropertiesInfo.Clear(); - + if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER) { wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox); @@ -3166,7 +3185,7 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event) SetFocusObject(actualContainer, false /* don't set caret position yet */); SetCaretPositionAfterClick(actualContainer, position, hit); } - + m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj); } else @@ -3376,7 +3395,7 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect, wxRic wxPoint pt; int height = 0; - + if (!container) container = GetFocusObject(); @@ -3890,7 +3909,7 @@ bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextSelection& oldSel Refresh(false); return true; } - + wxRichTextRange oldRange, newRange; if (oldSelection.IsValid()) oldRange = oldSelection.GetRange(); @@ -3900,7 +3919,7 @@ bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextSelection& oldSel newRange = newSelection.GetRange(); else newRange = wxRICHTEXT_NO_SELECTION; - + // Calculate the refresh rectangle - just the affected lines long firstPos, lastPos; if (oldRange.GetStart() == -2 && newRange.GetStart() != -2) @@ -3953,7 +3972,7 @@ bool wxRichTextCtrl::DoSetMargins(const wxPoint& pt) GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetRight().SetValue(pt.x, wxTEXT_ATTR_UNITS_PIXELS); GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetTop().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS); GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS); - + return true; } @@ -3972,7 +3991,7 @@ bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setC bool changingContainer = (m_focusObject != obj); m_focusObject = obj; - + if (!obj) m_focusObject = & m_buffer; @@ -3984,7 +4003,7 @@ bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setC m_selectionState = wxRichTextCtrlSelectionState_Normal; long pos = -1; - + m_caretAtLineStart = false; MoveCaret(pos, m_caretAtLineStart); SetDefaultStyleToCursorStyle(); @@ -4168,7 +4187,7 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd if (GetCount() == 0) { menu->SetLabel(startCmd, _("&Properties")); - + // Delete the others if necessary int i; for (i = startCmd+1; i < startCmd+3; i++) @@ -4193,7 +4212,7 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd break; } } - + if (pos != -1) { int insertBefore = pos+1; @@ -4212,7 +4231,7 @@ int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd } insertBefore ++; } - + // Delete any old items still left on the menu for (i = startCmd + GetCount(); i < startCmd+3; i++) {