attributes.SetLineSpacing(10);
attributes.SetParagraphSpacingAfter(10);
attributes.SetParagraphSpacingBefore(0);
-
SetBasicStyle(attributes);
int margin = 5;
m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;
m_caretPositionForDefaultStyle = -2;
m_focusObject = & m_buffer;
+ m_scale = 1.0;
}
void wxRichTextCtrl::DoThaw()
// 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();
}
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();
((wxRichTextCaret*) GetCaret())->DoDraw(& dc);
}
#endif
+
+ dc.SetUserScale(1.0, 1.0);
}
#if !wxRICHTEXT_USE_OWN_CARET
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
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)
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())
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
if (m_dragging
#if wxUSE_DRAG_AND_DROP
&& !m_preDrag
-#endif
&& (distance > 4)
+#endif
)
{
wxRichTextParagraphLayoutBox* commonAncestor = NULL;
// 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
if (hitObj && m_dragging && hit != wxRICHTEXT_HITTEST_NONE && m_selectionState == wxRichTextCtrlSelectionState_Normal
#if wxUSE_DRAG_AND_DROP
&& !m_preDrag
-#endif
&& (distance > 4)
+#endif
)
{
SetCaretPositionAfterClick(container, position, hit, true /* extend selection */);
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())
{
ScrollIntoView(m_caretPosition, WXK_LEFT);
// Always send this event; wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion.
- //if (deletions > 0)
{
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_DELETE,
ScrollIntoView(m_caretPosition, WXK_LEFT);
// Always send this event; wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion.
- //if (deletions > 0)
{
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_DELETE,
ScrollIntoView(m_caretPosition, WXK_LEFT);
// Always send this event; wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion.
- //if (deletions > 0)
{
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_DELETE,
if (ppuY != 0)
syUnits = sy/ppuY;
- wxRect rect = line->GetRect();
+ wxRect rect = GetScaledRect(line->GetRect());
bool scrolled = false;
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)
{
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)
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)
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)
}
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;
if (notInThisObject)
{
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);
bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
{
+ SetFocusObject(& GetBuffer(), true);
+
bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType);
if (success)
m_filename = filename;
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;
wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix);
GetFocusObject()->InsertTextWithUndo(& GetBuffer(), m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ GetBuffer().Defragment();
if ( flags & SetValue_SendEvent )
wxTextCtrl::SendTextUpdatedEvent(this);
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)
{
{
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)
{
wxRect caretRect;
if (GetCaretPositionForIndex(GetCaretPosition(), caretRect, container))
{
+ caretRect = GetScaledRect(caretRect);
+ 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);
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);
}
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;
{
if (GetBuffer().IsDirty() || onlyVisibleRect)
{
- wxRect availableSpace(GetClientSize());
+ wxRect availableSpace(GetUnscaledSize(GetClientSize()));
if (availableSpace.width == 0)
availableSpace.width = 10;
if (availableSpace.height == 0)
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());
wxRichTextDrawingContext context(& GetBuffer());
GetBuffer().Defragment();
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;
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());
// 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()))
{
/// 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
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);
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())
{
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
projects / wxWidgets.git / blobdiff