#include "wx/richtext/richtextctrl.h"
#include "wx/richtext/richtextstyles.h"
#include "wx/richtext/richtextimagedlg.h"
+#include "wx/richtext/richtextsizepage.h"
+#include "wx/richtext/richtextxml.h"
#include "wx/listimpl.cpp"
#include "wx/arrimpl.cpp"
class wxRichTextFloatCollector
{
public:
- wxRichTextFloatCollector(int width);
+ wxRichTextFloatCollector(const wxRect& availableRect);
~wxRichTextFloatCollector();
// Collect the floating objects info in the given paragraph
int GetLastRectBottom();
// Draw the floats inside a rect
- void Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style);
+ void Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
// HitTest the floats
- int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition);
+ int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int flags);
+
+ // Get floating object count
+ int GetFloatingObjectCount() const { return m_left.GetCount() + m_right.GetCount(); }
+
+ // Get floating objects
+ bool GetFloatingObjects(wxRichTextObjectList& objects) const;
+
+ // Delete a float
+ bool DeleteFloat(wxRichTextObject* obj);
+
+ // Do we have this float already?
+ bool HasFloat(wxRichTextObject* obj);
+
+ bool HasFloats() const { return m_left.GetCount() >0 || m_right.GetCount() > 0; }
static int SearchAdjacentRect(const wxRichTextFloatRectMapArray& array, int point);
static void FreeFloatRectMapArray(wxRichTextFloatRectMapArray& array);
- static void DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style);
+ static void DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
- static int HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), const wxPoint& pt, long& textPosition);
+ static int HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int flags);
private:
wxRichTextFloatRectMapArray m_left;
wxRichTextFloatRectMapArray m_right;
- int m_width;
+ //int m_width;
+ wxRect m_availableRect;
wxRichTextParagraph* m_para;
};
+// Delete a float
+bool wxRichTextFloatCollector::DeleteFloat(wxRichTextObject* obj)
+{
+ size_t i;
+ for (i = 0; i < m_left.GetCount(); i++)
+ {
+ if (m_left[i]->anchor == obj)
+ {
+ m_left.RemoveAt(i);
+ return true;
+ }
+ }
+ for (i = 0; i < m_right.GetCount(); i++)
+ {
+ if (m_right[i]->anchor == obj)
+ {
+ m_right.RemoveAt(i);
+ return true;
+ }
+ }
+ return false;
+}
+
+// Do we have this float already?
+bool wxRichTextFloatCollector::HasFloat(wxRichTextObject* obj)
+{
+ size_t i;
+ for (i = 0; i < m_left.GetCount(); i++)
+ {
+ if (m_left[i]->anchor == obj)
+ {
+ return true;
+ }
+ }
+ for (i = 0; i < m_right.GetCount(); i++)
+ {
+ if (m_right[i]->anchor == obj)
+ {
+ return true;
+ }
+ }
+ return false;
+}
+
+// Get floating objects
+bool wxRichTextFloatCollector::GetFloatingObjects(wxRichTextObjectList& objects) const
+{
+ size_t i;
+ for (i = 0; i < m_left.GetCount(); i++)
+ objects.Append(m_left[i]->anchor);
+ for (i = 0; i < m_right.GetCount(); i++)
+ objects.Append(m_right[i]->anchor);
+ return true;
+}
+
+
/*
* Binary search helper function
* The argument point is the Y coordinate, and this fuction
return ret;
}
-wxRichTextFloatCollector::wxRichTextFloatCollector(int width) : m_left(wxRichTextFloatRectMapCmp), m_right(wxRichTextFloatRectMapCmp)
+wxRichTextFloatCollector::wxRichTextFloatCollector(const wxRect& rect) : m_left(wxRichTextFloatRectMapCmp), m_right(wxRichTextFloatRectMapCmp)
{
- m_width = width;
+ m_availableRect = rect;
m_para = NULL;
}
if (array.GetCount() == 0)
return start;
- unsigned int i = SearchAdjacentRect(array, start);
+ int i = SearchAdjacentRect(array, start);
int last = start;
- while (i < array.GetCount())
+ while (i < (int) array.GetCount())
{
if (array[i]->startY - last >= height)
return last + 1;
}
}
+// Adds a floating image to the float collector.
+// The actual positioning is done by wxRichTextParagraph::LayoutFloat.
void wxRichTextFloatCollector::CollectFloat(wxRichTextParagraph* para, wxRichTextObject* floating)
{
- int direction = floating->GetFloatDirection();
+ int direction = floating->GetFloatDirection();
- wxPoint pos = floating->GetPosition();
- wxSize size = floating->GetCachedSize();
- wxRichTextFloatRectMap *map = new wxRichTextFloatRectMap(pos.y, pos.y + size.y, size.x, floating);
- switch (direction)
- {
- case wxTEXT_BOX_ATTR_FLOAT_NONE:
- delete map;
- break;
- case wxTEXT_BOX_ATTR_FLOAT_LEFT:
- // Just a not-enough simple assertion
- wxASSERT (m_left.Index(map) == wxNOT_FOUND);
- m_left.Add(map);
- break;
- case wxTEXT_BOX_ATTR_FLOAT_RIGHT:
- wxASSERT (m_right.Index(map) == wxNOT_FOUND);
- m_right.Add(map);
- break;
- default:
- delete map;
- wxASSERT("Must some error occurs");
- }
+ wxPoint pos = floating->GetPosition();
+ wxSize size = floating->GetCachedSize();
+ wxRichTextFloatRectMap *map = new wxRichTextFloatRectMap(pos.y, pos.y + size.y, size.x, floating);
+ switch (direction)
+ {
+ case wxTEXT_BOX_ATTR_FLOAT_NONE:
+ delete map;
+ break;
+ case wxTEXT_BOX_ATTR_FLOAT_LEFT:
+ // Just a not-enough simple assertion
+ wxASSERT (m_left.Index(map) == wxNOT_FOUND);
+ m_left.Add(map);
+ break;
+ case wxTEXT_BOX_ATTR_FLOAT_RIGHT:
+ wxASSERT (m_right.Index(map) == wxNOT_FOUND);
+ m_right.Add(map);
+ break;
+ default:
+ delete map;
+ wxASSERT("Unrecognised float attribute.");
+ }
- m_para = para;
+ m_para = para;
}
void wxRichTextFloatCollector::CollectFloat(wxRichTextParagraph* para)
int widthLeft = 0, widthRight = 0;
if (m_left.GetCount() != 0)
{
- unsigned int i = SearchAdjacentRect(m_left, startY);
- if (i >= 0 && i < m_left.GetCount())
+ int i = SearchAdjacentRect(m_left, startY);
+ if (i < (int) m_left.GetCount())
widthLeft = GetWidthFromFloatRect(m_left, i, startY, endY);
}
if (m_right.GetCount() != 0)
{
- unsigned int j = SearchAdjacentRect(m_right, startY);
- if (j >= 0 && j < m_right.GetCount())
+ int j = SearchAdjacentRect(m_right, startY);
+ if (j < (int) m_right.GetCount())
widthRight = GetWidthFromFloatRect(m_right, j, startY, endY);
}
- return wxRect(widthLeft, 0, m_width - widthLeft - widthRight, 0);
+ // TODO: actually we want to use the actual image positions to find the
+ // available remaining space, since the image might not be right up against
+ // the left or right edge of the container.
+ return wxRect(widthLeft + m_availableRect.x, 0, m_availableRect.width - widthLeft - widthRight, 0);
}
int wxRichTextFloatCollector::GetLastRectBottom()
return ret;
}
-void wxRichTextFloatCollector::DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& WXUNUSED(selectionRange), const wxRect& rect, int descent, int style)
+void wxRichTextFloatCollector::DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& WXUNUSED(range), const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
{
int start = rect.y;
int end = rect.y + rect.height;
- unsigned int i, j;
+ int i, j;
i = SearchAdjacentRect(array, start);
- if (i < 0 || i >= array.GetCount())
+ if (i < 0 || i >= (int) array.GetCount())
return;
j = SearchAdjacentRect(array, end);
- if (j < 0 || j >= array.GetCount())
+ if (j < 0 || j >= (int) array.GetCount())
j = array.GetCount() - 1;
while (i <= j)
{
wxRichTextObject* obj = array[i]->anchor;
wxRichTextRange r = obj->GetRange();
- obj->Draw(dc, r, wxRichTextRange(0, -1), wxRect(obj->GetPosition(), obj->GetCachedSize()), descent, style);
+ obj->Draw(dc, context, r, selection, wxRect(obj->GetPosition(), obj->GetCachedSize()), descent, style);
i++;
}
}
-void wxRichTextFloatCollector::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style)
+void wxRichTextFloatCollector::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
{
if (m_left.GetCount() > 0)
- DrawFloat(m_left, dc, range, selectionRange, rect, descent, style);
+ DrawFloat(m_left, dc, context, range, selection, rect, descent, style);
if (m_right.GetCount() > 0)
- DrawFloat(m_right, dc, range, selectionRange, rect, descent, style);
+ DrawFloat(m_right, dc, context, range, selection, rect, descent, style);
}
-int wxRichTextFloatCollector::HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), const wxPoint& pt, long& textPosition)
+int wxRichTextFloatCollector::HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), wxRichTextDrawingContext& WXUNUSED(context), const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int WXUNUSED(flags))
{
- unsigned int i;
+ int i;
if (array.GetCount() == 0)
return wxRICHTEXT_HITTEST_NONE;
i = SearchAdjacentRect(array, pt.y);
- if (i < 0 || i >= array.GetCount())
+ if (i < 0 || i >= (int) array.GetCount())
return wxRICHTEXT_HITTEST_NONE;
+ if (!array[i]->anchor->IsShown())
+ return wxRICHTEXT_HITTEST_NONE;
+
wxPoint point = array[i]->anchor->GetPosition();
wxSize size = array[i]->anchor->GetCachedSize();
if (point.x <= pt.x && point.x + size.x >= pt.x
&& point.y <= pt.y && point.y + size.y >= pt.y)
{
textPosition = array[i]->anchor->GetRange().GetStart();
+ * obj = array[i]->anchor;
if (pt.x > (pt.x + pt.x + size.x) / 2)
return wxRICHTEXT_HITTEST_BEFORE;
else
return wxRICHTEXT_HITTEST_NONE;
}
-int wxRichTextFloatCollector::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)
+int wxRichTextFloatCollector::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int flags)
{
- int ret = HitTestFloat(m_left, dc, pt, textPosition);
+ int ret = HitTestFloat(m_left, dc, context, pt, textPosition, obj, flags);
if (ret == wxRICHTEXT_HITTEST_NONE)
{
- ret = HitTestFloat(m_right, dc, pt, textPosition);
+ ret = HitTestFloat(m_right, dc, context, pt, textPosition, obj, flags);
}
return ret;
}
// Helpers for efficiency
inline void wxCheckSetFont(wxDC& dc, const wxFont& font)
{
- // JACS: did I do this some time ago when testing? Should we re-enable it?
-#if 0
- const wxFont& font1 = dc.GetFont();
- if (font1.IsOk() && font.IsOk())
- {
- if (font1.GetPointSize() == font.GetPointSize() &&
- font1.GetFamily() == font.GetFamily() &&
- font1.GetStyle() == font.GetStyle() &&
- font1.GetWeight() == font.GetWeight() &&
- font1.GetUnderlined() == font.GetUnderlined() &&
- font1.GetFamily() == font.GetFamily() &&
- font1.GetFaceName() == font.GetFaceName())
- return;
- }
-#endif
dc.SetFont(font);
}
wxRichTextObject::wxRichTextObject(wxRichTextObject* parent)
{
- m_dirty = false;
m_refCount = 1;
m_parent = parent;
- m_leftMargin = 0;
- m_rightMargin = 0;
- m_topMargin = 0;
- m_bottomMargin = 0;
m_descent = 0;
+ m_show = true;
}
wxRichTextObject::~wxRichTextObject()
void wxRichTextObject::Copy(const wxRichTextObject& obj)
{
m_size = obj.m_size;
+ m_maxSize = obj.m_maxSize;
+ m_minSize = obj.m_minSize;
m_pos = obj.m_pos;
- m_dirty = obj.m_dirty;
m_range = obj.m_range;
+ m_ownRange = obj.m_ownRange;
m_attributes = obj.m_attributes;
m_properties = obj.m_properties;
m_descent = obj.m_descent;
+ m_show = obj.m_show;
+}
+
+// Get/set the top-level container of this object.
+wxRichTextParagraphLayoutBox* wxRichTextObject::GetContainer() const
+{
+ const wxRichTextObject* p = this;
+ while (p)
+ {
+ if (p->IsTopLevel())
+ {
+ return wxDynamicCast(p, wxRichTextParagraphLayoutBox);
+ }
+ p = p->GetParent();
+ }
+ return NULL;
}
void wxRichTextObject::SetMargins(int margin)
{
- m_leftMargin = m_rightMargin = m_topMargin = m_bottomMargin = margin;
+ SetMargins(margin, margin, margin, margin);
}
void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin, int bottomMargin)
{
- m_leftMargin = leftMargin;
- m_rightMargin = rightMargin;
- m_topMargin = topMargin;
- m_bottomMargin = bottomMargin;
+ GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().SetValue(leftMargin, wxTEXT_ATTR_UNITS_PIXELS);
+ GetAttributes().GetTextBoxAttr().GetMargins().GetRight().SetValue(rightMargin, wxTEXT_ATTR_UNITS_PIXELS);
+ GetAttributes().GetTextBoxAttr().GetMargins().GetTop().SetValue(topMargin, wxTEXT_ATTR_UNITS_PIXELS);
+ GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().SetValue(bottomMargin, wxTEXT_ATTR_UNITS_PIXELS);
+}
+
+int wxRichTextObject::GetLeftMargin() const
+{
+ return GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().GetValue();
+}
+
+int wxRichTextObject::GetRightMargin() const
+{
+ return GetAttributes().GetTextBoxAttr().GetMargins().GetRight().GetValue();
+}
+
+int wxRichTextObject::GetTopMargin() const
+{
+ return GetAttributes().GetTextBoxAttr().GetMargins().GetTop().GetValue();
+}
+
+int wxRichTextObject::GetBottomMargin() const
+{
+ return GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().GetValue();
+}
+
+// Calculate the available content space in the given rectangle, given the
+// margins, border and padding specified in the object's attributes.
+wxRect wxRichTextObject::GetAvailableContentArea(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& outerRect) const
+{
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ marginRect = outerRect;
+ wxRichTextAttr attr(GetAttributes());
+ context.ApplyVirtualAttributes(attr, (wxRichTextObject*) this);
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ return contentRect;
+}
+
+// Invalidate the buffer. With no argument, invalidates whole buffer.
+void wxRichTextObject::Invalidate(const wxRichTextRange& invalidRange)
+{
+ if (invalidRange != wxRICHTEXT_NONE)
+ {
+ // If this is a floating object, size may not be recalculated
+ // after floats have been collected in an early stage of Layout.
+ // So avoid resetting the cache for floating objects during layout.
+ if (!IsFloating())
+ SetCachedSize(wxDefaultSize);
+ SetMaxSize(wxDefaultSize);
+ SetMinSize(wxDefaultSize);
+ }
}
// Convert units in tenths of a millimetre to device units
// Unscale
double scale = 1.0;
if (GetBuffer())
- scale = GetBuffer()->GetScale();
+ scale = GetBuffer()->GetScale() / GetBuffer()->GetDimensionScale();
int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units, scale);
return p;
if (scale != 1.0)
pixels /= scale;
+ // If the result is very small, make it at least one pixel in size.
+ if (pixels == 0 && units > 0)
+ pixels = 1;
+
return (int) pixels;
}
}
// Draw the borders and background for the given rectangle and attributes.
-// Width and height are taken to be the content size, so excluding any
-// border, margin and padding.
-bool wxRichTextObject::DrawBoxAttributes(wxDC& dc, const wxRichTextAttr& attr, const wxRect& boxRect)
+// Width and height are taken to be the outer margin size, not the content.
+bool wxRichTextObject::DrawBoxAttributes(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, const wxRect& boxRect, int flags)
{
// Assume boxRect is the area around the content
- wxRect contentRect = boxRect;
- wxRect marginRect, borderRect, paddingRect, outlineRect;
+ wxRect marginRect = boxRect;
+ wxRect contentRect, borderRect, paddingRect, outlineRect;
- GetBoxRects(dc, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
// Margin is transparent. Draw background from margin.
- if (attr.HasBackgroundColour())
+ if (attr.HasBackgroundColour() || (flags & wxRICHTEXT_DRAW_SELECTED))
{
- wxPen pen(attr.GetBackgroundColour());
- wxBrush brush(attr.GetBackgroundColour());
+ wxColour colour;
+ if (flags & wxRICHTEXT_DRAW_SELECTED)
+ {
+ // TODO: get selection colour from control?
+ colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+ }
+ else
+ colour = attr.GetBackgroundColour();
+
+ wxPen pen(colour);
+ wxBrush brush(colour);
dc.SetPen(pen);
dc.SetBrush(brush);
- dc.DrawRectangle(marginRect);
+ dc.DrawRectangle(borderRect);
+ }
+
+ if (flags & wxRICHTEXT_DRAW_GUIDELINES)
+ {
+ wxRichTextAttr editBorderAttr = attr;
+ // TODO: make guideline colour configurable
+ editBorderAttr.GetTextBoxAttr().GetBorder().SetColour(*wxLIGHT_GREY);
+ editBorderAttr.GetTextBoxAttr().GetBorder().SetWidth(1, wxTEXT_ATTR_UNITS_PIXELS);
+ editBorderAttr.GetTextBoxAttr().GetBorder().SetStyle(wxTEXT_BOX_ATTR_BORDER_SOLID);
+
+ DrawBorder(dc, buffer, editBorderAttr.GetTextBoxAttr().GetBorder(), borderRect, flags);
}
- if (attr.GetTextBoxAttr().GetBorder().HasBorder())
- DrawBorder(dc, attr.GetTextBoxAttr().GetBorder(), borderRect);
+ if (attr.GetTextBoxAttr().GetBorder().IsValid())
+ DrawBorder(dc, buffer, attr.GetTextBoxAttr().GetBorder(), borderRect);
- if (attr.GetTextBoxAttr().GetOutline().HasBorder())
- DrawBorder(dc, attr.GetTextBoxAttr().GetOutline(), outlineRect);
+ if (attr.GetTextBoxAttr().GetOutline().IsValid())
+ DrawBorder(dc, buffer, attr.GetTextBoxAttr().GetOutline(), outlineRect);
return true;
}
// Draw a border
-bool wxRichTextObject::DrawBorder(wxDC& dc, const wxTextAttrBorders& attr, const wxRect& rect)
+bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTextAttrBorders& attr, const wxRect& rect, int WXUNUSED(flags))
{
int borderLeft = 0, borderRight = 0, borderTop = 0, borderBottom = 0;
- wxTextAttrDimensionConverter converter(dc);
+ wxTextAttrDimensionConverter converter(dc, buffer ? buffer->GetScale() : 1.0);
- if (attr.GetLeft().IsValid())
+ if (attr.GetLeft().IsValid() && attr.GetLeft().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
{
borderLeft = converter.GetPixels(attr.GetLeft().GetWidth());
wxColour col(attr.GetLeft().GetColour());
penStyle = wxDOT;
else if (attr.GetLeft().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
penStyle = wxLONG_DASH;
- wxPen pen(col);
+ wxPen pen(col, 1, penStyle);
dc.SetPen(pen);
dc.DrawLine(rect.x, rect.y, rect.x, rect.y + rect.height);
}
}
- if (attr.GetRight().IsValid())
+ if (attr.GetRight().IsValid() && attr.GetRight().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
{
borderRight = converter.GetPixels(attr.GetRight().GetWidth());
penStyle = wxDOT;
else if (attr.GetRight().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
penStyle = wxLONG_DASH;
- wxPen pen(col);
+ wxPen pen(col, 1, penStyle);
dc.SetPen(pen);
- dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height);
+ dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height + 1);
}
else if (borderRight > 1)
wxBrush brush(col);
dc.SetPen(pen);
dc.SetBrush(brush);
- dc.DrawRectangle(rect.x - borderRight, rect.y, borderRight, rect.height);
+ dc.DrawRectangle(rect.x + rect.width - borderRight, rect.y, borderRight, rect.height);
}
}
- if (attr.GetTop().IsValid())
+ if (attr.GetTop().IsValid() && attr.GetTop().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
{
borderTop = converter.GetPixels(attr.GetTop().GetWidth());
penStyle = wxDOT;
else if (attr.GetTop().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
penStyle = wxLONG_DASH;
- wxPen pen(col);
+ wxPen pen(col, 1, penStyle);
dc.SetPen(pen);
dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y);
}
}
- if (attr.GetBottom().IsValid())
+ if (attr.GetBottom().IsValid() && attr.GetBottom().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
{
borderBottom = converter.GetPixels(attr.GetBottom().GetWidth());
wxColour col(attr.GetTop().GetColour());
penStyle = wxDOT;
else if (attr.GetBottom().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
penStyle = wxLONG_DASH;
- wxPen pen(col);
+ wxPen pen(col, 1, penStyle);
dc.SetPen(pen);
dc.DrawLine(rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height);
wxBrush brush(col);
dc.SetPen(pen);
dc.SetBrush(brush);
- dc.DrawRectangle(rect.x, rect.y - rect.height - borderBottom, rect.width, borderBottom);
+ dc.DrawRectangle(rect.x, rect.y + rect.height - borderBottom, rect.width, borderBottom);
}
}
//
// | Margin | Border | Padding | CONTENT | Padding | Border | Margin |
-bool wxRichTextObject::GetBoxRects(wxDC& dc, const wxRichTextAttr& attr, wxRect& marginRect, wxRect& borderRect, wxRect& contentRect, wxRect& paddingRect, wxRect& outlineRect)
+bool wxRichTextObject::GetBoxRects(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, wxRect& marginRect, wxRect& borderRect, wxRect& contentRect, wxRect& paddingRect, wxRect& outlineRect)
{
int borderLeft = 0, borderRight = 0, borderTop = 0, borderBottom = 0;
int outlineLeft = 0, outlineRight = 0, outlineTop = 0, outlineBottom = 0;
int paddingLeft = 0, paddingRight = 0, paddingTop = 0, paddingBottom = 0;
int marginLeft = 0, marginRight = 0, marginTop = 0, marginBottom = 0;
- wxTextAttrDimensionConverter converter(dc);
+ wxTextAttrDimensionConverter converter(dc, buffer ? buffer->GetScale() : 1.0);
- if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsPresent())
+ if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsValid())
marginLeft = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetLeft());
- if (attr.GetTextBoxAttr().GetMargins().GetRight().IsPresent())
+ if (attr.GetTextBoxAttr().GetMargins().GetRight().IsValid())
marginRight = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetRight());
- if (attr.GetTextBoxAttr().GetMargins().GetTop().IsPresent())
+ if (attr.GetTextBoxAttr().GetMargins().GetTop().IsValid())
marginTop = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetTop());
- if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsPresent())
+ if (attr.GetTextBoxAttr().GetMargins().GetBottom().IsValid())
marginBottom = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetBottom());
- if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsValid())
borderLeft = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth());
- if (attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth().IsValid())
borderRight = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth());
- if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsValid())
borderTop = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth());
- if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth().IsValid())
borderBottom = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth());
- if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsPresent())
+ if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsValid())
paddingLeft = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetLeft());
- if (attr.GetTextBoxAttr().GetPadding().GetRight().IsPresent())
+ if (attr.GetTextBoxAttr().GetPadding().GetRight().IsValid())
paddingRight = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetRight());
- if (attr.GetTextBoxAttr().GetPadding().GetTop().IsPresent())
+ if (attr.GetTextBoxAttr().GetPadding().GetTop().IsValid())
paddingTop = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetTop());
- if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsPresent())
+ if (attr.GetTextBoxAttr().GetPadding().GetBottom().IsValid())
paddingBottom = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetBottom());
- if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsValid())
outlineLeft = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth());
- if (attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth().IsValid())
outlineRight = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth());
- if (attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth().IsValid())
outlineTop = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth());
- if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsPresent())
+ if (attr.GetTextBoxAttr().GetOutline().GetBottom().GetWidth().IsValid())
outlineBottom = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetBottom().GetWidth());
int leftTotal = marginLeft + borderLeft + paddingLeft;
return true;
}
+// Get the total margin for the object in pixels, taking into account margin, padding and border size
+bool wxRichTextObject::GetTotalMargin(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, int& leftMargin, int& rightMargin,
+ int& topMargin, int& bottomMargin)
+{
+ // Assume boxRect is the area around the content
+ wxRect contentRect, marginRect, borderRect, paddingRect, outlineRect;
+ marginRect = wxRect(0, 0, 1000, 1000);
+
+ GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
-/// Dump to output stream for debugging
+ leftMargin = contentRect.GetLeft() - marginRect.GetLeft();
+ rightMargin = marginRect.GetRight() - contentRect.GetRight();
+ topMargin = contentRect.GetTop() - marginRect.GetTop();
+ bottomMargin = marginRect.GetBottom() - contentRect.GetBottom();
+
+ return true;
+}
+
+// Returns the rectangle which the child has available to it given restrictions specified in the
+// child attribute, e.g. 50% width of the parent, 400 pixels, x position 20% of the parent, etc.
+// availableContainerSpace might be a parent that the cell has to compute its width relative to.
+// E.g. a cell that's 50% of its parent.
+wxRect wxRichTextObject::AdjustAvailableSpace(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& WXUNUSED(parentAttr), const wxRichTextAttr& childAttr, const wxRect& availableParentSpace, const wxRect& availableContainerSpace)
+{
+ wxRect rect = availableParentSpace;
+ double scale = 1.0;
+ if (buffer)
+ scale = buffer->GetScale();
+
+ wxTextAttrDimensionConverter converter(dc, scale, availableContainerSpace.GetSize());
+
+ if (childAttr.GetTextBoxAttr().GetWidth().IsValid())
+ rect.width = converter.GetPixels(childAttr.GetTextBoxAttr().GetWidth());
+
+ if (childAttr.GetTextBoxAttr().GetHeight().IsValid())
+ rect.height = converter.GetPixels(childAttr.GetTextBoxAttr().GetHeight());
+
+ // Can specify either left or right for the position (we're assuming we can't
+ // set the left and right edges to effectively set the size. Would we want to do that?)
+ if (childAttr.GetTextBoxAttr().GetPosition().GetLeft().IsValid())
+ {
+ rect.x = rect.x + converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetLeft());
+ }
+ else if (childAttr.GetTextBoxAttr().GetPosition().GetRight().IsValid())
+ {
+ int x = converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetRight());
+ if (childAttr.GetTextBoxAttr().GetPosition().GetRight().GetPosition() == wxTEXT_BOX_ATTR_POSITION_RELATIVE)
+ rect.x = availableContainerSpace.x + availableContainerSpace.width - rect.width;
+ else
+ rect.x += x;
+ }
+
+ if (childAttr.GetTextBoxAttr().GetPosition().GetTop().IsValid())
+ {
+ rect.y = rect.y + converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetTop());
+ }
+ else if (childAttr.GetTextBoxAttr().GetPosition().GetBottom().IsValid())
+ {
+ int y = converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetBottom());
+ if (childAttr.GetTextBoxAttr().GetPosition().GetBottom().GetPosition() == wxTEXT_BOX_ATTR_POSITION_RELATIVE)
+ rect.y = availableContainerSpace.y + availableContainerSpace.height - rect.height;
+ else
+ rect.y += y;
+ }
+
+ if (rect.GetWidth() > availableParentSpace.GetWidth())
+ rect.SetWidth(availableParentSpace.GetWidth());
+
+ return rect;
+}
+
+// Dump to output stream for debugging
void wxRichTextObject::Dump(wxTextOutputStream& stream)
{
stream << GetClassInfo()->GetClassName() << wxT("\n");
stream << wxString::Format(wxT("Text colour: %d,%d,%d."), (int) m_attributes.GetTextColour().Red(), (int) m_attributes.GetTextColour().Green(), (int) m_attributes.GetTextColour().Blue()) << wxT("\n");
}
-/// Gets the containing buffer
+// Gets the containing buffer
wxRichTextBuffer* wxRichTextObject::GetBuffer() const
{
const wxRichTextObject* obj = this;
- while (obj && !obj->IsKindOf(CLASSINFO(wxRichTextBuffer)))
+ while (obj && !wxDynamicCast(obj, wxRichTextBuffer))
obj = obj->GetParent();
return wxDynamicCast(obj, wxRichTextBuffer);
}
+// Get the absolute object position, by traversing up the child/parent hierarchy
+wxPoint wxRichTextObject::GetAbsolutePosition() const
+{
+ wxPoint pt = GetPosition();
+
+ wxRichTextObject* p = GetParent();
+ while (p)
+ {
+ pt = pt + p->GetPosition();
+ p = p->GetParent();
+ }
+
+ return pt;
+}
+
+// Hit-testing: returns a flag indicating hit test details, plus
+// information about position
+int wxRichTextObject::HitTest(wxDC& WXUNUSED(dc), wxRichTextDrawingContext& WXUNUSED(context), const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int WXUNUSED(flags))
+{
+ if (!IsShown())
+ return wxRICHTEXT_HITTEST_NONE;
+
+ wxRect rect = GetRect();
+ if (pt.x >= rect.x && pt.x < rect.x + rect.width &&
+ pt.y >= rect.y && pt.y < rect.y + rect.height)
+ {
+ *obj = this;
+ *contextObj = GetParentContainer();
+ textPosition = GetRange().GetStart();
+ return wxRICHTEXT_HITTEST_ON;
+ }
+ else
+ return wxRICHTEXT_HITTEST_NONE;
+}
+
+// Lays out the object first with a given amount of space, and then if no width was specified in attr,
+// lays out the object again using the maximum ('best') size
+bool wxRichTextObject::LayoutToBestSize(wxDC& dc, wxRichTextDrawingContext& context, wxRichTextBuffer* buffer,
+ const wxRichTextAttr& parentAttr, const wxRichTextAttr& attr,
+ const wxRect& availableParentSpace, const wxRect& availableContainerSpace,
+ int style)
+{
+ wxRect availableChildRect = AdjustAvailableSpace(dc, buffer, parentAttr, attr, availableParentSpace, availableContainerSpace);
+ wxRect originalAvailableRect = availableChildRect;
+ Layout(dc, context, availableChildRect, availableContainerSpace, style);
+
+ wxSize maxSize = GetMaxSize();
+
+ // Don't ignore if maxSize.x is zero, since we need to redo the paragraph's lines
+ // on this basis
+ if (!attr.GetTextBoxAttr().GetWidth().IsValid() && maxSize.x < availableChildRect.width)
+ {
+ // Redo the layout with a fixed, minimum size this time.
+ Invalidate(wxRICHTEXT_ALL);
+ wxRichTextAttr newAttr(attr);
+ newAttr.GetTextBoxAttr().GetWidth().SetValue(maxSize.x, wxTEXT_ATTR_UNITS_PIXELS);
+ newAttr.GetTextBoxAttr().GetWidth().SetPosition(wxTEXT_BOX_ATTR_POSITION_ABSOLUTE);
+
+ availableChildRect = AdjustAvailableSpace(dc, buffer, parentAttr, newAttr, availableParentSpace, availableContainerSpace);
+
+ // If a paragraph, align the whole paragraph.
+ // Problem with this: if we're limited by a floating object, a line may be centered
+ // w.r.t. the smaller resulting box rather than the actual available width.
+ if (attr.HasAlignment() && !GetContainer()->GetFloatCollector()->HasFloats()) // FIXME: aligning whole paragraph not compatible with floating objects
+ {
+ // centering, right-justification
+ if (attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
+ {
+ availableChildRect.x = (originalAvailableRect.GetWidth() - availableChildRect.GetWidth())/2 + availableChildRect.x;
+ }
+ else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
+ {
+ availableChildRect.x = availableChildRect.x + originalAvailableRect.GetWidth() - availableChildRect.GetWidth();
+ }
+ }
+
+ Layout(dc, context, availableChildRect, availableContainerSpace, style);
+ }
+
+ /*
+ __________________
+ | ____________ |
+ | | | |
+
+
+ */
+
+ return true;
+}
+
+// Move the object recursively, by adding the offset from old to new
+void wxRichTextObject::Move(const wxPoint& pt)
+{
+ SetPosition(pt);
+}
+
+
/*!
* wxRichTextCompositeObject
* This is the base for drawable objects.
/// Hit-testing: returns a flag indicating hit test details, plus
/// information about position
-int wxRichTextCompositeObject::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)
+int wxRichTextCompositeObject::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
{
+ if (!IsShown())
+ return wxRICHTEXT_HITTEST_NONE;
+
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextObject* child = node->GetData();
- int ret = child->HitTest(dc, pt, textPosition);
- if (ret != wxRICHTEXT_HITTEST_NONE)
- return ret;
+ if (child->IsShown() && child->IsTopLevel() && (flags & wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS))
+ {
+ // Just check if we hit the overall object
+ int ret = child->wxRichTextObject::HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
+ if (ret != wxRICHTEXT_HITTEST_NONE)
+ return ret;
+ }
+ else if (child->IsShown())
+ {
+ int ret = child->HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
+ if (ret != wxRICHTEXT_HITTEST_NONE)
+ return ret;
+ }
node = node->GetNext();
}
- textPosition = GetRange().GetEnd()-1;
- return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
+ return wxRICHTEXT_HITTEST_NONE;
}
/// Finds the absolute position and row height for the given character position
-bool wxRichTextCompositeObject::FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart)
+bool wxRichTextCompositeObject::FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart)
{
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextObject* child = node->GetData();
- if (child->FindPosition(dc, index, pt, height, forceLineStart))
+ // Don't recurse if the child is a top-level object,
+ // such as a text box, because the character position will no longer
+ // apply. By definition, a top-level object has its own range of
+ // character positions.
+ if (!child->IsTopLevel() && child->FindPosition(dc, context, index, pt, height, forceLineStart))
return true;
node = node->GetNext();
long current = start;
long lastEnd = current;
+ if (IsTopLevel())
+ {
+ current = 0;
+ lastEnd = 0;
+ }
+
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
node = node->GetNext();
}
- end = lastEnd;
+ if (IsTopLevel())
+ {
+ // A top-level object always has a range of size 1,
+ // because its children don't count at this level.
+ end = start;
+ m_range.SetRange(start, start);
+
+ // An object with no children has zero length
+ if (m_children.GetCount() == 0)
+ lastEnd --;
+ m_ownRange.SetRange(0, lastEnd);
+ }
+ else
+ {
+ end = lastEnd;
- // An object with no children has zero length
- if (m_children.GetCount() == 0)
- end --;
+ // An object with no children has zero length
+ if (m_children.GetCount() == 0)
+ end --;
- m_range.SetRange(start, end);
+ m_range.SetRange(start, end);
+ }
}
/// Delete range from layout.
if (!obj->GetRange().IsOutside(range))
{
- obj->DeleteRange(range);
+ // No need to delete within a top-level object; just removing this object will do fine
+ if (!obj->IsTopLevel())
+ obj->DeleteRange(range);
// Delete an empty object, or paragraph within this range.
if (obj->IsEmpty() ||
return text;
}
+/// Get the child object at the given character position
+wxRichTextObject* wxRichTextCompositeObject::GetChildAtPosition(long pos) const
+{
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxRichTextObject* child = node->GetData();
+ if (child->GetRange().GetStart() == pos)
+ return child;
+ node = node->GetNext();
+ }
+ return NULL;
+}
+
/// Recursively merge all pieces that can be merged.
bool wxRichTextCompositeObject::Defragment(const wxRichTextRange& range)
{
}
}
-/*!
- * wxRichTextParagraphLayoutBox
- * This box knows how to lay out paragraphs.
- */
+/// Get/set the object size for the given range. Returns false if the range
+/// is invalid for this object.
+bool wxRichTextCompositeObject::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
+{
+ if (!range.IsWithin(GetRange()))
+ return false;
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextCompositeObject)
+ wxSize sz;
-wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent):
- wxRichTextCompositeObject(parent)
-{
- Init();
-}
+ wxArrayInt childExtents;
+ wxArrayInt* p;
+ if (partialExtents)
+ p = & childExtents;
+ else
+ p = NULL;
-wxRichTextParagraphLayoutBox::~wxRichTextParagraphLayoutBox()
-{
- if (m_floatCollector)
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
{
- delete m_floatCollector;
- m_floatCollector = NULL;
- }
-}
+ wxRichTextObject* child = node->GetData();
+ if (!child->GetRange().IsOutside(range))
+ {
+ // Floating objects have a zero size within the paragraph.
+ if (child->IsFloating())
+ {
+ if (partialExtents)
+ {
+ int lastSize;
+ if (partialExtents->GetCount() > 0)
+ lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ lastSize = 0;
-/// Initialize the object.
-void wxRichTextParagraphLayoutBox::Init()
-{
- m_ctrl = NULL;
+ partialExtents->Add(0 /* zero size */ + lastSize);
+ }
+ }
+ else
+ {
+ wxSize childSize;
- // For now, assume is the only box and has no initial size.
- m_range = wxRichTextRange(0, -1);
+ wxRichTextRange rangeToUse = range;
+ rangeToUse.LimitTo(child->GetRange());
+ if (child->IsTopLevel())
+ rangeToUse = child->GetOwnRange();
- m_invalidRange.SetRange(-1, -1);
- m_leftMargin = 4;
- m_rightMargin = 4;
- m_topMargin = 4;
- m_bottomMargin = 4;
- m_partialParagraph = false;
- m_floatCollector = NULL;
-}
+ int childDescent = 0;
-void wxRichTextParagraphLayoutBox::Clear()
-{
- DeleteChildren();
+ // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we're already cached the size,
+ // but it's only going to be used after caching has taken place.
+ if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0)
+ {
+ childDescent = child->GetDescent();
+ childSize = child->GetCachedSize();
+
+ sz.y = wxMax(sz.y, childSize.y);
+ sz.x += childSize.x;
+ descent = wxMax(descent, childDescent);
+ }
+ else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, context, flags, wxPoint(position.x + sz.x, position.y), p))
+ {
+ sz.y = wxMax(sz.y, childSize.y);
+ sz.x += childSize.x;
+ descent = wxMax(descent, childDescent);
+
+ if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange() || child->IsTopLevel()))
+ {
+ child->SetCachedSize(childSize);
+ child->SetDescent(childDescent);
+ }
+
+ if (partialExtents)
+ {
+ int lastSize;
+ if (partialExtents->GetCount() > 0)
+ lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ lastSize = 0;
+
+ size_t i;
+ for (i = 0; i < childExtents.GetCount(); i++)
+ {
+ partialExtents->Add(childExtents[i] + lastSize);
+ }
+ }
+ }
+ }
+
+ if (p)
+ p->Clear();
+ }
+
+ node = node->GetNext();
+ }
+ size = sz;
+ return true;
+}
+
+// Invalidate the buffer. With no argument, invalidates whole buffer.
+void wxRichTextCompositeObject::Invalidate(const wxRichTextRange& invalidRange)
+{
+ wxRichTextObject::Invalidate(invalidRange);
+
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxRichTextObject* child = node->GetData();
+ if (invalidRange != wxRICHTEXT_ALL && invalidRange != wxRICHTEXT_NONE && child->GetRange().IsOutside(invalidRange))
+ {
+ // Skip
+ }
+ else if (child->IsTopLevel())
+ {
+ if (invalidRange == wxRICHTEXT_NONE)
+ child->Invalidate(wxRICHTEXT_NONE);
+ else
+ child->Invalidate(wxRICHTEXT_ALL); // All children must be invalidated if within parent range
+ }
+ else
+ child->Invalidate(invalidRange);
+ node = node->GetNext();
+ }
+}
+
+// Move the object recursively, by adding the offset from old to new
+void wxRichTextCompositeObject::Move(const wxPoint& pt)
+{
+ wxPoint oldPos = GetPosition();
+ SetPosition(pt);
+ wxPoint offset = pt - oldPos;
+
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxRichTextObject* child = node->GetData();
+ wxPoint childPos = child->GetPosition() + offset;
+ child->Move(childPos);
+ node = node->GetNext();
+ }
+}
+
+
+/*!
+ * wxRichTextParagraphLayoutBox
+ * This box knows how to lay out paragraphs.
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextCompositeObject)
+
+wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent):
+ wxRichTextCompositeObject(parent)
+{
+ Init();
+}
+
+wxRichTextParagraphLayoutBox::~wxRichTextParagraphLayoutBox()
+{
+ if (m_floatCollector)
+ {
+ delete m_floatCollector;
+ m_floatCollector = NULL;
+ }
+}
+
+/// Initialize the object.
+void wxRichTextParagraphLayoutBox::Init()
+{
+ m_ctrl = NULL;
+
+ // For now, assume is the only box and has no initial size.
+ m_range = wxRichTextRange(0, -1);
+ m_ownRange = wxRichTextRange(0, -1);
+
+ m_invalidRange = wxRICHTEXT_ALL;
+
+ m_partialParagraph = false;
+ m_floatCollector = NULL;
+}
+
+void wxRichTextParagraphLayoutBox::Clear()
+{
+ DeleteChildren();
if (m_floatCollector)
delete m_floatCollector;
m_defaultAttributes = obj.m_defaultAttributes;
}
-// Gather information about floating objects
-bool wxRichTextParagraphLayoutBox::UpdateFloatingObjects(int width, wxRichTextObject* untilObj)
+// Gather information about floating objects; only gather floats for those paragraphs that
+// will not be formatted again due to optimization, after which floats will be gathered per-paragraph
+// during layout.
+bool wxRichTextParagraphLayoutBox::UpdateFloatingObjects(const wxRect& availableRect, wxRichTextObject* untilObj)
{
if (m_floatCollector != NULL)
delete m_floatCollector;
- m_floatCollector = new wxRichTextFloatCollector(width);
+ m_floatCollector = new wxRichTextFloatCollector(availableRect);
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
- while (node && node->GetData() != untilObj)
+ // Only gather floats up to the point we'll start formatting paragraphs.
+ while (untilObj && node && node->GetData() != untilObj)
{
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
wxASSERT (child != NULL);
return true;
}
+// Returns the style sheet associated with the overall buffer.
+wxRichTextStyleSheet* wxRichTextParagraphLayoutBox::GetStyleSheet() const
+{
+ return GetBuffer() ? GetBuffer()->GetStyleSheet() : (wxRichTextStyleSheet*) NULL;
+}
+
+// Get the number of floating objects at this level
+int wxRichTextParagraphLayoutBox::GetFloatingObjectCount() const
+{
+ if (m_floatCollector)
+ return m_floatCollector->GetFloatingObjectCount();
+ else
+ return 0;
+}
+
+// Get a list of floating objects
+bool wxRichTextParagraphLayoutBox::GetFloatingObjects(wxRichTextObjectList& objects) const
+{
+ if (m_floatCollector)
+ {
+ return m_floatCollector->GetFloatingObjects(objects);
+ }
+ else
+ return false;
+}
+
+// Calculate ranges
+void wxRichTextParagraphLayoutBox::UpdateRanges()
+{
+ long start = 0;
+ if (GetParent())
+ start = GetRange().GetStart();
+ long end;
+ CalculateRange(start, end);
+}
+
// HitTest
-int wxRichTextParagraphLayoutBox::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)
+int wxRichTextParagraphLayoutBox::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
{
+ if (!IsShown())
+ return wxRICHTEXT_HITTEST_NONE;
+
int ret = wxRICHTEXT_HITTEST_NONE;
- if (m_floatCollector)
- ret = m_floatCollector->HitTest(dc, pt, textPosition);
+ if (m_floatCollector && (flags & wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS) == 0)
+ ret = m_floatCollector->HitTest(dc, context, pt, textPosition, obj, flags);
if (ret == wxRICHTEXT_HITTEST_NONE)
- return wxRichTextCompositeObject::HitTest(dc, pt, textPosition);
+ return wxRichTextCompositeObject::HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
else
+ {
+ *contextObj = this;
return ret;
+ }
}
/// Draw the floating objects
-void wxRichTextParagraphLayoutBox::DrawFloats(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style)
+void wxRichTextParagraphLayoutBox::DrawFloats(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
{
if (m_floatCollector)
- m_floatCollector->Draw(dc, range, selectionRange, rect, descent, style);
+ m_floatCollector->Draw(dc, context, range, selection, rect, descent, style);
}
void wxRichTextParagraphLayoutBox::MoveAnchoredObjectToParagraph(wxRichTextParagraph* from, wxRichTextParagraph* to, wxRichTextObject* obj)
}
/// Draw the item
-bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style)
+bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
{
- DrawFloats(dc, range, selectionRange, rect, descent, style);
+ if (!IsShown())
+ return true;
+
+ wxRect thisRect(GetPosition(), GetCachedSize());
+
+ wxRichTextAttr attr(GetAttributes());
+ context.ApplyVirtualAttributes(attr, this);
+
+ int flags = style;
+ if (selection.IsValid() && GetParentContainer() != this && selection.WithinSelection(GetRange().GetStart(), GetParentContainer()))
+ flags |= wxRICHTEXT_DRAW_SELECTED;
+
+ // Don't draw guidelines if at top level
+ int theseFlags = flags;
+ if (!GetParent())
+ theseFlags &= ~wxRICHTEXT_DRAW_GUIDELINES;
+ DrawBoxAttributes(dc, GetBuffer(), attr, thisRect, theseFlags);
+
+ DrawFloats(dc, context, range, selection, rect, descent, style);
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
- wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (child != NULL);
+ wxRichTextObject* child = node->GetData();
if (child && !child->GetRange().IsOutside(range))
{
wxRect childRect(child->GetPosition(), child->GetCachedSize());
+ wxRichTextRange childRange = range;
+ if (child->IsTopLevel())
+ {
+ childRange = child->GetOwnRange();
+ }
if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetTop() > rect.GetBottom())
{
// Skip
}
else
- child->Draw(dc, range, selectionRange, rect, descent, style);
+ child->Draw(dc, context, childRange, selection, rect, descent, style);
}
node = node->GetNext();
}
/// Lay the item out
-bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int style)
+bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style)
{
+ SetPosition(rect.GetPosition());
+
+ if (!IsShown())
+ return true;
+
wxRect availableSpace;
bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
+ wxRichTextAttr attr(GetAttributes());
+ context.ApplyVirtualAttributes(attr, this);
+
// If only laying out a specific area, the passed rect has a different meaning:
// the visible part of the buffer. This is used in wxRichTextCtrl::OnSize,
// so that during a size, only the visible part will be relaid out, or
// everything up to the start of the visible area is laid out correctly.
if (formatRect)
{
- availableSpace = wxRect(0 + m_leftMargin,
- 0 + m_topMargin,
- rect.width - m_leftMargin - m_rightMargin,
- rect.height);
+ wxRect rect2(0, 0, rect.width, rect.height);
+ availableSpace = GetAvailableContentArea(dc, context, rect2);
// Invalidate the part of the buffer from the first visible line
// to the end. If other parts of the buffer are currently invalid,
if (line)
startPos = line->GetAbsoluteRange().GetStart();
- Invalidate(wxRichTextRange(startPos, GetRange().GetEnd()));
+ Invalidate(wxRichTextRange(startPos, GetOwnRange().GetEnd()));
}
else
- availableSpace = wxRect(rect.x + m_leftMargin,
- rect.y + m_topMargin,
- rect.width - m_leftMargin - m_rightMargin,
- rect.height - m_topMargin - m_bottomMargin);
+ {
+ availableSpace = GetAvailableContentArea(dc, context, rect);
+ }
+
+ // Fix the width if we're at the top level
+ if (!GetParent())
+ attr.GetTextBoxAttr().GetWidth().SetValue(rect.GetWidth(), wxTEXT_ATTR_UNITS_PIXELS);
+
+ int leftMargin, rightMargin, topMargin, bottomMargin;
+ wxRichTextObject::GetTotalMargin(dc, GetBuffer(), attr, leftMargin, rightMargin,
+ topMargin, bottomMargin);
int maxWidth = 0;
+ int maxHeight = 0;
+
+ // The maximum paragraph maximum width, so we can set the overall maximum width for this object
+ int maxMaxWidth = 0;
+
+ // The maximum paragraph minimum width, so we can set the overall minimum width for this object
+ int maxMinWidth = 0;
+
+ // If we have vertical alignment, we must recalculate everything.
+ bool hasVerticalAlignment = (attr.GetTextBoxAttr().HasVerticalAlignment() &&
+ (attr.GetTextBoxAttr().GetVerticalAlignment() > wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP));
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
if (invalidRange == wxRICHTEXT_NONE && !formatRect)
return true;
- if (invalidRange == wxRICHTEXT_ALL)
+ if (invalidRange == wxRICHTEXT_ALL || hasVerticalAlignment)
layoutAll = true;
else // If we know what range is affected, start laying out from that point on.
- if (invalidRange.GetStart() >= GetRange().GetStart())
+ if (invalidRange.GetStart() >= GetOwnRange().GetStart())
{
wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(invalidRange.GetStart());
if (firstParagraph)
}
}
- UpdateFloatingObjects(availableSpace.width, node ? node->GetData() : (wxRichTextObject*) NULL);
+ // Gather information about only those floating objects that will not be formatted,
+ // after which floats will be gathered per-paragraph during layout.
+ UpdateFloatingObjects(availableSpace, node ? node->GetData() : (wxRichTextObject*) NULL);
// A way to force speedy rest-of-buffer layout (the 'else' below)
bool forceQuickLayout = false;
+ // First get the size of the paragraphs we won't be laying out
+ wxRichTextObjectList::compatibility_iterator n = m_children.GetFirst();
+ while (n && n != node)
+ {
+ wxRichTextParagraph* child = wxDynamicCast(n->GetData(), wxRichTextParagraph);
+ if (child)
+ {
+ maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+ maxMinWidth = wxMax(maxMinWidth, child->GetMinSize().x);
+ maxMaxWidth = wxMax(maxMaxWidth, child->GetMaxSize().x);
+ }
+ n = n->GetNext();
+ }
+
while (node)
{
// Assume this box only contains paragraphs
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxCHECK_MSG( child, false, wxT("Unknown object in layout") );
+ // Unsure if this is needed
+ // wxCHECK_MSG( child, false, wxT("Unknown object in layout") );
- // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines
- if ( !forceQuickLayout &&
- (layoutAll ||
- child->GetLines().IsEmpty() ||
- !child->GetRange().IsOutside(invalidRange)) )
+ if (child && child->IsShown())
{
- child->Layout(dc, availableSpace, style);
+ // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines
+ if ( !forceQuickLayout &&
+ (layoutAll ||
+ child->GetLines().IsEmpty() ||
+ !child->GetRange().IsOutside(invalidRange)) )
+ {
+ // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+ // lays out the object again using the minimum size
+ child->LayoutToBestSize(dc, context, GetBuffer(),
+ attr, child->GetAttributes(), availableSpace, rect, style&~wxRICHTEXT_LAYOUT_SPECIFIED_RECT);
+
+ // Layout must set the cached size
+ availableSpace.y += child->GetCachedSize().y;
+ maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+ maxMinWidth = wxMax(maxMinWidth, child->GetMinSize().x);
+ maxMaxWidth = wxMax(maxMaxWidth, child->GetMaxSize().x);
+
+ // If we're just formatting the visible part of the buffer,
+ // and we're now past the bottom of the window, and we don't have any
+ // floating objects (since they may cause wrapping to change for the rest of the
+ // the buffer), start quick layout.
+ if (!hasVerticalAlignment && formatRect && child->GetPosition().y > rect.GetBottom() && GetFloatingObjectCount() == 0)
+ forceQuickLayout = true;
+ }
+ else
+ {
+ // We're outside the immediately affected range, so now let's just
+ // move everything up or down. This assumes that all the children have previously
+ // been laid out and have wrapped line lists associated with them.
+ // TODO: check all paragraphs before the affected range.
- // Layout must set the cached size
- availableSpace.y += child->GetCachedSize().y;
- maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+ int inc = availableSpace.y - child->GetPosition().y;
+
+ while (node)
+ {
+ wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+ if (child)
+ {
+ if (child->GetLines().GetCount() == 0)
+ {
+ // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+ // lays out the object again using the minimum size
+ child->LayoutToBestSize(dc, context, GetBuffer(),
+ attr, child->GetAttributes(), availableSpace, rect, style&~wxRICHTEXT_LAYOUT_SPECIFIED_RECT);
+
+ //child->Layout(dc, availableChildRect, style);
+ }
+ else
+ child->Move(wxPoint(child->GetPosition().x, child->GetPosition().y + inc));
- // If we're just formatting the visible part of the buffer,
- // and we're now past the bottom of the window, start quick
- // layout.
- if (formatRect && child->GetPosition().y > rect.GetBottom())
- forceQuickLayout = true;
+ availableSpace.y += child->GetCachedSize().y;
+ maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+ maxMinWidth = wxMax(maxMinWidth, child->GetMinSize().x);
+ maxMaxWidth = wxMax(maxMaxWidth, child->GetMaxSize().x);
+ }
+
+ node = node->GetNext();
+ }
+ break;
+ }
}
- else
- {
- // We're outside the immediately affected range, so now let's just
- // move everything up or down. This assumes that all the children have previously
- // been laid out and have wrapped line lists associated with them.
- // TODO: check all paragraphs before the affected range.
- int inc = availableSpace.y - child->GetPosition().y;
+ node = node->GetNext();
+ }
+
+ node = m_children.GetLast();
+ if (node && node->GetData()->IsShown())
+ {
+ wxRichTextObject* child = node->GetData();
+ maxHeight = child->GetPosition().y - (GetPosition().y + topMargin) + child->GetCachedSize().y;
+ }
+ else
+ maxHeight = 0; // topMargin + bottomMargin;
+
+ // Check the bottom edge of any floating object
+ if (GetFloatCollector() && GetFloatCollector()->HasFloats())
+ {
+ int bottom = GetFloatCollector()->GetLastRectBottom();
+ if (bottom > maxHeight)
+ maxHeight = bottom;
+ }
+
+ if (attr.GetTextBoxAttr().GetSize().GetWidth().IsValid())
+ {
+ wxRect r = AdjustAvailableSpace(dc, GetBuffer(), wxRichTextAttr() /* not used */, attr, parentRect, parentRect);
+ int w = r.GetWidth();
+
+ // Convert external to content rect
+ w = w - leftMargin - rightMargin;
+ maxWidth = wxMax(maxWidth, w);
+ maxMaxWidth = wxMax(maxMaxWidth, w);
+ }
+ else
+ {
+ // TODO: Make sure the layout box's position reflects
+ // the position of the children, but without
+ // breaking layout of a box within a paragraph.
+ }
+
+ // TODO: (also in para layout) should set the
+ // object's size to an absolute one if specified,
+ // but if not specified, calculate it from content.
+
+ // We need to add back the margins etc.
+ {
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0, 0), wxSize(maxWidth, maxHeight));
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ SetCachedSize(marginRect.GetSize());
+ }
+
+ // The maximum size is the greatest of all maximum widths for all paragraphs.
+ {
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0, 0), wxSize(maxMaxWidth, maxHeight)); // Actually max height is a lie, we can't know it
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ SetMaxSize(marginRect.GetSize());
+ }
+
+ // The minimum size is the greatest of all minimum widths for all paragraphs.
+ {
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0, 0), wxSize(maxMinWidth, maxHeight)); // Actually max height is a lie, we can't know it
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ SetMinSize(marginRect.GetSize());
+ }
+
+ if (attr.GetTextBoxAttr().HasVerticalAlignment() &&
+ (attr.GetTextBoxAttr().GetVerticalAlignment() > wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP))
+ {
+ int yOffset = 0;
+ int leftOverSpace = availableSpace.height - topMargin - bottomMargin - maxHeight;
+ if (leftOverSpace > 0)
+ {
+ if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE)
+ {
+ yOffset = (leftOverSpace/2);
+ }
+ else if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_BOTTOM)
+ {
+ yOffset = leftOverSpace;
+ }
+ }
+ // Move all the children to vertically align the content
+ // This doesn't take into account floating objects, unfortunately.
+ if (yOffset != 0)
+ {
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
if (child)
- {
- if (child->GetLines().GetCount() == 0)
- child->Layout(dc, availableSpace, style);
- else
- child->SetPosition(wxPoint(child->GetPosition().x, child->GetPosition().y + inc));
-
- availableSpace.y += child->GetCachedSize().y;
- maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
- }
+ child->Move(wxPoint(child->GetPosition().x, child->GetPosition().y + yOffset));
node = node->GetNext();
}
- break;
}
-
- node = node->GetNext();
}
- SetCachedSize(wxSize(maxWidth, availableSpace.y));
-
- m_dirty = false;
m_invalidRange = wxRICHTEXT_NONE;
return true;
}
/// Get/set the size for the given range.
-bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* WXUNUSED(partialExtents)) const
+bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* WXUNUSED(partialExtents)) const
{
wxSize sz;
wxRichTextRange rangeToFind = range;
rangeToFind.LimitTo(childRange);
+ if (child->IsTopLevel())
+ rangeToFind = child->GetOwnRange();
+
wxSize childSize;
int childDescent = 0;
- child->GetRangeSize(rangeToFind, childSize, childDescent, dc, flags, position);
+ child->GetRangeSize(rangeToFind, childSize, childDescent, dc, context, flags, position);
descent = wxMax(childDescent, descent);
{
// child is a paragraph
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (child != NULL);
+ // wxASSERT (child != NULL);
- // Return first child in buffer if position is -1
- // if (pos == -1)
- // return child;
+ if (child)
+ {
+ // Return first child in buffer if position is -1
+ // if (pos == -1)
+ // return child;
- if (child->GetRange().Contains(pos))
- return child;
+ if (child->GetRange().Contains(pos))
+ return child;
+ }
node = node->GetNext();
}
{
// child is a paragraph
wxRichTextParagraph* child = wxDynamicCast(obj, wxRichTextParagraph);
- wxASSERT (child != NULL);
+ // wxASSERT (child != NULL);
- wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
- while (node2)
+ if (child)
{
- wxRichTextLine* line = node2->GetData();
+ wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+ while (node2)
+ {
+ wxRichTextLine* line = node2->GetData();
- wxRichTextRange range = line->GetAbsoluteRange();
+ wxRichTextRange range = line->GetAbsoluteRange();
- if (range.Contains(pos) ||
+ if (range.Contains(pos) ||
- // If the position is end-of-paragraph, then return the last line of
- // of the paragraph.
- ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())))
- return line;
+ // If the position is end-of-paragraph, then return the last line of
+ // of the paragraph.
+ ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())))
+ return line;
- node2 = node2->GetNext();
+ node2 = node2->GetNext();
+ }
}
}
while (node)
{
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (child != NULL);
+ // wxASSERT (child != NULL);
- wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
- while (node2)
+ if (child)
{
- wxRichTextLine* line = node2->GetData();
-
- wxRect rect(line->GetRect());
-
- if (y <= rect.GetBottom())
- return line;
-
- node2 = node2->GetNext();
+ wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+ while (node2)
+ {
+ wxRichTextLine* line = node2->GetData();
+
+ wxRect rect(line->GetRect());
+
+ if (y <= rect.GetBottom())
+ return line;
+
+ node2 = node2->GetNext();
+ }
}
node = node->GetNext();
while (node)
{
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (child != NULL);
+ // wxASSERT (child != NULL);
+
+ if (child)
+ count += child->GetLines().GetCount();
- count += child->GetLines().GetCount();
node = node->GetNext();
}
return count;
wxRichTextAttr* cStyle = & defaultCharStyle;
wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle);
+ para->GetAttributes().GetTextBoxAttr().Reset();
AppendChild(para);
UpdateRanges();
- SetDirty(true);
return para->GetRange();
}
size_t len = text.length();
wxString line;
wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+ para->GetAttributes().GetTextBoxAttr().Reset();
AppendChild(para);
plainText->SetText(line);
para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+ para->GetAttributes().GetTextBoxAttr().Reset();
AppendChild(para);
UpdateRanges();
- SetDirty(false);
-
return wxRichTextRange(firstPara->GetRange().GetStart(), lastPara->GetRange().GetEnd());
}
wxRichTextAttr* cStyle = & defaultCharStyle;
wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle);
+ para->GetAttributes().GetTextBoxAttr().Reset();
AppendChild(para);
para->AppendChild(new wxRichTextImage(image, this, cStyle));
UpdateRanges();
- SetDirty(true);
return para->GetRange();
}
bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment)
{
- SetDirty(true);
-
// First, find the first paragraph whose starting position is within the range.
wxRichTextParagraph* para = GetParagraphAtPosition(position);
if (para)
// Now top and tail the first and last paragraphs in our new fragment (which might be the same).
if (!fragment.IsEmpty())
{
- wxRichTextRange topTailRange(range);
-
wxRichTextParagraph* firstPara = wxDynamicCast(fragment.GetChildren().GetFirst()->GetData(), wxRichTextParagraph);
wxASSERT( firstPara != NULL );
+ wxRichTextParagraph* lastPara = wxDynamicCast(fragment.GetChildren().GetLast()->GetData(), wxRichTextParagraph);
+ wxASSERT( lastPara != NULL );
+
+ if (!firstPara || !lastPara)
+ return false;
+
+ bool isFragment = (range.GetEnd() < lastPara->GetRange().GetEnd());
+
+ long firstPos = firstPara->GetRange().GetStart();
+
+ // Adjust for renumbering from zero
+ wxRichTextRange topTailRange(range.GetStart() - firstPos, range.GetEnd() - firstPos);
+
+ long end;
+ fragment.CalculateRange(0, end);
+
// Chop off the start of the paragraph
- if (topTailRange.GetStart() > firstPara->GetRange().GetStart())
+ if (topTailRange.GetStart() > 0)
{
- wxRichTextRange r(firstPara->GetRange().GetStart(), topTailRange.GetStart()-1);
+ wxRichTextRange r(0, topTailRange.GetStart()-1);
firstPara->DeleteRange(r);
// Make sure the numbering is correct
- long end;
- fragment.CalculateRange(firstPara->GetRange().GetStart(), end);
+ fragment.CalculateRange(0, end);
// Now, we've deleted some positions, so adjust the range
// accordingly.
- topTailRange.SetEnd(topTailRange.GetEnd() - r.GetLength());
+ topTailRange.SetStart(range.GetLength());
+ topTailRange.SetEnd(fragment.GetOwnRange().GetEnd());
+ }
+ else
+ {
+ topTailRange.SetStart(range.GetLength());
+ topTailRange.SetEnd(fragment.GetOwnRange().GetEnd());
}
- wxRichTextParagraph* lastPara = wxDynamicCast(fragment.GetChildren().GetLast()->GetData(), wxRichTextParagraph);
- wxASSERT( lastPara != NULL );
-
- if (topTailRange.GetEnd() < (lastPara->GetRange().GetEnd()-1))
+ if (topTailRange.GetStart() < lastPara->GetRange().GetEnd())
{
- wxRichTextRange r(topTailRange.GetEnd()+1, lastPara->GetRange().GetEnd()-1); /* -1 since actual text ends 1 position before end of para marker */
- lastPara->DeleteRange(r);
+ lastPara->DeleteRange(topTailRange);
// Make sure the numbering is correct
long end;
- fragment.CalculateRange(firstPara->GetRange().GetStart(), end);
+ fragment.CalculateRange(0, end);
// We only have part of a paragraph at the end
fragment.SetPartialParagraph(true);
}
else
{
- if (topTailRange.GetEnd() == (lastPara->GetRange().GetEnd() - 1))
- // We have a partial paragraph (don't save last new paragraph marker)
- fragment.SetPartialParagraph(true);
- else
- // We have a complete paragraph
- fragment.SetPartialParagraph(false);
+ // We have a partial paragraph (don't save last new paragraph marker)
+ // or complete paragraph
+ fragment.SetPartialParagraph(isFragment);
}
}
while (node)
{
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT( child != NULL );
+ // wxASSERT( child != NULL );
- if (child->GetRange().Contains(pos))
+ if (child)
{
- wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
- while (node2)
+ if (child->GetRange().Contains(pos))
{
- wxRichTextLine* line = node2->GetData();
- wxRichTextRange lineRange = line->GetAbsoluteRange();
-
- if (lineRange.Contains(pos) || pos == lineRange.GetStart())
+ wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+ while (node2)
{
- // If the caret is displayed at the end of the previous wrapped line,
- // we want to return the line it's _displayed_ at (not the actual line
- // containing the position).
- if (lineRange.GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos)
- return lineCount - 1;
- else
- return lineCount;
- }
+ wxRichTextLine* line = node2->GetData();
+ wxRichTextRange lineRange = line->GetAbsoluteRange();
+
+ if (lineRange.Contains(pos) || pos == lineRange.GetStart())
+ {
+ // If the caret is displayed at the end of the previous wrapped line,
+ // we want to return the line it's _displayed_ at (not the actual line
+ // containing the position).
+ if (lineRange.GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos)
+ return lineCount - 1;
+ else
+ return lineCount;
+ }
- lineCount ++;
+ lineCount ++;
- node2 = node2->GetNext();
+ node2 = node2->GetNext();
+ }
+ // If we didn't find it in the lines, it must be
+ // the last position of the paragraph. So return the last line.
+ return lineCount-1;
}
- // If we didn't find it in the lines, it must be
- // the last position of the paragraph. So return the last line.
- return lineCount-1;
+ else
+ lineCount += child->GetLines().GetCount();
}
- else
- lineCount += child->GetLines().GetCount();
node = node->GetNext();
}
while (node)
{
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT(child != NULL);
+ // wxASSERT(child != NULL);
- if (lineNumber < (int) (child->GetLines().GetCount() + lineCount))
+ if (child)
{
- wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
- while (node2)
+ if (lineNumber < (int) (child->GetLines().GetCount() + lineCount))
{
- wxRichTextLine* line = node2->GetData();
+ wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+ while (node2)
+ {
+ wxRichTextLine* line = node2->GetData();
- if (lineCount == lineNumber)
- return line;
+ if (lineCount == lineNumber)
+ return line;
- lineCount ++;
+ lineCount ++;
- node2 = node2->GetNext();
+ node2 = node2->GetNext();
+ }
}
+ else
+ lineCount += child->GetLines().GetCount();
}
- else
- lineCount += child->GetLines().GetCount();
node = node->GetNext();
}
while (node)
{
wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (obj != NULL);
+ // wxASSERT (obj != NULL);
wxRichTextObjectList::compatibility_iterator next = node->GetNext();
- // Delete the range in each paragraph
-
- if (!obj->GetRange().IsOutside(range))
+ if (obj)
{
- // Deletes the content of this object within the given range
- obj->DeleteRange(range);
+ // Delete the range in each paragraph
- wxRichTextRange thisRange = obj->GetRange();
- wxRichTextAttr thisAttr = obj->GetAttributes();
-
- // If the whole paragraph is within the range to delete,
- // delete the whole thing.
- if (range.GetStart() <= thisRange.GetStart() && range.GetEnd() >= thisRange.GetEnd())
+ if (!obj->GetRange().IsOutside(range))
{
- // Delete the whole object
- RemoveChild(obj, true);
- obj = NULL;
- }
- else if (!firstPara)
- firstPara = obj;
+ // Deletes the content of this object within the given range
+ obj->DeleteRange(range);
- // If the range includes the paragraph end, we need to join this
- // and the next paragraph.
- if (range.GetEnd() <= thisRange.GetEnd())
- {
- // We need to move the objects from the next paragraph
- // to this paragraph
+ wxRichTextRange thisRange = obj->GetRange();
+ wxRichTextAttr thisAttr = obj->GetAttributes();
- wxRichTextParagraph* nextParagraph = NULL;
- if ((range.GetEnd() < thisRange.GetEnd()) && obj)
- nextParagraph = obj;
- else
+ // If the whole paragraph is within the range to delete,
+ // delete the whole thing.
+ if (range.GetStart() <= thisRange.GetStart() && range.GetEnd() >= thisRange.GetEnd())
{
- // We're ending at the end of the paragraph, so merge the _next_ paragraph.
- if (next)
- nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
+ // Delete the whole object
+ RemoveChild(obj, true);
+ obj = NULL;
}
+ else if (!firstPara)
+ firstPara = obj;
- bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara;
-
- wxRichTextAttr nextParaAttr;
- if (applyFinalParagraphStyle)
+ // If the range includes the paragraph end, we need to join this
+ // and the next paragraph.
+ if (range.GetEnd() <= thisRange.GetEnd())
{
- // Special case when deleting the end of a paragraph - use _this_ paragraph's style,
- // not the next one.
- if (range.GetStart() == range.GetEnd() && range.GetStart() == thisRange.GetEnd())
- nextParaAttr = thisAttr;
+ // We need to move the objects from the next paragraph
+ // to this paragraph
+
+ wxRichTextParagraph* nextParagraph = NULL;
+ if ((range.GetEnd() < thisRange.GetEnd()) && obj)
+ nextParagraph = obj;
else
- nextParaAttr = nextParagraph->GetAttributes();
- }
+ {
+ // We're ending at the end of the paragraph, so merge the _next_ paragraph.
+ if (next)
+ nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
+ }
- if (firstPara && nextParagraph && firstPara != nextParagraph)
- {
- // Move the objects to the previous para
- wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();
+ bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara;
- while (node1)
+ wxRichTextAttr nextParaAttr;
+ if (applyFinalParagraphStyle)
{
- wxRichTextObject* obj1 = node1->GetData();
+ // Special case when deleting the end of a paragraph - use _this_ paragraph's style,
+ // not the next one.
+ if (range.GetStart() == range.GetEnd() && range.GetStart() == thisRange.GetEnd())
+ nextParaAttr = thisAttr;
+ else
+ nextParaAttr = nextParagraph->GetAttributes();
+ }
- firstPara->AppendChild(obj1);
+ if (firstPara && nextParagraph && firstPara != nextParagraph)
+ {
+ // Move the objects to the previous para
+ wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();
- wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
- nextParagraph->GetChildren().Erase(node1);
+ while (node1)
+ {
+ wxRichTextObject* obj1 = node1->GetData();
- node1 = next1;
- }
+ firstPara->AppendChild(obj1);
- // Delete the paragraph
- RemoveChild(nextParagraph, true);
- }
+ wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
+ nextParagraph->GetChildren().Erase(node1);
- // Avoid empty paragraphs
- if (firstPara && firstPara->GetChildren().GetCount() == 0)
- {
- wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
- firstPara->AppendChild(text);
- }
+ node1 = next1;
+ }
- if (applyFinalParagraphStyle)
- firstPara->SetAttributes(nextParaAttr);
+ // Delete the paragraph
+ RemoveChild(nextParagraph, true);
+ }
- return true;
+ // Avoid empty paragraphs
+ if (firstPara && firstPara->GetChildren().GetCount() == 0)
+ {
+ wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
+ firstPara->AppendChild(text);
+ }
+
+ if (applyFinalParagraphStyle)
+ firstPara->SetAttributes(nextParaAttr);
+
+ return true;
+ }
}
}
/// Get all the text
wxString wxRichTextParagraphLayoutBox::GetText() const
{
- return GetTextForRange(GetRange());
+ return GetTextForRange(GetOwnRange());
}
/// Get the paragraph by number
if (style.IsParagraphStyle())
paragraphStyle = true;
+ wxRichTextBuffer* buffer = GetBuffer();
+
bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0);
// Apply paragraph style first, if any
wxRichTextAttr wholeStyle(style);
- if (!removeStyle && wholeStyle.HasParagraphStyleName() && GetStyleSheet())
+ if (!removeStyle && wholeStyle.HasParagraphStyleName() && buffer->GetStyleSheet())
{
- wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
+ wxRichTextParagraphStyleDefinition* def = buffer->GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
if (def)
- wxRichTextApplyStyle(wholeStyle, def->GetStyleMergedWithBase(GetStyleSheet()));
+ wxRichTextApplyStyle(wholeStyle, def->GetStyleMergedWithBase(buffer->GetStyleSheet()));
}
// Limit the attributes to be set to the content to only character attributes.
wxRichTextAttr characterAttributes(wholeStyle);
characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
- if (!removeStyle && characterAttributes.HasCharacterStyleName() && GetStyleSheet())
+ if (!removeStyle && characterAttributes.HasCharacterStyleName() && buffer->GetStyleSheet())
{
- wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
+ wxRichTextCharacterStyleDefinition* def = buffer->GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
if (def)
- wxRichTextApplyStyle(characterAttributes, def->GetStyleMergedWithBase(GetStyleSheet()));
+ wxRichTextApplyStyle(characterAttributes, def->GetStyleMergedWithBase(buffer->GetStyleSheet()));
}
// If we are associated with a control, make undoable; otherwise, apply immediately
// to the data.
- bool haveControl = (GetRichTextCtrl() != NULL);
+ bool haveControl = (buffer->GetRichTextCtrl() != NULL);
wxRichTextAction* action = NULL;
if (haveControl && withUndo)
{
- action = new wxRichTextAction(NULL, _("Change Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+ action = new wxRichTextAction(NULL, _("Change Style"), wxRICHTEXT_CHANGE_STYLE, buffer, this, buffer->GetRichTextCtrl());
action->SetRange(range);
- action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+ action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
}
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (para != NULL);
+ // wxASSERT (para != NULL);
if (para && para->GetChildCount() > 0)
{
{
// Only apply attributes that will make a difference to the combined
// style as seen on the display
- wxRichTextAttr combinedAttr(para->GetCombinedAttributes());
+ wxRichTextAttr combinedAttr(para->GetCombinedAttributes(true));
wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle, & combinedAttr);
}
else
{
// Only apply attributes that will make a difference to the combined
// style as seen on the display
- wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes()));
+ wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes(), true));
wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr);
}
else
// Do action, or delay it until end of batch.
if (haveControl && withUndo)
- GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
-void wxRichTextParagraphLayoutBox::SetImageStyle(wxRichTextImage *image, const wxRichTextAttr& textAttr, int flags)
+// Just change the attributes for this single object.
+void wxRichTextParagraphLayoutBox::SetStyle(wxRichTextObject* obj, const wxRichTextAttr& textAttr, int flags)
{
+ wxRichTextBuffer* buffer = GetBuffer();
bool withUndo = flags & wxRICHTEXT_SETSTYLE_WITH_UNDO;
- bool haveControl = (GetRichTextCtrl() != NULL);
- wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
- wxRichTextParagraph* para = GetParagraphAtPosition(image->GetRange().GetStart());
+ bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0);
+ bool haveControl = (buffer->GetRichTextCtrl() != NULL);
+
wxRichTextAction *action = NULL;
- wxRichTextAttr oldTextAttr = image->GetAttributes();
+ wxRichTextAttr newAttr = obj->GetAttributes();
+ if (resetExistingStyle)
+ newAttr = textAttr;
+ else
+ newAttr.Apply(textAttr);
if (haveControl && withUndo)
{
- action = new wxRichTextAction(NULL, _("Change Image Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
- action->SetRange(image->GetRange().FromInternal());
- action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
- image->SetAttributes(textAttr);
+ action = new wxRichTextAction(NULL, _("Change Object Style"), wxRICHTEXT_CHANGE_ATTRIBUTES, buffer, obj->GetContainer(), buffer->GetRichTextCtrl());
+ action->SetRange(obj->GetRange().FromInternal());
+ action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
+ action->MakeObject(obj);
- // Set the new attribute
- newPara = new wxRichTextParagraph(*para);
- action->GetNewParagraphs().AppendChild(newPara);
- // Change back to the old one
- image->SetAttributes(oldTextAttr);
- action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+ action->GetAttributes() = newAttr;
}
else
- newPara = para;
+ obj->GetAttributes() = newAttr;
if (haveControl && withUndo)
- GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+ buffer->SubmitAction(action);
}
/// Get the text attributes for this position.
{
// Start with the base style
style = GetAttributes();
+ style.GetTextBoxAttr().Reset();
// Apply the paragraph style
wxRichTextApplyStyle(style, obj->GetAttributes());
wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
while (node)
{
- wxRichTextParagraph* para = (wxRichTextParagraph*) node->GetData();
- if (!(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart()))
+ wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+ if (para && !(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart()))
{
if (para->GetChildren().GetCount() == 0)
{
- wxRichTextAttr paraStyle = para->GetCombinedAttributes();
+ wxRichTextAttr paraStyle = para->GetCombinedAttributes(true /* use box attributes */);
CollectStyle(style, paraStyle, clashingAttr, absentAttrPara);
}
wxRichTextObject* child = childNode->GetData();
if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart()))
{
- wxRichTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes());
+ wxRichTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes(), true /* include box attributes */);
// Now collect character attributes only
childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER);
while (node)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (para != NULL);
+ // wxASSERT (para != NULL);
if (para)
{
if (childRange.GetLength() == 0 && GetRange().GetLength() == 1)
childRange.SetEnd(childRange.GetEnd()+1);
- if (!childRange.IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
+ if (!childRange.IsOutside(range) && wxDynamicCast(child, wxRichTextPlainText))
{
foundCount ++;
wxRichTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes());
- if (wxTextAttrEqPartial(textAttr, style))
+ if (textAttr.EqPartial(style, false /* strong test - attributes must be valid in both objects */))
matchingCount ++;
}
while (node)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (para != NULL);
+ // wxASSERT (para != NULL);
if (para)
{
wxRichTextApplyStyle(textAttr, para->GetAttributes());
foundCount ++;
- if (wxTextAttrEqPartial(textAttr, style))
+ if (textAttr.EqPartial(style, false /* strong test */))
matchingCount ++;
}
}
return foundCount == matchingCount && foundCount != 0;
}
-void wxRichTextParagraphLayoutBox::Reset()
-{
- Clear();
-
- wxRichTextBuffer* buffer = wxDynamicCast(this, wxRichTextBuffer);
- if (buffer && GetRichTextCtrl())
- {
- wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, GetRichTextCtrl()->GetId());
- event.SetEventObject(GetRichTextCtrl());
-
- buffer->SendEvent(event, true);
- }
-
- AddParagraph(wxEmptyString);
-
- Invalidate(wxRICHTEXT_ALL);
-}
-
-/// Invalidate the buffer. With no argument, invalidates whole buffer.
-void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange)
+void wxRichTextParagraphLayoutBox::PrepareContent(wxRichTextParagraphLayoutBox& container)
{
- SetDirty(true);
-
- if (invalidRange == wxRICHTEXT_ALL)
- {
- m_invalidRange = wxRICHTEXT_ALL;
- return;
- }
-
- // Already invalidating everything
- if (m_invalidRange == wxRICHTEXT_ALL)
- return;
-
- if ((invalidRange.GetStart() < m_invalidRange.GetStart()) || m_invalidRange.GetStart() == -1)
- m_invalidRange.SetStart(invalidRange.GetStart());
- if (invalidRange.GetEnd() > m_invalidRange.GetEnd())
- m_invalidRange.SetEnd(invalidRange.GetEnd());
+ wxRichTextBuffer* buffer = GetBuffer();
+ if (buffer && buffer->GetRichTextCtrl())
+ buffer->GetRichTextCtrl()->PrepareContent(container);
}
-/// Get invalid range, rounding to entire paragraphs if argument is true.
-wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const
+/// Set character or paragraph properties
+bool wxRichTextParagraphLayoutBox::SetProperties(const wxRichTextRange& range, const wxRichTextProperties& properties, int flags)
{
- if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE)
- return m_invalidRange;
-
- wxRichTextRange range = m_invalidRange;
+ wxRichTextBuffer* buffer = GetBuffer();
- if (wholeParagraphs)
- {
- wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart());
- if (para1)
- range.SetStart(para1->GetRange().GetStart());
- // floating layout make all child should be relayout
- range.SetEnd(GetRange().GetEnd());
- }
- return range;
-}
+ bool withUndo = ((flags & wxRICHTEXT_SETPROPERTIES_WITH_UNDO) != 0);
+ bool parasOnly = ((flags & wxRICHTEXT_SETPROPERTIES_PARAGRAPHS_ONLY) != 0);
+ bool charactersOnly = ((flags & wxRICHTEXT_SETPROPERTIES_CHARACTERS_ONLY) != 0);
+ bool resetExistingProperties = ((flags & wxRICHTEXT_SETPROPERTIES_RESET) != 0);
+ bool removeProperties = ((flags & wxRICHTEXT_SETPROPERTIES_REMOVE) != 0);
-/// Apply the style sheet to the buffer, for example if the styles have changed.
-bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet)
-{
- wxASSERT(styleSheet != NULL);
- if (!styleSheet)
- return false;
+ // If we are associated with a control, make undoable; otherwise, apply immediately
+ // to the data.
- int foundCount = 0;
+ bool haveControl = (buffer->GetRichTextCtrl() != NULL);
- wxRichTextAttr attr(GetBasicStyle());
- if (GetBasicStyle().HasParagraphStyleName())
- {
- wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName());
- if (paraDef)
- {
- attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet));
- SetBasicStyle(attr);
- foundCount ++;
- }
- }
+ wxRichTextAction* action = NULL;
- if (GetBasicStyle().HasCharacterStyleName())
+ if (haveControl && withUndo)
{
- wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName());
- if (charDef)
- {
- attr.Apply(charDef->GetStyleMergedWithBase(styleSheet));
- SetBasicStyle(attr);
- foundCount ++;
- }
+ action = new wxRichTextAction(NULL, _("Change Properties"), wxRICHTEXT_CHANGE_PROPERTIES, buffer, this, buffer->GetRichTextCtrl());
+ action->SetRange(range);
+ action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
}
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (para != NULL);
+ // wxASSERT (para != NULL);
- if (para)
+ if (para && para->GetChildCount() > 0)
{
- // Combine paragraph and list styles. If there is a list style in the original attributes,
- // the current indentation overrides anything else and is used to find the item indentation.
- // Also, for applying paragraph styles, consider having 2 modes: (1) we merge with what we have,
- // thereby taking into account all user changes, (2) reset the style completely (except for indentation/list
- // exception as above).
- // Problem: when changing from one list style to another, there's a danger that the level info will get lost.
- // So when changing a list style interactively, could retrieve level based on current style, then
- // set appropriate indent and apply new style.
-
- int outline = -1;
- int num = -1;
- if (para->GetAttributes().HasOutlineLevel())
- outline = para->GetAttributes().GetOutlineLevel();
- if (para->GetAttributes().HasBulletNumber())
- num = para->GetAttributes().GetBulletNumber();
+ // Stop searching if we're beyond the range of interest
+ if (para->GetRange().GetStart() > range.GetEnd())
+ break;
- if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+ if (!para->GetRange().IsOutside(range))
{
- int currentIndent = para->GetAttributes().GetLeftIndent();
+ // We'll be using a copy of the paragraph to make style changes,
+ // not updating the buffer directly.
+ wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
- wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
- wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
- if (paraDef && !listDef)
- {
- para->GetAttributes() = paraDef->GetStyleMergedWithBase(styleSheet);
- foundCount ++;
- }
- else if (listDef && !paraDef)
+ if (haveControl && withUndo)
{
- // Set overall style defined for the list style definition
- para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
+ newPara = new wxRichTextParagraph(*para);
+ action->GetNewParagraphs().AppendChild(newPara);
- // Apply the style for this level
- wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
- foundCount ++;
+ // Also store the old ones for Undo
+ action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
}
- else if (listDef && paraDef)
+ else
+ newPara = para;
+
+ if (parasOnly)
{
- // Combines overall list style, style for level, and paragraph style
- para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyleMergedWithBase(styleSheet));
- foundCount ++;
+ if (removeProperties)
+ {
+ // Removes the given style from the paragraph
+ // TODO
+ newPara->GetProperties().RemoveProperties(properties);
+ }
+ else if (resetExistingProperties)
+ newPara->GetProperties() = properties;
+ else
+ newPara->GetProperties().MergeProperties(properties);
}
- }
- else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
- {
- int currentIndent = para->GetAttributes().GetLeftIndent();
- wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+ // When applying paragraph styles dynamically, don't change the text objects' attributes
+ // since they will computed as needed. Only apply the character styling if it's _only_
+ // character styling. This policy is subject to change and might be put under user control.
- // Overall list definition style
- para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
+ // Hm. we might well be applying a mix of paragraph and character styles, in which
+ // case we _do_ want to apply character styles regardless of what para styles are set.
+ // But if we're applying a paragraph style, which has some character attributes, but
+ // we only want the paragraphs to hold this character style, then we _don't_ want to
+ // apply the character style. So we need to be able to choose.
- // Style for this level
- wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
+ if (!parasOnly && charactersOnly && range.GetStart() != newPara->GetRange().GetEnd())
+ {
+ wxRichTextRange childRange(range);
+ childRange.LimitTo(newPara->GetRange());
+
+ // Find the starting position and if necessary split it so
+ // we can start applying different properties.
+ // TODO: check that the properties actually change or are different
+ // from properties outside of range
+ wxRichTextObject* firstObject wxDUMMY_INITIALIZE(NULL);
+ wxRichTextObject* lastObject wxDUMMY_INITIALIZE(NULL);
+
+ if (childRange.GetStart() == newPara->GetRange().GetStart())
+ firstObject = newPara->GetChildren().GetFirst()->GetData();
+ else
+ firstObject = newPara->SplitAt(range.GetStart());
+
+ // Increment by 1 because we're apply the style one _after_ the split point
+ long splitPoint = childRange.GetEnd();
+ if (splitPoint != newPara->GetRange().GetEnd())
+ splitPoint ++;
+
+ // Find last object
+ if (splitPoint == newPara->GetRange().GetEnd())
+ lastObject = newPara->GetChildren().GetLast()->GetData();
+ else
+ // lastObject is set as a side-effect of splitting. It's
+ // returned as the object before the new object.
+ (void) newPara->SplitAt(splitPoint, & lastObject);
+
+ wxASSERT(firstObject != NULL);
+ wxASSERT(lastObject != NULL);
+
+ if (!firstObject || !lastObject)
+ continue;
+
+ wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
+ wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
+
+ wxASSERT(firstNode);
+ wxASSERT(lastNode);
+
+ wxRichTextObjectList::compatibility_iterator node2 = firstNode;
+
+ while (node2)
+ {
+ wxRichTextObject* child = node2->GetData();
+
+ if (removeProperties)
+ {
+ // Removes the given properties from the paragraph
+ child->GetProperties().RemoveProperties(properties);
+ }
+ else if (resetExistingProperties)
+ child->GetProperties() = properties;
+ else
+ {
+ child->GetProperties().MergeProperties(properties);
+ }
+
+ if (node2 == lastNode)
+ break;
+
+ node2 = node2->GetNext();
+ }
+ }
+ }
+ }
+
+ node = node->GetNext();
+ }
+
+ // Do action, or delay it until end of batch.
+ if (haveControl && withUndo)
+ buffer->SubmitAction(action);
+
+ return true;
+}
+
+void wxRichTextParagraphLayoutBox::Reset()
+{
+ Clear();
+
+ wxRichTextBuffer* buffer = GetBuffer();
+ if (buffer && buffer->GetRichTextCtrl())
+ {
+ wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, buffer->GetRichTextCtrl()->GetId());
+ event.SetEventObject(buffer->GetRichTextCtrl());
+ event.SetContainer(this);
+
+ buffer->SendEvent(event, true);
+ }
+
+ AddParagraph(wxEmptyString);
+
+ PrepareContent(*this);
+
+ InvalidateHierarchy(wxRICHTEXT_ALL);
+}
+
+/// Invalidate the buffer. With no argument, invalidates whole buffer.
+void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange)
+{
+ wxRichTextCompositeObject::Invalidate(invalidRange);
+
+ DoInvalidate(invalidRange);
+}
+
+// Do the (in)validation for this object only
+void wxRichTextParagraphLayoutBox::DoInvalidate(const wxRichTextRange& invalidRange)
+{
+ if (invalidRange == wxRICHTEXT_ALL)
+ {
+ m_invalidRange = wxRICHTEXT_ALL;
+ }
+ // Already invalidating everything
+ else if (m_invalidRange == wxRICHTEXT_ALL)
+ {
+ }
+ else
+ {
+ if ((invalidRange.GetStart() < m_invalidRange.GetStart()) || m_invalidRange.GetStart() == -1)
+ m_invalidRange.SetStart(invalidRange.GetStart());
+ if (invalidRange.GetEnd() > m_invalidRange.GetEnd())
+ m_invalidRange.SetEnd(invalidRange.GetEnd());
+ }
+}
+
+// Do the (in)validation both up and down the hierarchy
+void wxRichTextParagraphLayoutBox::InvalidateHierarchy(const wxRichTextRange& invalidRange)
+{
+ Invalidate(invalidRange);
+
+ if (invalidRange != wxRICHTEXT_NONE)
+ {
+ // Now go up the hierarchy
+ wxRichTextObject* thisObj = this;
+ wxRichTextObject* p = GetParent();
+ while (p)
+ {
+ wxRichTextParagraphLayoutBox* l = wxDynamicCast(p, wxRichTextParagraphLayoutBox);
+ if (l)
+ l->DoInvalidate(thisObj->GetRange());
+
+ thisObj = p;
+ p = p->GetParent();
+ }
+ }
+}
+
+/// Get invalid range, rounding to entire paragraphs if argument is true.
+wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const
+{
+ if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE)
+ return m_invalidRange;
+
+ wxRichTextRange range = m_invalidRange;
+
+ if (wholeParagraphs)
+ {
+ wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart());
+ if (para1)
+ range.SetStart(para1->GetRange().GetStart());
+ // floating layout make all child should be relayout
+ range.SetEnd(GetOwnRange().GetEnd());
+ }
+ return range;
+}
+
+/// Apply the style sheet to the buffer, for example if the styles have changed.
+bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet)
+{
+ wxASSERT(styleSheet != NULL);
+ if (!styleSheet)
+ return false;
+
+ int foundCount = 0;
+
+ wxRichTextAttr attr(GetBasicStyle());
+ if (GetBasicStyle().HasParagraphStyleName())
+ {
+ wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName());
+ if (paraDef)
+ {
+ attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet));
+ SetBasicStyle(attr);
+ foundCount ++;
+ }
+ }
+
+ if (GetBasicStyle().HasCharacterStyleName())
+ {
+ wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName());
+ if (charDef)
+ {
+ attr.Apply(charDef->GetStyleMergedWithBase(styleSheet));
+ SetBasicStyle(attr);
+ foundCount ++;
+ }
+ }
+
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+ // wxASSERT (para != NULL);
+
+ if (para)
+ {
+ // Combine paragraph and list styles. If there is a list style in the original attributes,
+ // the current indentation overrides anything else and is used to find the item indentation.
+ // Also, for applying paragraph styles, consider having 2 modes: (1) we merge with what we have,
+ // thereby taking into account all user changes, (2) reset the style completely (except for indentation/list
+ // exception as above).
+ // Problem: when changing from one list style to another, there's a danger that the level info will get lost.
+ // So when changing a list style interactively, could retrieve level based on current style, then
+ // set appropriate indent and apply new style.
+
+ int outline = -1;
+ int num = -1;
+ if (para->GetAttributes().HasOutlineLevel())
+ outline = para->GetAttributes().GetOutlineLevel();
+ if (para->GetAttributes().HasBulletNumber())
+ num = para->GetAttributes().GetBulletNumber();
+
+ if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+ {
+ int currentIndent = para->GetAttributes().GetLeftIndent();
+
+ wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+ wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+ if (paraDef && !listDef)
+ {
+ para->GetAttributes() = paraDef->GetStyleMergedWithBase(styleSheet);
+ foundCount ++;
+ }
+ else if (listDef && !paraDef)
+ {
+ // Set overall style defined for the list style definition
+ para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
+
+ // Apply the style for this level
+ wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
+ foundCount ++;
+ }
+ else if (listDef && paraDef)
+ {
+ // Combines overall list style, style for level, and paragraph style
+ para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyleMergedWithBase(styleSheet));
+ foundCount ++;
+ }
+ }
+ else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+ {
+ int currentIndent = para->GetAttributes().GetLeftIndent();
+
+ wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+
+ // Overall list definition style
+ para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
+
+ // Style for this level
+ wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
foundCount ++;
}
/// Set list style
bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
{
- wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+ wxRichTextBuffer* buffer = GetBuffer();
+ wxRichTextStyleSheet* styleSheet = buffer->GetStyleSheet();
bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
// bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
// If we are associated with a control, make undoable; otherwise, apply immediately
// to the data.
- bool haveControl = (GetRichTextCtrl() != NULL);
+ bool haveControl = (buffer->GetRichTextCtrl() != NULL);
wxRichTextAction* action = NULL;
if (haveControl && withUndo)
{
- action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+ action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, buffer, this, buffer->GetRichTextCtrl());
action->SetRange(range);
- action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+ action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
}
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (para != NULL);
+ // wxASSERT (para != NULL);
if (para && para->GetChildCount() > 0)
{
wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
// Now we need to do numbering
- if (renumber)
+ // Preserve the existing list item continuation bullet style, if any
+ if (para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION))
+ newPara->GetAttributes().SetBulletStyle(newPara->GetAttributes().GetBulletStyle()|wxTEXT_ATTR_BULLET_STYLE_CONTINUATION);
+ else
{
- newPara->GetAttributes().SetBulletNumber(n);
- }
+ // Now we need to do numbering
+ if (renumber)
+ {
+ newPara->GetAttributes().SetBulletNumber(n);
+ }
- n ++;
+ n ++;
+ }
}
else if (!newPara->GetAttributes().GetListStyleName().IsEmpty())
{
// Do action, or delay it until end of batch.
if (haveControl && withUndo)
- GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
{
- if (GetStyleSheet())
+ wxRichTextBuffer* buffer = GetBuffer();
+ if (buffer && buffer->GetStyleSheet())
{
- wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(defName);
+ wxRichTextListStyleDefinition* def = buffer->GetStyleSheet()->FindListStyle(defName);
if (def)
return SetListStyle(range, def, flags, startFrom, specifiedLevel);
}
bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy,
wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
{
- wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+ wxRichTextBuffer* buffer = GetBuffer();
+ wxRichTextStyleSheet* styleSheet = buffer->GetStyleSheet();
bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
// bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
levels[i] = -1; // start from the number we found, if any
}
+#if wxDEBUG_LEVEL
wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+#endif
// If we are associated with a control, make undoable; otherwise, apply immediately
// to the data.
- bool haveControl = (GetRichTextCtrl() != NULL);
+ bool haveControl = (buffer->GetRichTextCtrl() != NULL);
wxRichTextAction* action = NULL;
if (haveControl && withUndo)
{
- action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+ action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, buffer, this, buffer->GetRichTextCtrl());
action->SetRange(range);
- action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+ action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
}
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (para != NULL);
+ // wxASSERT (para != NULL);
if (para && para->GetChildCount() > 0)
{
wxRichTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet));
wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+ // Preserve the existing list item continuation bullet style, if any
+ if (para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION))
+ newPara->GetAttributes().SetBulletStyle(newPara->GetAttributes().GetBulletStyle()|wxTEXT_ATTR_BULLET_STYLE_CONTINUATION);
+
// OK, we've (re)applied the style, now let's get the numbering right.
if (currentLevel == -1)
}
else
{
- levels[currentLevel] ++;
+ if (!(para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION)))
+ levels[currentLevel] ++;
}
newPara->GetAttributes().SetBulletNumber(levels[currentLevel]);
// Do action, or delay it until end of batch.
if (haveControl && withUndo)
- GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
{
- if (GetStyleSheet())
+ wxRichTextBuffer* buffer = GetBuffer();
+ if (buffer->GetStyleSheet())
{
wxRichTextListStyleDefinition* def = NULL;
if (!defName.IsEmpty())
- def = GetStyleSheet()->FindListStyle(defName);
+ def = buffer->GetStyleSheet()->FindListStyle(defName);
return NumberList(range, def, flags, startFrom, specifiedLevel);
}
return false;
bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
{
- if (GetStyleSheet())
+ wxRichTextBuffer* buffer = GetBuffer();
+ if (buffer->GetStyleSheet())
{
wxRichTextListStyleDefinition* def = NULL;
if (!defName.IsEmpty())
- def = GetStyleSheet()->FindListStyle(defName);
+ def = buffer->GetStyleSheet()->FindListStyle(defName);
return PromoteList(promoteBy, range, def, flags, specifiedLevel);
}
return false;
/// position of the paragraph that it had to start looking from.
bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxRichTextAttr& attr) const
{
+ // Search for a paragraph that isn't a continuation paragraph (no bullet)
+ while (previousParagraph && previousParagraph->GetAttributes().HasBulletStyle() && previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION)
+ {
+ wxRichTextObjectList::compatibility_iterator node = ((wxRichTextCompositeObject*) previousParagraph->GetParent())->GetChildren().Find(previousParagraph);
+ if (node)
+ {
+ node = node->GetPrevious();
+ if (node)
+ previousParagraph = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+ else
+ previousParagraph = NULL;
+ }
+ else
+ previousParagraph = NULL;
+ }
+
if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
return false;
- wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+ wxRichTextBuffer* buffer = GetBuffer();
+ wxRichTextStyleSheet* styleSheet = buffer->GetStyleSheet();
if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
{
wxRichTextListStyleDefinition* def = styleSheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName());
* This object represents a single paragraph (or in a straight text editor, a line).
*/
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox)
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextCompositeObject)
wxArrayInt wxRichTextParagraph::sm_defaultTabs;
wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxRichTextAttr* style):
- wxRichTextBox(parent)
+ wxRichTextCompositeObject(parent)
{
if (style)
SetAttributes(*style);
}
wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* paraStyle, wxRichTextAttr* charStyle):
- wxRichTextBox(parent)
+ wxRichTextCompositeObject(parent)
{
if (paraStyle)
SetAttributes(*paraStyle);
}
/// Draw the item
-bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int style)
+bool wxRichTextParagraph::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int WXUNUSED(descent), int style)
{
+ if (!IsShown())
+ return true;
+
+ // Currently we don't merge these attributes with the parent, but we
+ // should consider whether we should (e.g. if we set a border colour
+ // for all paragraphs). But generally box attributes are likely to be
+ // different for different objects.
+ wxRect paraRect = GetRect();
wxRichTextAttr attr = GetCombinedAttributes();
+ context.ApplyVirtualAttributes(attr, this);
+
+ DrawBoxAttributes(dc, GetBuffer(), attr, paraRect);
// Draw the bullet, if any
- if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
+ if ((attr.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE) == 0 && (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION) == 0)
{
if (attr.GetLeftSubIndent() != 0)
{
int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
- wxRichTextAttr bulletAttr(GetCombinedAttributes());
+ wxRichTextAttr bulletAttr(attr);
// Combine with the font of the first piece of content, if one is specified
if (GetChildren().GetCount() > 0)
objectRange.LimitTo(lineRange);
wxSize objectSize;
-#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
- if (i < (int) line->GetObjectSizes().GetCount())
+ if (child->IsTopLevel())
{
- objectSize.x = line->GetObjectSizes()[(size_t) i];
+ objectSize = child->GetCachedSize();
+ objectRange = child->GetOwnRange();
}
else
-#endif
{
- int descent = 0;
- child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition);
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+ if (i < (int) line->GetObjectSizes().GetCount())
+ {
+ objectSize.x = line->GetObjectSizes()[(size_t) i];
+ }
+ else
+#endif
+ {
+ int descent = 0;
+ child->GetRangeSize(objectRange, objectSize, descent, dc, context, wxRICHTEXT_UNFORMATTED, objectPosition);
+ }
}
// Use the child object's width, but the whole line's height
wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y));
- child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style);
+ child->Draw(dc, context, objectRange, selection, childRect, maxDescent, style);
objectPosition.x += objectSize.x;
i ++;
}
/// Lay the item out
-bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
+bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style)
{
// Deal with floating objects firstly before the normal layout
wxRichTextBuffer* buffer = GetBuffer();
wxASSERT(buffer);
- wxRichTextFloatCollector* collector = buffer->GetFloatCollector();
+ wxRichTextFloatCollector* collector = GetContainer()->GetFloatCollector();
wxASSERT(collector);
- LayoutFloat(dc, rect, style, collector);
+ LayoutFloat(dc, context, rect, style, collector);
wxRichTextAttr attr = GetCombinedAttributes();
+ context.ApplyVirtualAttributes(attr, this);
// ClearLines();
int lineSpacing = 0;
// Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc.
- if (attr.HasLineSpacing() && attr.GetLineSpacing() > 0 && attr.GetFont().Ok())
+ if (attr.HasLineSpacing() && attr.GetLineSpacing() > 0 && attr.GetFont().IsOk())
{
wxCheckSetFont(dc, attr.GetFont());
lineSpacing = (int) (double(dc.GetCharHeight()) * (double(attr.GetLineSpacing())/10.0 - 1.0));
// Start position for each line relative to the paragraph
int startPositionFirstLine = leftIndent;
int startPositionSubsequentLines = leftIndent + leftSubIndent;
- wxRect availableRect;
// If we have a bullet in this paragraph, the start position for the first line's text
// is actually leftIndent + leftSubIndent.
wxPoint currentPosition(0, spaceBeforePara); // We will calculate lines relative to paragraph
int lineHeight = 0;
int maxWidth = 0;
+ int maxHeight = currentPosition.y;
int maxAscent = 0;
int maxDescent = 0;
int lineCount = 0;
int paraDescent = 0;
// This calculates the partial text extents
- GetRangeSize(GetRange(), paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents);
+ GetRangeSize(GetRange(), paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, rect.GetPosition(), & partialExtents);
#else
node = m_children.GetFirst();
while (node)
{
wxRichTextObject* child = node->GetData();
- child->SetCachedSize(wxDefaultSize);
- child->Layout(dc, rect, style);
+ //child->SetCachedSize(wxDefaultSize);
+ child->Layout(dc, context, rect, style);
node = node->GetNext();
}
-
#endif
// Split up lines
// find the child corresponding to the start position of the string, and
// continue.
+ wxRect availableRect;
+
node = m_children.GetFirst();
while (node)
{
wxRichTextObject* child = node->GetData();
// If floating, ignore. We already laid out floats.
- if (child->IsFloating() || child->GetRange().GetLength() == 0)
+ // Also ignore if empty object, except if we haven't got any
+ // size yet.
+ if (child->IsFloating() || !child->IsShown() ||
+ (child->GetRange().GetLength() == 0 && maxHeight > spaceBeforePara)
+ )
{
node = node->GetNext();
continue;
wxSize childSize;
int childDescent = 0;
+ int startOffset = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
+ availableRect = wxRect(rect.x + startOffset, rect.y + currentPosition.y,
+ rect.width - startOffset - rightIndent, rect.height);
+
+ if (child->IsTopLevel())
+ {
+ wxSize oldSize = child->GetCachedSize();
+
+ child->Invalidate(wxRICHTEXT_ALL);
+ child->SetPosition(wxPoint(0, 0));
+
+ // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+ // lays out the object again using the minimum size
+ // The position will be determined by its location in its line,
+ // and not by the child's actual position.
+ child->LayoutToBestSize(dc, context, buffer,
+ attr, child->GetAttributes(), availableRect, parentRect, style);
+
+ if (oldSize != child->GetCachedSize())
+ {
+ partialExtents.Clear();
+
+ // Recalculate the partial text extents since the child object changed size
+ GetRangeSize(GetRange(), paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents);
+ }
+ }
+
+ // Problem: we need to layout composites here for which we need the available width,
+ // but we can't get the available width without using the float collector which
+ // needs to know the object height.
+
if ((nextBreakPos == -1) && (lastEndPos == child->GetRange().GetStart() - 1)) // i.e. we want to get the whole thing
{
childSize = child->GetCachedSize();
{
#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
// Get height only, then the width using the partial extents
- GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+ GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
childSize.x = wxRichTextGetRangeWidth(*this, wxRichTextRange(lastEndPos+1, lastPosToUse), partialExtents);
#else
- GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition());
+ GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED, rect.GetPosition());
#endif
}
- // Available width depends on the floating objects and the line height
- // Note: the floating objects may be placed vertically along the two side of
- // buffer, so we may have different available line width with different
- // [startY, endY]. So, we should can't determine how wide the available
- // space is until we know the exact line height.
- lineDescent = wxMax(childDescent, maxDescent);
- lineAscent = wxMax(childSize.y-childDescent, maxAscent);
- lineHeight = lineDescent + lineAscent;
- availableRect = collector->GetAvailableRect(rect.y + currentPosition.y, rect.y + currentPosition.y + lineHeight);
+ bool doLoop = true;
+ int loopIterations = 0;
+
+ // If there are nested objects that need to lay themselves out, we have to do this in a
+ // loop because the height of the object may well depend on the available width.
+ // And because of floating object positioning, the available width depends on the
+ // height of the object and whether it will clash with the floating objects.
+ // So, we see whether the available width changes due to the presence of floating images.
+ // If it does, then we'll use the new restricted width to find the object height again.
+ // If this causes another restriction in the available width, we'll try again, until
+ // either we lose patience or the available width settles down.
+ do
+ {
+ loopIterations ++;
+
+ wxRect oldAvailableRect = availableRect;
+
+ // Available width depends on the floating objects and the line height.
+ // Note: the floating objects may be placed vertically along the two sides of
+ // buffer, so we may have different available line widths with different
+ // [startY, endY]. So, we can't determine how wide the available
+ // space is until we know the exact line height.
+ if (childDescent == 0)
+ {
+ lineHeight = wxMax(lineHeight, childSize.y);
+ lineDescent = maxDescent;
+ lineAscent = maxAscent;
+ }
+ else
+ {
+ lineDescent = wxMax(childDescent, maxDescent);
+ lineAscent = wxMax(childSize.y-childDescent, maxAscent);
+ }
+ lineHeight = wxMax(lineHeight, (lineDescent + lineAscent));
+ wxRect floatAvailableRect = collector->GetAvailableRect(rect.y + currentPosition.y, rect.y + currentPosition.y + lineHeight);
+
+ // Adjust availableRect to the space that is available when taking floating objects into account.
+
+ if (floatAvailableRect.x + startOffset > availableRect.x)
+ {
+ int newX = floatAvailableRect.x + startOffset;
+ int newW = availableRect.width - (newX - availableRect.x);
+ availableRect.x = newX;
+ availableRect.width = newW;
+ }
+
+ if (floatAvailableRect.width < availableRect.width)
+ availableRect.width = floatAvailableRect.width;
+
+ currentPosition.x = availableRect.x - rect.x;
+
+ if (child->IsTopLevel() && loopIterations <= 20)
+ {
+ if (availableRect != oldAvailableRect)
+ {
+ wxSize oldSize = child->GetCachedSize();
+
+ // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+ // lays out the object again using the minimum size
+ child->Invalidate(wxRICHTEXT_ALL);
+ child->LayoutToBestSize(dc, context, buffer,
+ attr, child->GetAttributes(), availableRect, parentRect, style);
+ childSize = child->GetCachedSize();
+ childDescent = child->GetDescent();
+
+ if (oldSize != child->GetCachedSize())
+ {
+ partialExtents.Clear();
+
+ // Recalculate the partial text extents since the child object changed size
+ GetRangeSize(GetRange(), paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents);
+ }
+
+ // Go around the loop finding the available rect for the given floating objects
+ }
+ else
+ doLoop = false;
+ }
+ else
+ doLoop = false;
+ }
+ while (doLoop);
- currentPosition.x = (lineCount == 0 ? availableRect.x + startPositionFirstLine : availableRect.x + startPositionSubsequentLines);
+ if (child->IsTopLevel())
+ {
+ // We can move it to the correct position at this point
+ // TODO: probably need to add margin
+ child->Move(GetPosition() + wxPoint(currentWidth + (wxMax(leftIndent, leftIndent + leftSubIndent)), currentPosition.y));
+ }
// Cases:
// 1) There was a line break BEFORE the natural break
// 2) There was a line break AFTER the natural break
- // 3) The child still fits (carry on)
+ // 3) It's the last line
+ // 4) The child still fits (carry on) - 'else' clause
+
+ if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableRect.width))
+ ||
+ (childSize.x + currentWidth > availableRect.width)
+ ||
+ ((childSize.x + currentWidth <= availableRect.width) && !node->GetNext())
- if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableRect.width)) ||
- (childSize.x + currentWidth > availableRect.width))
+ )
{
long wrapPosition = 0;
+ if ((childSize.x + currentWidth <= availableRect.width) && !node->GetNext() && !lineBreakInThisObject)
+ wrapPosition = child->GetRange().GetEnd();
+ else
- int indent = lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines;
- indent += rightIndent;
// Find a place to wrap. This may walk back to previous children,
// for example if a word spans several objects.
// Note: one object must contains only one wxTextAtrr, so the line height will not
// change inside one object. Thus, we can pass the remain line width to the
// FindWrapPosition function.
- if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableRect.width - indent, wrapPosition, & partialExtents))
+ if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, context, availableRect.width, wrapPosition, & partialExtents))
{
// If the function failed, just cut it off at the end of this child.
wrapPosition = child->GetRange().GetEnd();
if (wrapPosition <= lastCompletedEndPos)
wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd());
+ // Line end position shouldn't be the same as the end, or greater.
+ if (wrapPosition >= GetRange().GetEnd())
+ wrapPosition = wxMax(0, GetRange().GetEnd()-1);
+
// wxLogDebug(wxT("Split at %ld"), wrapPosition);
// Let's find the actual size of the current line now
wxSize actualSize;
wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);
- /// Use previous descent, not the wrapping descent we just found, since this may be too big
- /// for the fragment we're about to add.
- childDescent = maxDescent;
+ childDescent = 0;
#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
- // Get height only, then the width using the partial extents
- GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
- actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents);
-#else
- GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED);
+ if (!child->IsEmpty())
+ {
+ // Get height only, then the width using the partial extents
+ GetRangeSize(actualRange, actualSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+ actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents);
+ }
+ else
#endif
+ GetRangeSize(actualRange, actualSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED);
currentWidth = actualSize.x;
- maxDescent = wxMax(childDescent, maxDescent);
- maxAscent = wxMax(actualSize.y-childDescent, maxAscent);
- lineHeight = maxDescent + maxAscent;
+
+ // The descent for the whole line at this point, is the correct max descent
+ maxDescent = childDescent;
+ // Maximum ascent
+ maxAscent = actualSize.y-childDescent;
+
+ // lineHeight is given by the height for the whole line, since it will
+ // take into account ascend/descend.
+ lineHeight = actualSize.y;
+
+ if (lineHeight == 0 && buffer)
+ {
+ wxFont font(buffer->GetFontTable().FindFont(attr));
+ wxCheckSetFont(dc, font);
+ lineHeight = dc.GetCharHeight();
+ }
+
+ if (maxDescent == 0)
+ {
+ int w, h;
+ dc.GetTextExtent(wxT("X"), & w, &h, & maxDescent);
+ }
// Add a new line
wxRichTextLine* line = AllocateLine(lineCount);
line->SetSize(wxSize(currentWidth, lineHeight));
line->SetDescent(maxDescent);
+ maxHeight = currentPosition.y + lineHeight;
+
// Now move down a line. TODO: add margins, spacing
currentPosition.y += lineHeight;
currentPosition.y += lineSpacing;
- currentWidth = 0;
maxDescent = 0;
maxAscent = 0;
- maxWidth = wxMax(maxWidth, currentWidth);
+ maxWidth = wxMax(maxWidth, currentWidth+startOffset);
+ currentWidth = 0;
lineCount ++;
- // TODO: account for zero-length objects, such as fields
- wxASSERT(wrapPosition > lastCompletedEndPos);
+ // TODO: account for zero-length objects
+ // wxASSERT(wrapPosition > lastCompletedEndPos);
lastEndPos = wrapPosition;
lastCompletedEndPos = lastEndPos;
lineHeight = 0;
- // May need to set the node back to a previous one, due to searching back in wrapping
- wxRichTextObject* childAfterWrapPosition = FindObjectAtPosition(wrapPosition+1);
- if (childAfterWrapPosition)
- node = m_children.Find(childAfterWrapPosition);
+ if (wrapPosition < GetRange().GetEnd()-1)
+ {
+ // May need to set the node back to a previous one, due to searching back in wrapping
+ wxRichTextObject* childAfterWrapPosition = FindObjectAtPosition(wrapPosition+1);
+ if (childAfterWrapPosition)
+ node = m_children.Find(childAfterWrapPosition);
+ else
+ node = node->GetNext();
+ }
else
node = node->GetNext();
+
+ // Apply paragraph styles such as alignment to the wrapped line
+ ApplyParagraphStyle(line, attr, availableRect, dc);
}
else
{
// We still fit, so don't add a line, and keep going
currentWidth += childSize.x;
- maxDescent = wxMax(childDescent, maxDescent);
- maxAscent = wxMax(childSize.y-childDescent, maxAscent);
- lineHeight = maxDescent + maxAscent;
- maxWidth = wxMax(maxWidth, currentWidth);
+ if (childDescent == 0)
+ {
+ // An object with a zero descend value wants to take up the whole
+ // height regardless of baseline
+ lineHeight = wxMax(lineHeight, childSize.y);
+ }
+ else
+ {
+ maxDescent = wxMax(childDescent, maxDescent);
+ maxAscent = wxMax(childSize.y-childDescent, maxAscent);
+ }
+
+ lineHeight = wxMax(lineHeight, (maxDescent + maxAscent));
+
+ maxWidth = wxMax(maxWidth, currentWidth+startOffset);
lastEndPos = child->GetRange().GetEnd();
node = node->GetNext();
}
}
- // Add the last line - it's the current pos -> last para pos
- // Substract -1 because the last position is always the end-paragraph position.
- if (lastCompletedEndPos <= GetRange().GetEnd()-1)
- {
- currentPosition.x = (lineCount == 0 ? availableRect.x + startPositionFirstLine : availableRect.x + startPositionSubsequentLines);
-
- wxRichTextLine* line = AllocateLine(lineCount);
+ //wxASSERT(!(lastCompletedEndPos != -1 && lastCompletedEndPos < GetRange().GetEnd()-1));
- wxRichTextRange actualRange(lastCompletedEndPos+1, GetRange().GetEnd()-1);
+ // Remove remaining unused line objects, if any
+ ClearUnusedLines(lineCount);
- // Set relative range so we won't have to change line ranges when paragraphs are moved
- line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart()));
+ // We need to add back the margins etc.
+ {
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0, 0), wxSize(maxWidth, currentPosition.y + spaceAfterPara));
+ GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ SetCachedSize(marginRect.GetSize());
+ }
- line->SetPosition(currentPosition);
+ // The maximum size is the length of the paragraph stretched out into a line.
+ // So if there were a single word, or an image, or a fixed-size text box, the object could be shrunk around
+ // this size. TODO: take into account line breaks.
+ {
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0, 0), wxSize(paraSize.x + wxMax(leftIndent, leftIndent + leftSubIndent) + rightIndent, currentPosition.y + spaceAfterPara));
+ GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ SetMaxSize(marginRect.GetSize());
+ }
- if (lineHeight == 0 && GetBuffer())
- {
- wxFont font(GetBuffer()->GetFontTable().FindFont(attr));
- wxCheckSetFont(dc, font);
- lineHeight = dc.GetCharHeight();
- }
- if (maxDescent == 0)
+ // Find the greatest minimum size. Currently we only look at non-text objects,
+ // which isn't ideal but it would be slow to find the maximum word width to
+ // use as the minimum.
+ {
+ int minWidth = 0;
+ node = m_children.GetFirst();
+ while (node)
{
- int w, h;
- dc.GetTextExtent(wxT("X"), & w, &h, & maxDescent);
+ wxRichTextObject* child = node->GetData();
+
+ // If floating, ignore. We already laid out floats.
+ // Also ignore if empty object, except if we haven't got any
+ // size yet.
+ if (!child->IsFloating() && child->GetRange().GetLength() != 0 && !wxDynamicCast(child, wxRichTextPlainText))
+ {
+ if (child->GetCachedSize().x > minWidth)
+ minWidth = child->GetMinSize().x;
+ }
+ node = node->GetNext();
}
- line->SetSize(wxSize(currentWidth, lineHeight));
- line->SetDescent(maxDescent);
- currentPosition.y += lineHeight;
- currentPosition.y += lineSpacing;
- lineCount ++;
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0, 0), wxSize(minWidth, currentPosition.y + spaceAfterPara));
+ GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ SetMinSize(marginRect.GetSize());
}
- // Remove remaining unused line objects, if any
- ClearUnusedLines(lineCount);
-
- // Apply styles to wrapped lines
- ApplyParagraphStyle(attr, rect, dc);
-
- SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceAfterPara));
-
- m_dirty = false;
-
#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
// Use the text extents to calculate the size of each fragment in each line
}
/// Apply paragraph styles, such as centering, to wrapped lines
-void wxRichTextParagraph::ApplyParagraphStyle(const wxRichTextAttr& attr, const wxRect& rect, wxDC& dc)
+/// TODO: take into account box attributes, possibly
+void wxRichTextParagraph::ApplyParagraphStyle(wxRichTextLine* line, const wxRichTextAttr& attr, const wxRect& rect, wxDC& dc)
{
if (!attr.HasAlignment())
return;
- wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
- while (node)
+ wxPoint pos = line->GetPosition();
+ wxPoint originalPos = pos;
+ wxSize size = line->GetSize();
+
+ // centering, right-justification
+ if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
{
- wxRichTextLine* line = node->GetData();
+ int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
+ pos.x = (rect.GetWidth() - rightIndent - size.x)/2 + pos.x;
+ line->SetPosition(pos);
+ }
+ else if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
+ {
+ int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
+ pos.x = pos.x + rect.GetWidth() - size.x - rightIndent;
+ line->SetPosition(pos);
+ }
- wxPoint pos = line->GetPosition();
- wxSize size = line->GetSize();
+ if (pos != originalPos)
+ {
+ wxPoint inc = pos - originalPos;
- // centering, right-justification
- if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
- {
- int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
- pos.x = (rect.GetWidth() - pos.x - rightIndent - size.x)/2 + pos.x;
- line->SetPosition(pos);
- }
- else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+
+ while (node)
{
- int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
- pos.x = rect.GetWidth() - size.x - rightIndent;
- line->SetPosition(pos);
- }
+ wxRichTextObject* child = node->GetData();
+ if (child->IsTopLevel() && !child->GetRange().IsOutside(line->GetAbsoluteRange()))
+ child->Move(child->GetPosition() + inc);
- node = node->GetNext();
+ node = node->GetNext();
+ }
}
}
/// Get/set the object size for the given range. Returns false if the range
/// is invalid for this object.
-bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const
+bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
{
if (!range.IsWithin(GetRange()))
return false;
if (flags & wxRICHTEXT_UNFORMATTED)
{
// Just use unformatted data, assume no line breaks
- // TODO: take into account line breaks
-
wxSize sz;
wxArrayInt childExtents;
else
p = NULL;
+ int maxDescent = 0;
+ int maxAscent = 0;
+ int maxLineHeight = 0;
+
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
-
wxRichTextObject* child = node->GetData();
if (!child->GetRange().IsOutside(range))
{
}
else
{
- wxSize childSize;
+ wxSize childSize;
- wxRichTextRange rangeToUse = range;
- rangeToUse.LimitTo(child->GetRange());
- int childDescent = 0;
+ wxRichTextRange rangeToUse = range;
+ rangeToUse.LimitTo(child->GetRange());
+ int childDescent = 0;
- // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we're already cached the size,
- // but it's only going to be used after caching has taken place.
- if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0)
- {
- childDescent = child->GetDescent();
- childSize = child->GetCachedSize();
+ // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we've already cached the size,
+ // but it's only going to be used after caching has taken place.
+ if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0)
+ {
+ childDescent = child->GetDescent();
+ childSize = child->GetCachedSize();
- sz.y = wxMax(sz.y, childSize.y);
- sz.x += childSize.x;
- descent = wxMax(descent, childDescent);
- }
- else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y), p))
- {
- sz.y = wxMax(sz.y, childSize.y);
- sz.x += childSize.x;
- descent = wxMax(descent, childDescent);
+ if (childDescent == 0)
+ {
+ maxLineHeight = wxMax(maxLineHeight, childSize.y);
+ }
+ else
+ {
+ maxDescent = wxMax(maxDescent, childDescent);
+ maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+ }
- if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange()))
- {
- child->SetCachedSize(childSize);
- child->SetDescent(childDescent);
+ maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
+
+ sz.y = wxMax(sz.y, maxLineHeight);
+ sz.x += childSize.x;
+ descent = maxDescent;
}
+ else if (child->IsTopLevel())
+ {
+ childDescent = child->GetDescent();
+ childSize = child->GetCachedSize();
- if (partialExtents)
+ if (childDescent == 0)
+ {
+ maxLineHeight = wxMax(maxLineHeight, childSize.y);
+ }
+ else
+ {
+ maxDescent = wxMax(maxDescent, childDescent);
+ maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+ }
+
+ maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
+
+ sz.y = wxMax(sz.y, maxLineHeight);
+ sz.x += childSize.x;
+ descent = maxDescent;
+
+ // FIXME: this won't change the original values.
+ // Should we be calling GetRangeSize above instead of using cached values?
+#if 0
+ if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange()))
+ {
+ child->SetCachedSize(childSize);
+ child->SetDescent(childDescent);
+ }
+#endif
+
+ if (partialExtents)
+ {
+ int lastSize;
+ if (partialExtents->GetCount() > 0)
+ lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ lastSize = 0;
+
+ partialExtents->Add(childSize.x + lastSize);
+ }
+ }
+ else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, context, flags, wxPoint(position.x + sz.x, position.y), p))
{
- int lastSize;
- if (partialExtents->GetCount() > 0)
- lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+ if (childDescent == 0)
+ {
+ maxLineHeight = wxMax(maxLineHeight, childSize.y);
+ }
else
- lastSize = 0;
+ {
+ maxDescent = wxMax(maxDescent, childDescent);
+ maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+ }
- size_t i;
- for (i = 0; i < childExtents.GetCount(); i++)
+ maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
+
+ sz.y = wxMax(sz.y, maxLineHeight);
+ sz.x += childSize.x;
+ descent = maxDescent;
+
+ if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange()))
{
- partialExtents->Add(childExtents[i] + lastSize);
+ child->SetCachedSize(childSize);
+ child->SetDescent(childDescent);
+ }
+
+ if (partialExtents)
+ {
+ int lastSize;
+ if (partialExtents->GetCount() > 0)
+ lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ lastSize = 0;
+
+ size_t i;
+ for (i = 0; i < childExtents.GetCount(); i++)
+ {
+ partialExtents->Add(childExtents[i] + lastSize);
+ }
}
}
}
- }
if (p)
p->Clear();
wxRichTextRange lineRange = line->GetAbsoluteRange();
if (!lineRange.IsOutside(range))
{
- wxSize lineSize;
+ int maxDescent = 0;
+ int maxAscent = 0;
+ int maxLineHeight = 0;
+ int maxLineWidth = 0;
wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
while (node2)
{
wxRichTextRange rangeToUse = lineRange;
rangeToUse.LimitTo(child->GetRange());
+ if (child->IsTopLevel())
+ rangeToUse = child->GetOwnRange();
wxSize childSize;
int childDescent = 0;
- if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y)))
+ if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, context, flags, wxPoint(position.x + sz.x, position.y)))
{
- lineSize.y = wxMax(lineSize.y, childSize.y);
- lineSize.x += childSize.x;
+ if (childDescent == 0)
+ {
+ // Assume that if descent is zero, this child can occupy the full line height
+ // and does not need space for the line's maximum descent. So we influence
+ // the overall max line height only.
+ maxLineHeight = wxMax(maxLineHeight, childSize.y);
+ }
+ else
+ {
+ maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+ maxDescent = wxMax(maxAscent, childDescent);
+ }
+ maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
+ maxLineWidth += childSize.x;
}
- descent = wxMax(descent, childDescent);
}
node2 = node2->GetNext();
}
+ descent = wxMax(descent, maxDescent);
+
// Increase size by a line (TODO: paragraph spacing)
- sz.y += lineSize.y;
- sz.x = wxMax(sz.x, lineSize.x);
+ sz.y += maxLineHeight;
+ sz.x = wxMax(sz.x, maxLineWidth);
}
node = node->GetNext();
}
}
/// Finds the absolute position and row height for the given character position
-bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart)
+bool wxRichTextParagraph::FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart)
{
if (index == -1)
{
// then we can add this size to the line start position and
// paragraph start position to find the actual position.
- if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition()))
+ if (GetRangeSize(r, rangeSize, descent, dc, context, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition()))
{
pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x;
*height = line->GetSize().y;
/// Hit-testing: returns a flag indicating hit test details, plus
/// information about position
-int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)
+int wxRichTextParagraph::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
{
+ if (!IsShown())
+ return wxRICHTEXT_HITTEST_NONE;
+
+ // If we're in the top-level container, then we can return
+ // a suitable hit test code even if the point is outside the container area,
+ // so that we can position the caret sensibly even if we don't
+ // click on valid content. If we're not at the top-level, and the point
+ // is not within this paragraph object, then we don't want to stop more
+ // precise hit-testing from working prematurely, so return immediately.
+ // NEW STRATEGY: use the parent boundary to test whether we're in the
+ // right region, not the paragraph, since the paragraph may be positioned
+ // some way in from where the user clicks.
+ {
+ long tmpPos;
+ wxRichTextObject* tempObj, *tempContextObj;
+ if (GetParent() && GetParent()->wxRichTextObject::HitTest(dc, context, pt, tmpPos, & tempObj, & tempContextObj, flags) == wxRICHTEXT_HITTEST_NONE)
+ return wxRICHTEXT_HITTEST_NONE;
+ }
+
+ wxRichTextObjectList::compatibility_iterator objNode = m_children.GetFirst();
+ while (objNode)
+ {
+ wxRichTextObject* child = objNode->GetData();
+ // Don't recurse if we have wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS,
+ // and also, if this seems composite but actually is marked as atomic,
+ // don't recurse.
+ if (child->IsTopLevel() && ((flags & wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS) == 0) &&
+ (! (((flags & wxRICHTEXT_HITTEST_HONOUR_ATOMIC) != 0) && child->IsAtomic())))
+ {
+ {
+ int hitTest = child->HitTest(dc, context, pt, textPosition, obj, contextObj);
+ if (hitTest != wxRICHTEXT_HITTEST_NONE)
+ return hitTest;
+ }
+ }
+
+ objNode = objNode->GetNext();
+ }
+
wxPoint paraPos = GetPosition();
wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
if (pt.x < linePos.x)
{
textPosition = lineRange.GetStart();
+ *obj = FindObjectAtPosition(textPosition);
+ *contextObj = GetContainer();
return wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_OUTSIDE;
}
else if (pt.x >= (linePos.x + lineSize.x))
{
textPosition = lineRange.GetEnd();
+ *obj = FindObjectAtPosition(textPosition);
+ *contextObj = GetContainer();
return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
}
else
int paraDescent;
// This calculates the partial text extents
- GetRangeSize(lineRange, paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED, wxPoint(0,0), & partialExtents);
+ GetRangeSize(lineRange, paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED, linePos, & partialExtents);
int lastX = linePos.x;
size_t i;
{
textPosition = i + lineRange.GetStart(); // minus 1?
+ *obj = FindObjectAtPosition(textPosition);
+ *contextObj = GetContainer();
+
// So now we know it's between i-1 and i.
// Let's see if we can be more precise about
// which side of the position it's on.
wxRichTextRange rangeToUse(lineRange.GetStart(), i);
- GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED, linePos);
+ GetRangeSize(rangeToUse, childSize, descent, dc, context, wxRICHTEXT_UNFORMATTED, linePos);
int nextX = childSize.x + linePos.x;
{
textPosition = i;
+ *obj = FindObjectAtPosition(textPosition);
+ *contextObj = GetContainer();
+
// So now we know it's between i-1 and i.
// Let's see if we can be more precise about
// which side of the position it's on.
while (node)
{
wxRichTextObject* obj = node->GetData();
- if (obj->GetRange().Contains(position))
+ if (obj->GetRange().Contains(position) ||
+ obj->GetRange().GetStart() == position ||
+ obj->GetRange().GetEnd() == position)
return obj;
node = node->GetNext();
}
/// Find a suitable wrap position.
-bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents)
+bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, wxRichTextDrawingContext& context, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents)
{
if (range.GetLength() <= 0)
return false;
if (minPos == maxPos)
{
int descent = 0;
- GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+ GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
if (sz.x > availableSpace)
breakPosition = minPos - 1;
else if ((maxPos - minPos) == 1)
{
int descent = 0;
- GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+ GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
if (sz.x > availableSpace)
breakPosition = minPos - 1;
else
{
- GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+ GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
if (sz.x > availableSpace)
breakPosition = maxPos-1;
}
long nextPos = minPos + ((maxPos - minPos) / 2);
int descent = 0;
- GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+ GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
if (sz.x > availableSpace)
{
/// Get combined attributes of the base style, paragraph style and character style. We use this to dynamically
/// retrieve the actual style.
-wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxRichTextAttr& contentStyle) const
+wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxRichTextAttr& contentStyle, bool includingBoxAttr) const
{
wxRichTextAttr attr;
- wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
+ wxRichTextParagraphLayoutBox* buf = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox);
if (buf)
{
attr = buf->GetBasicStyle();
+ if (!includingBoxAttr)
+ {
+ attr.GetTextBoxAttr().Reset();
+ // The background colour will be painted by the container, and we don't
+ // want to unnecessarily overwrite the background when we're drawing text
+ // because this may erase the guideline (which appears just under the text
+ // if there's no padding).
+ attr.SetFlags(attr.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR);
+ }
wxRichTextApplyStyle(attr, GetAttributes());
}
else
}
/// Get combined attributes of the base style and paragraph style.
-wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes() const
+wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(bool includingBoxAttr) const
{
wxRichTextAttr attr;
- wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
+ wxRichTextParagraphLayoutBox* buf = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox);
if (buf)
{
attr = buf->GetBasicStyle();
+ if (!includingBoxAttr)
+ attr.GetTextBoxAttr().Reset();
wxRichTextApplyStyle(attr, GetAttributes());
}
else
return attr;
}
-/// Create default tabstop array
+// Create default tabstop array
void wxRichTextParagraph::InitDefaultTabs()
{
// create a default tab list at 10 mm each.
}
}
-/// Clear default tabstop array
+// Clear default tabstop array
void wxRichTextParagraph::ClearDefaultTabs()
{
sm_defaultTabs.Clear();
}
-void wxRichTextParagraph::LayoutFloat(wxDC& dc, const wxRect& rect, int style, wxRichTextFloatCollector* floatCollector)
+void wxRichTextParagraph::LayoutFloat(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, int style, wxRichTextFloatCollector* floatCollector)
{
wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
while (node)
{
wxRichTextObject* anchored = node->GetData();
- if (anchored && anchored->IsFloating())
+ if (anchored && anchored->IsFloating() && !floatCollector->HasFloat(anchored))
{
wxSize size;
int descent, x = 0;
- anchored->GetRangeSize(anchored->GetRange(), size, descent, dc, style);
+ anchored->GetRangeSize(anchored->GetRange(), size, descent, dc, context, style);
int offsetY = 0;
- if (anchored->GetAttributes().GetTextBoxAttr().GetTop().IsPresent())
+ if (anchored->GetAttributes().GetTextBoxAttr().GetTop().IsValid())
{
offsetY = anchored->GetAttributes().GetTextBoxAttr().GetTop().GetValue();
if (anchored->GetAttributes().GetTextBoxAttr().GetTop().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
}
if (anchored->GetAttributes().GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_FLOAT_LEFT)
- x = 0;
+ x = rect.x;
else if (anchored->GetAttributes().GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_FLOAT_RIGHT)
- x = rect.width - size.x;
+ x = rect.x + rect.width - size.x;
anchored->SetPosition(wxPoint(x, pos));
anchored->SetCachedSize(size);
}
}
-/// Get the first position from pos that has a line break character.
+// Get the first position from pos that has a line break character.
long wxRichTextParagraph::GetFirstLineBreakPosition(long pos)
{
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
#define WIDTH_FOR_DEFAULT_TABS 50
/// Draw the item
-bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
+bool wxRichTextPlainText::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int WXUNUSED(style))
{
wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
wxASSERT (para != NULL);
- wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+ wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes(), false /* no box attributes */) : GetAttributes());
+ context.ApplyVirtualAttributes(textAttr, this);
+
+ // Let's make the assumption for now that for content in a paragraph, including
+ // text, we never have a discontinuous selection. So we only deal with a
+ // single range.
+ wxRichTextRange selectionRange;
+ if (selection.IsValid())
+ {
+ wxRichTextRangeArray selectionRanges = selection.GetSelectionForObject(this);
+ if (selectionRanges.GetCount() > 0)
+ selectionRange = selectionRanges[0];
+ else
+ selectionRange = wxRICHTEXT_NO_SELECTION;
+ }
+ else
+ selectionRange = wxRICHTEXT_NO_SELECTION;
int offset = GetRange().GetStart();
wxString str = m_text;
wxString toRemove = wxRichTextLineBreakChar;
str.Replace(toRemove, wxT(" "));
- if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+ if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & (wxTEXT_ATTR_EFFECT_CAPITALS|wxTEXT_ATTR_EFFECT_SMALL_CAPITALS)))
str.MakeUpper();
long len = range.GetLength();
int charHeight = dc.GetCharHeight();
int x, y;
- if ( textFont.Ok() )
+ if ( textFont.IsOk() )
{
+ if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SMALL_CAPITALS))
+ {
+ textFont.SetPointSize((int) (textFont.GetPointSize()*0.75));
+ wxCheckSetFont(dc, textFont);
+ charHeight = dc.GetCharHeight();
+ }
+
if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) )
{
- double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
- textFont.SetPointSize( static_cast<int>(size) );
- x = rect.x;
- y = rect.y;
+ if (textFont.IsUsingSizeInPixels())
+ {
+ double size = static_cast<double>(textFont.GetPixelSize().y) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPixelSize(wxSize(0, static_cast<int>(size)));
+ x = rect.x;
+ y = rect.y;
+ }
+ else
+ {
+ double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPointSize(static_cast<int>(size));
+ x = rect.x;
+ y = rect.y;
+ }
wxCheckSetFont(dc, textFont);
}
else if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) )
{
- double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
- textFont.SetPointSize( static_cast<int>(size) );
- x = rect.x;
- int sub_height = static_cast<int>( static_cast<double>(charHeight) / wxSCRIPT_MUL_FACTOR);
- y = rect.y + (rect.height - sub_height + (descent - m_descent));
+ if (textFont.IsUsingSizeInPixels())
+ {
+ double size = static_cast<double>(textFont.GetPixelSize().y) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPixelSize(wxSize(0, static_cast<int>(size)));
+ x = rect.x;
+ int sub_height = static_cast<int>(static_cast<double>(charHeight) / wxSCRIPT_MUL_FACTOR);
+ y = rect.y + (rect.height - sub_height + (descent - m_descent));
+ }
+ else
+ {
+ double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPointSize(static_cast<int>(size));
+ x = rect.x;
+ int sub_height = static_cast<int>(static_cast<double>(charHeight) / wxSCRIPT_MUL_FACTOR);
+ y = rect.y + (rect.height - sub_height + (descent - m_descent));
+ }
wxCheckSetFont(dc, textFont);
}
else
y = rect.y + (rect.height - charHeight - (descent - m_descent));
}
+ // TODO: new selection code
+
// (a) All selected.
if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd())
{
dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
}
- wxCoord x_orig = x;
+ wxCoord x_orig = GetParent()->GetPosition().x;
while (hasTabs)
{
// the string has a tab
x += w;
}
- return true;
+ return true;
}
/// Lay the item out
-bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
+bool wxRichTextPlainText::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& WXUNUSED(rect), const wxRect& WXUNUSED(parentRect), int WXUNUSED(style))
{
// Only lay out if we haven't already cached the size
if (m_size.x == -1)
- GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0));
-
+ GetRangeSize(GetRange(), m_size, m_descent, dc, context, 0, wxPoint(0, 0));
+ m_maxSize = m_size;
+ // Eventually we want to have a reasonable estimate of minimum size.
+ m_minSize = wxSize(0, 0);
return true;
}
/// Get/set the object size for the given range. Returns false if the range
/// is invalid for this object.
-bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags), wxPoint position, wxArrayInt* partialExtents) const
+bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int WXUNUSED(flags), wxPoint position, wxArrayInt* partialExtents) const
{
if (!range.IsWithin(GetRange()))
return false;
wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
wxASSERT (para != NULL);
+ int relativeX = position.x - GetParent()->GetPosition().x;
+
wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+ context.ApplyVirtualAttributes(textAttr, (wxRichTextObject*) this);
// Always assume unformatted text, since at this level we have no knowledge
// of line breaks - and we don't need it, since we'll calculate size within
bool bScript(false);
wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr));
- if (font.Ok())
+ if (font.IsOk())
{
if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
|| (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) )
{
wxFont textFont = font;
- double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
- textFont.SetPointSize( static_cast<int>(size) );
+ if (textFont.IsUsingSizeInPixels())
+ {
+ double size = static_cast<double>(textFont.GetPixelSize().y) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPixelSize(wxSize(0, static_cast<int>(size)));
+ }
+ else
+ {
+ double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPointSize(static_cast<int>(size));
+ }
+ wxCheckSetFont(dc, textFont);
+ bScript = true;
+ }
+ else if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SMALL_CAPITALS))
+ {
+ wxFont textFont = font;
+ textFont.SetPointSize((int) (textFont.GetPointSize()*0.75));
wxCheckSetFont(dc, textFont);
bScript = true;
}
wxString stringChunk = str.Mid(startPos, (size_t) len);
- if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+ if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & (wxTEXT_ATTR_EFFECT_CAPITALS|wxTEXT_ATTR_EFFECT_SMALL_CAPITALS)))
stringChunk.MakeUpper();
wxCoord w, h;
partialExtents->Add(oldWidth + p[j]);
if (partialExtents->GetCount() > 0)
- absoluteWidth = (*partialExtents)[(*partialExtents).GetCount()-1] + position.x;
+ absoluteWidth = (*partialExtents)[(*partialExtents).GetCount()-1] + relativeX;
else
- absoluteWidth = position.x;
+ absoluteWidth = relativeX;
}
else
{
dc.GetTextExtent(stringFragment, & w, & h);
width += w;
- absoluteWidth = width + position.x;
+ absoluteWidth = width + relativeX;
haveDescent = true;
}
}
notFound = false;
- width = nextTabPos - position.x;
+ width = nextTabPos - relativeX;
if (partialExtents)
partialExtents->Add(width);
wxRichTextPlainText* newObject = new wxRichTextPlainText(secondPart);
newObject->SetAttributes(GetAttributes());
+ newObject->SetProperties(GetProperties());
newObject->SetRange(wxRichTextRange(pos, GetRange().GetEnd()));
GetRange().SetEnd(pos-1);
/// Returns true if this object can merge itself with the given one.
bool wxRichTextPlainText::CanMerge(wxRichTextObject* object) const
{
- return object->GetClassInfo() == CLASSINFO(wxRichTextPlainText) &&
- (m_text.empty() || wxTextAttrEq(GetAttributes(), object->GetAttributes()));
+ return object->GetClassInfo() == wxCLASSINFO(wxRichTextPlainText) &&
+ (m_text.empty() || (wxTextAttrEq(GetAttributes(), object->GetAttributes()) && m_properties == object->GetProperties()));
}
/// Returns true if this object merged itself with the given one.
IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox)
-wxList wxRichTextBuffer::sm_handlers;
-wxRichTextRenderer* wxRichTextBuffer::sm_renderer = NULL;
-int wxRichTextBuffer::sm_bulletRightMargin = 20;
-float wxRichTextBuffer::sm_bulletProportion = (float) 0.3;
+wxList wxRichTextBuffer::sm_handlers;
+wxList wxRichTextBuffer::sm_drawingHandlers;
+wxRichTextFieldTypeHashMap wxRichTextBuffer::sm_fieldTypes;
+wxRichTextRenderer* wxRichTextBuffer::sm_renderer = NULL;
+int wxRichTextBuffer::sm_bulletRightMargin = 20;
+float wxRichTextBuffer::sm_bulletProportion = (float) 0.3;
/// Initialisation
void wxRichTextBuffer::Init()
m_suppressUndo = 0;
m_handlerFlags = 0;
m_scale = 1.0;
+ m_dimensionScale = 1.0;
+ m_fontScale = 1.0;
+ SetMargins(4);
}
/// Initialisation
delete m_batchedCommand;
m_batchedCommand = NULL;
m_suppressUndo = obj.m_suppressUndo;
+ m_invalidRange = obj.m_invalidRange;
+ m_dimensionScale = obj.m_dimensionScale;
+ m_fontScale = obj.m_fontScale;
}
/// Push style sheet to top of stack
/// Submit command to insert paragraphs
bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags)
{
- wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
-
- wxRichTextAttr attr(GetDefaultStyle());
+ return ctrl->GetFocusObject()->InsertParagraphsWithUndo(this, pos, paragraphs, ctrl, flags);
+}
- wxRichTextAttr* p = NULL;
- wxRichTextAttr paraAttr;
- if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
- {
- paraAttr = GetStyleForNewParagraph(pos);
- if (!paraAttr.IsDefault())
- p = & paraAttr;
- }
- else
- p = & attr;
+/// Submit command to insert paragraphs
+bool wxRichTextParagraphLayoutBox::InsertParagraphsWithUndo(wxRichTextBuffer* buffer, long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int WXUNUSED(flags))
+{
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
action->GetNewParagraphs() = paragraphs;
- if (p && !p->IsDefault())
- {
- for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxRichTextObject* child = node->GetData();
- child->SetAttributes(*p);
- }
- }
-
action->SetPosition(pos);
- wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1);
+ wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetOwnRange().GetEnd() - 1);
if (!paragraphs.GetPartialParagraph())
range.SetEnd(range.GetEnd()+1);
// Set the range we'll need to delete in Undo
action->SetRange(range);
- SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
/// Submit command to insert the given text
bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)
{
- wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
+ return ctrl->GetFocusObject()->InsertTextWithUndo(this, pos, text, ctrl, flags);
+}
+
+/// Submit command to insert the given text
+bool wxRichTextParagraphLayoutBox::InsertTextWithUndo(wxRichTextBuffer* buffer, long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)
+{
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
wxRichTextAttr* p = NULL;
wxRichTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
// Get appropriate paragraph style
- paraAttr = GetStyleForNewParagraph(pos, false, false);
+ paraAttr = GetStyleForNewParagraph(buffer, pos, false, false);
if (!paraAttr.IsDefault())
p = & paraAttr;
}
action->GetNewParagraphs().AddParagraphs(text, p);
- int length = action->GetNewParagraphs().GetRange().GetLength();
+ int length = action->GetNewParagraphs().GetOwnRange().GetLength();
- if (text.length() > 0 && text.Last() != wxT('\n'))
+ if (!text.empty() && text.Last() != wxT('\n'))
{
// Don't count the newline when undoing
length --;
action->GetNewParagraphs().SetPartialParagraph(true);
}
- else if (text.length() > 0 && text.Last() == wxT('\n'))
+ else if (!text.empty() && text.Last() == wxT('\n'))
length --;
action->SetPosition(pos);
// Set the range we'll need to delete in Undo
action->SetRange(wxRichTextRange(pos, pos + length - 1));
- SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
/// Submit command to insert the given text
bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags)
{
- wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
+ return ctrl->GetFocusObject()->InsertNewlineWithUndo(this, pos, ctrl, flags);
+}
+
+/// Submit command to insert the given text
+bool wxRichTextParagraphLayoutBox::InsertNewlineWithUndo(wxRichTextBuffer* buffer, long pos, wxRichTextCtrl* ctrl, int flags)
+{
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
wxRichTextAttr* p = NULL;
wxRichTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
- paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */);
+ paraAttr = GetStyleForNewParagraph(buffer, pos, false, true /* look for next paragraph style */);
if (!paraAttr.IsDefault())
p = & paraAttr;
}
- wxRichTextAttr attr(GetDefaultStyle());
+ wxRichTextAttr attr(buffer->GetDefaultStyle());
+ // Don't include box attributes such as margins
+ attr.GetTextBoxAttr().Reset();
wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr);
action->GetNewParagraphs().AppendChild(newPara);
action->SetPosition(pos);
// Use the default character style
- // Use the default character style
- if (!GetDefaultStyle().IsDefault() && newPara->GetChildren().GetFirst())
+ if (!buffer->GetDefaultStyle().IsDefault() && newPara->GetChildren().GetFirst())
{
// Check whether the default style merely reflects the paragraph/basic style,
// in which case don't apply it.
- wxRichTextAttr defaultStyle(GetDefaultStyle());
+ wxRichTextAttr defaultStyle(buffer->GetDefaultStyle());
+ defaultStyle.GetTextBoxAttr().Reset();
wxRichTextAttr toApply;
if (para)
{
- wxRichTextAttr combinedAttr = para->GetCombinedAttributes();
+ wxRichTextAttr combinedAttr = para->GetCombinedAttributes(true /* include box attributes */);
wxRichTextAttr newAttr;
// This filters out attributes that are accounted for by the current
// paragraph/basic style
// Set the range we'll need to delete in Undo
action->SetRange(wxRichTextRange(pos1, pos1));
- SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags,
const wxRichTextAttr& textAttr)
{
- wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, ctrl, false);
+ return ctrl->GetFocusObject()->InsertImageWithUndo(this, pos, imageBlock, ctrl, flags, textAttr);
+}
+
+/// Submit command to insert the given image
+bool wxRichTextParagraphLayoutBox::InsertImageWithUndo(wxRichTextBuffer* buffer, long pos, const wxRichTextImageBlock& imageBlock,
+ wxRichTextCtrl* ctrl, int flags,
+ const wxRichTextAttr& textAttr)
+{
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
wxRichTextAttr* p = NULL;
wxRichTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
- paraAttr = GetStyleForNewParagraph(pos);
+ paraAttr = GetStyleForNewParagraph(buffer, pos);
if (!paraAttr.IsDefault())
p = & paraAttr;
}
- wxRichTextAttr attr(GetDefaultStyle());
+ wxRichTextAttr attr(buffer->GetDefaultStyle());
+
+ // Don't include box attributes such as margins
+ attr.GetTextBoxAttr().Reset();
wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
if (p)
// Set the range we'll need to delete in Undo
action->SetRange(wxRichTextRange(pos, pos));
- SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
// Insert an object with no change of it
-bool wxRichTextBuffer::InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags)
+wxRichTextObject* wxRichTextBuffer::InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags)
+{
+ return ctrl->GetFocusObject()->InsertObjectWithUndo(this, pos, object, ctrl, flags);
+}
+
+// Insert an object with no change of it
+wxRichTextObject* wxRichTextParagraphLayoutBox::InsertObjectWithUndo(wxRichTextBuffer* buffer, long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags)
{
- wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert object"), wxRICHTEXT_INSERT, this, ctrl, false);
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Object"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
wxRichTextAttr* p = NULL;
wxRichTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
- paraAttr = GetStyleForNewParagraph(pos);
+ paraAttr = GetStyleForNewParagraph(buffer, pos);
if (!paraAttr.IsDefault())
p = & paraAttr;
}
- wxRichTextAttr attr(GetDefaultStyle());
+ wxRichTextAttr attr(buffer->GetDefaultStyle());
+
+ // Don't include box attributes such as margins
+ attr.GetTextBoxAttr().Reset();
wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
if (p)
// Set the range we'll need to delete in Undo
action->SetRange(wxRichTextRange(pos, pos));
- SubmitAction(action);
+ buffer->SubmitAction(action);
- return true;
+ wxRichTextObject* obj = GetLeafObjectAtPosition(pos);
+ return obj;
+}
+
+wxRichTextField* wxRichTextParagraphLayoutBox::InsertFieldWithUndo(wxRichTextBuffer* buffer, long pos, const wxString& fieldType,
+ const wxRichTextProperties& properties,
+ wxRichTextCtrl* ctrl, int flags,
+ const wxRichTextAttr& textAttr)
+{
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Field"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
+
+ wxRichTextAttr* p = NULL;
+ wxRichTextAttr paraAttr;
+ if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+ {
+ paraAttr = GetStyleForNewParagraph(buffer, pos);
+ if (!paraAttr.IsDefault())
+ p = & paraAttr;
+ }
+
+ wxRichTextAttr attr(buffer->GetDefaultStyle());
+
+ // Don't include box attributes such as margins
+ attr.GetTextBoxAttr().Reset();
+
+ wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
+ if (p)
+ newPara->SetAttributes(*p);
+
+ wxRichTextField* fieldObject = new wxRichTextField();
+ fieldObject->wxRichTextObject::SetProperties(properties);
+ fieldObject->SetFieldType(fieldType);
+ fieldObject->SetAttributes(textAttr);
+ newPara->AppendChild(fieldObject);
+ action->GetNewParagraphs().AppendChild(newPara);
+ action->GetNewParagraphs().UpdateRanges();
+ action->GetNewParagraphs().SetPartialParagraph(true);
+ action->SetPosition(pos);
+
+ // Set the range we'll need to delete in Undo
+ action->SetRange(wxRichTextRange(pos, pos));
+
+ buffer->SubmitAction(action);
+
+ wxRichTextField* obj = wxDynamicCast(GetLeafObjectAtPosition(pos), wxRichTextField);
+ return obj;
}
+
/// Get the style that is appropriate for a new paragraph at this position.
/// If the previous paragraph has a paragraph style name, look up the next-paragraph
/// style.
-wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const
+wxRichTextAttr wxRichTextParagraphLayoutBox::GetStyleForNewParagraph(wxRichTextBuffer* buffer, long pos, bool caretPosition, bool lookUpNewParaStyle) const
{
wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
if (para)
bool foundAttributes = false;
// Look for a matching paragraph style
- if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())
+ if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && buffer->GetStyleSheet())
{
- wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+ wxRichTextParagraphStyleDefinition* paraDef = buffer->GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
if (paraDef)
{
// If we're not at the end of the paragraph, then we apply THIS style, and not the designated next style.
if (para->GetRange().GetEnd() == pos && !paraDef->GetNextStyle().IsEmpty())
{
- wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
+ wxRichTextParagraphStyleDefinition* nextParaDef = buffer->GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
if (nextParaDef)
{
foundAttributes = true;
- attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet());
+ attr = nextParaDef->GetStyleMergedWithBase(buffer->GetStyleSheet());
}
}
if (!foundAttributes)
{
foundAttributes = true;
- attr = paraDef->GetStyleMergedWithBase(GetStyleSheet());
+ attr = paraDef->GetStyleMergedWithBase(buffer->GetStyleSheet());
}
}
}
// Also apply list style if present
- if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && GetStyleSheet())
+ if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && buffer->GetStyleSheet())
{
- wxRichTextListStyleDefinition* listDef = GetStyleSheet()->FindListStyle(para->GetAttributes().GetListStyleName());
+ wxRichTextListStyleDefinition* listDef = buffer->GetStyleSheet()->FindListStyle(para->GetAttributes().GetListStyleName());
if (listDef)
{
int thisIndent = para->GetAttributes().GetLeftIndent();
int thisLevel = para->GetAttributes().HasOutlineLevel() ? para->GetAttributes().GetOutlineLevel() : listDef->FindLevelForIndent(thisIndent);
// Apply the overall list style, and item style for this level
- wxRichTextAttr listStyle(listDef->GetCombinedStyleForLevel(thisLevel, GetStyleSheet()));
+ wxRichTextAttr listStyle(listDef->GetCombinedStyleForLevel(thisLevel, buffer->GetStyleSheet()));
wxRichTextApplyStyle(attr, listStyle);
attr.SetOutlineLevel(thisLevel);
if (para->GetAttributes().HasBulletNumber())
/// Submit command to delete this range
bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl)
{
- wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl);
+ return ctrl->GetFocusObject()->DeleteRangeWithUndo(range, ctrl, this);
+}
+
+/// Submit command to delete this range
+bool wxRichTextParagraphLayoutBox::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer)
+{
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, buffer, this, ctrl);
action->SetPosition(ctrl->GetCaretPosition());
}
}
- SubmitAction(action);
+ buffer->SubmitAction(action);
return true;
}
/// Submit immediately, or delay according to whether collapsing is on
bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
{
+ if (action && !action->GetNewParagraphs().IsEmpty())
+ PrepareContent(action->GetNewParagraphs());
+
if (BatchingUndo() && m_batchedCommand && !SuppressingUndo())
{
wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
bool wxRichTextBuffer::BeginStyle(const wxRichTextAttr& style)
{
wxRichTextAttr newStyle(GetDefaultStyle());
+ newStyle.GetTextBoxAttr().Reset();
// Save the old default style
- m_attributeStack.Append((wxObject*) new wxRichTextAttr(GetDefaultStyle()));
+ m_attributeStack.Append((wxObject*) new wxRichTextAttr(newStyle));
wxRichTextApplyStyle(newStyle, style);
newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags());
bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
{
bool success = false;
+ wxRichTextParagraphLayoutBox* container = this;
+ if (GetRichTextCtrl())
+ container = GetRichTextCtrl()->GetFocusObject();
+
#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
wxDataObjectComposite* compositeObject = new wxDataObjectComposite();
{
- wxString text = GetTextForRange(range);
+ wxString text = container->GetTextForRange(range);
#ifdef __WXMSW__
text = wxTextFile::Translate(text, wxTextFileType_Dos);
if (FindHandler(wxRICHTEXT_TYPE_XML))
{
wxRichTextBuffer* richTextBuf = new wxRichTextBuffer;
- CopyFragment(range, *richTextBuf);
+ container->CopyFragment(range, *richTextBuf);
compositeObject->Add(new wxRichTextBufferDataObject(richTextBuf), true /* preferred */);
}
bool wxRichTextBuffer::PasteFromClipboard(long position)
{
bool success = false;
+ wxRichTextParagraphLayoutBox* container = this;
+ if (GetRichTextCtrl())
+ container = GetRichTextCtrl()->GetFocusObject();
+
#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
if (CanPasteFromClipboard())
{
wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
if (richTextBuffer)
{
- InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), 0);
+ container->InsertParagraphsWithUndo(this, position+1, *richTextBuffer, GetRichTextCtrl(), 0);
if (GetRichTextCtrl())
- GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd());
+ GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetOwnRange().GetEnd());
delete richTextBuffer;
}
}
- else if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT))
+ else if (wxTheClipboard->IsSupported(wxDF_TEXT)
+ #if wxUSE_UNICODE
+ || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
+ #endif
+ )
{
wxTextDataObject data;
wxTheClipboard->GetData(data);
#else
wxString text2 = text;
#endif
- InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ container->InsertTextWithUndo(this, position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
if (GetRichTextCtrl())
GetRichTextCtrl()->ShowPosition(position + text2.Length());
wxBitmap bitmap(data.GetBitmap());
wxImage image(bitmap.ConvertToImage());
- wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, GetRichTextCtrl(), false);
+ wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, container, GetRichTextCtrl(), false);
action->GetNewParagraphs().AddImage(image);
#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
{
- if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT) ||
- wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())) ||
+ if (wxTheClipboard->IsSupported(wxDF_TEXT)
+#if wxUSE_UNICODE
+ || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
+#endif
+ || wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())) ||
wxTheClipboard->IsSupported(wxDF_BITMAP))
{
canPaste = true;
{
wxRichTextStyleSheet* oldSheet = GetStyleSheet();
- wxWindowID id = wxID_ANY;
+ wxWindowID winid = wxID_ANY;
if (GetRichTextCtrl())
- id = GetRichTextCtrl()->GetId();
+ winid = GetRichTextCtrl()->GetId();
- wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id);
+ wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, winid);
event.SetEventObject(GetRichTextCtrl());
+ event.SetContainer(GetRichTextCtrl()->GetFocusObject());
event.SetOldStyleSheet(oldSheet);
event.SetNewStyleSheet(sheet);
event.Allow();
sm_renderer = renderer;
}
+/// Hit-testing: returns a flag indicating hit test details, plus
+/// information about position
+int wxRichTextBuffer::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
+{
+ int ret = wxRichTextParagraphLayoutBox::HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
+ if (ret != wxRICHTEXT_HITTEST_NONE)
+ {
+ return ret;
+ }
+ else
+ {
+ textPosition = m_ownRange.GetEnd()-1;
+ *obj = this;
+ *contextObj = this;
+ return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
+ }
+}
+
+void wxRichTextBuffer::SetFontScale(double fontScale)
+{
+ m_fontScale = fontScale;
+ m_fontTable.SetFontScale(fontScale);
+}
+
+void wxRichTextBuffer::SetDimensionScale(double dimScale)
+{
+ m_dimensionScale = dimScale;
+}
+
bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& bulletAttr, const wxRect& rect)
{
- if (bulletAttr.GetTextColour().Ok())
+ if (bulletAttr.GetTextColour().IsOk())
{
wxCheckSetPen(dc, wxPen(bulletAttr.GetTextColour()));
wxCheckSetBrush(dc, wxBrush(bulletAttr.GetTextColour()));
dc.DrawPolygon(3, pts);
}
+ else if (bulletAttr.GetBulletName() == wxT("standard/circle-outline"))
+ {
+ wxCheckSetBrush(dc, *wxTRANSPARENT_BRUSH);
+ dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
+ }
else // "standard/circle", and catch-all
{
dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.HasFont())
{
wxRichTextAttr fontAttr;
- fontAttr.SetFontSize(attr.GetFontSize());
+ if (attr.HasFontPixelSize())
+ fontAttr.SetFontPixelSize(attr.GetFontSize());
+ else
+ fontAttr.SetFontPointSize(attr.GetFontSize());
fontAttr.SetFontStyle(attr.GetFontStyle());
fontAttr.SetFontWeight(attr.GetFontWeight());
fontAttr.SetFontUnderlined(attr.GetFontUnderlined());
wxCheckSetFont(dc, font);
- if (attr.GetTextColour().Ok())
+ if (attr.GetTextColour().IsOk())
dc.SetTextForeground(attr.GetTextColour());
dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames)
{
bulletNames.Add(wxTRANSLATE("standard/circle"));
+ bulletNames.Add(wxTRANSLATE("standard/circle-outline"));
bulletNames.Add(wxTRANSLATE("standard/square"));
bulletNames.Add(wxTRANSLATE("standard/diamond"));
bulletNames.Add(wxTRANSLATE("standard/triangle"));
* wxRichTextBox
*/
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextCompositeObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextParagraphLayoutBox)
wxRichTextBox::wxRichTextBox(wxRichTextObject* parent):
- wxRichTextCompositeObject(parent)
+ wxRichTextParagraphLayoutBox(parent)
{
}
/// Draw the item
-bool wxRichTextBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int descent, int style)
+bool wxRichTextBox::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
{
- wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
- while (node)
- {
- wxRichTextObject* child = node->GetData();
+ if (!IsShown())
+ return true;
- wxRect childRect = wxRect(child->GetPosition(), child->GetCachedSize());
- child->Draw(dc, range, selectionRange, childRect, descent, style);
+ // TODO: if the active object in the control, draw an indication.
+ // We need to add the concept of active object, and not just focus object,
+ // so we can apply commands (properties, delete, ...) to objects such as text boxes and images.
+ // Ultimately we would like to be able to interactively resize an active object
+ // using drag handles.
+ return wxRichTextParagraphLayoutBox::Draw(dc, context, range, selection, rect, descent, style);
+}
- node = node->GetNext();
+/// Copy
+void wxRichTextBox::Copy(const wxRichTextBox& obj)
+{
+ wxRichTextParagraphLayoutBox::Copy(obj);
+}
+
+// Edit properties via a GUI
+bool wxRichTextBox::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+ wxRichTextObjectPropertiesDialog boxDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Box Properties"));
+ boxDlg.SetAttributes(GetAttributes());
+
+ if (boxDlg.ShowModal() == wxID_OK)
+ {
+ // By passing wxRICHTEXT_SETSTYLE_RESET, indeterminate attributes set by the user will be set as
+ // indeterminate in the object.
+ boxDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
+ return true;
}
+ else
+ return false;
+}
+
+/*!
+ * wxRichTextField
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextField, wxRichTextParagraphLayoutBox)
+
+wxRichTextField::wxRichTextField(const wxString& fieldType, wxRichTextObject* parent):
+ wxRichTextParagraphLayoutBox(parent)
+{
+ SetFieldType(fieldType);
+}
+
+/// Draw the item
+bool wxRichTextField::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+ if (!IsShown())
+ return true;
+
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType && fieldType->Draw(this, dc, context, range, selection, rect, descent, style))
+ return true;
+
+ // Fallback; but don't draw guidelines.
+ style &= ~wxRICHTEXT_DRAW_GUIDELINES;
+ return wxRichTextParagraphLayoutBox::Draw(dc, context, range, selection, rect, descent, style);
+}
+
+bool wxRichTextField::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style)
+{
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType && fieldType->Layout(this, dc, context, rect, parentRect, style))
+ return true;
+
+ // Fallback
+ return wxRichTextParagraphLayoutBox::Layout(dc, context, rect, parentRect, style);
+}
+
+bool wxRichTextField::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
+{
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType)
+ return fieldType->GetRangeSize((wxRichTextField*) this, range, size, descent, dc, context, flags, position, partialExtents);
+
+ return wxRichTextParagraphLayoutBox::GetRangeSize(range, size, descent, dc, context, flags, position, partialExtents);
+}
+
+/// Calculate range
+void wxRichTextField::CalculateRange(long start, long& end)
+{
+ if (IsTopLevel())
+ wxRichTextParagraphLayoutBox::CalculateRange(start, end);
+ else
+ wxRichTextObject::CalculateRange(start, end);
+}
+
+/// Copy
+void wxRichTextField::Copy(const wxRichTextField& obj)
+{
+ wxRichTextParagraphLayoutBox::Copy(obj);
+
+ UpdateField(GetBuffer());
+}
+
+// Edit properties via a GUI
+bool wxRichTextField::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType)
+ return fieldType->EditProperties(this, parent, buffer);
+
+ return false;
+}
+
+bool wxRichTextField::CanEditProperties() const
+{
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType)
+ return fieldType->CanEditProperties((wxRichTextField*) this);
+
+ return false;
+}
+
+wxString wxRichTextField::GetPropertiesMenuLabel() const
+{
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType)
+ return fieldType->GetPropertiesMenuLabel((wxRichTextField*) this);
+
+ return wxEmptyString;
+}
+
+bool wxRichTextField::UpdateField(wxRichTextBuffer* buffer)
+{
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType)
+ return fieldType->UpdateField(buffer, (wxRichTextField*) this);
+
+ return false;
+}
+
+bool wxRichTextField::IsTopLevel() const
+{
+ wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+ if (fieldType)
+ return fieldType->IsTopLevel((wxRichTextField*) this);
+
return true;
}
-/// Lay the item out
-bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style)
+IMPLEMENT_CLASS(wxRichTextFieldType, wxObject)
+
+IMPLEMENT_CLASS(wxRichTextFieldTypeStandard, wxRichTextFieldType)
+
+wxRichTextFieldTypeStandard::wxRichTextFieldTypeStandard(const wxString& name, const wxString& label, int displayStyle)
{
- wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
- while (node)
+ Init();
+
+ SetName(name);
+ SetLabel(label);
+ SetDisplayStyle(displayStyle);
+}
+
+wxRichTextFieldTypeStandard::wxRichTextFieldTypeStandard(const wxString& name, const wxBitmap& bitmap, int displayStyle)
+{
+ Init();
+
+ SetName(name);
+ SetBitmap(bitmap);
+ SetDisplayStyle(displayStyle);
+}
+
+void wxRichTextFieldTypeStandard::Init()
+{
+ m_displayStyle = wxRICHTEXT_FIELD_STYLE_RECTANGLE;
+ m_font = wxFont(6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+ m_textColour = *wxWHITE;
+ m_borderColour = *wxBLACK;
+ m_backgroundColour = *wxBLACK;
+ m_verticalPadding = 1;
+ m_horizontalPadding = 3;
+ m_horizontalMargin = 2;
+ m_verticalMargin = 0;
+}
+
+void wxRichTextFieldTypeStandard::Copy(const wxRichTextFieldTypeStandard& field)
+{
+ wxRichTextFieldType::Copy(field);
+
+ m_label = field.m_label;
+ m_displayStyle = field.m_displayStyle;
+ m_font = field.m_font;
+ m_textColour = field.m_textColour;
+ m_borderColour = field.m_borderColour;
+ m_backgroundColour = field.m_backgroundColour;
+ m_verticalPadding = field.m_verticalPadding;
+ m_horizontalPadding = field.m_horizontalPadding;
+ m_horizontalMargin = field.m_horizontalMargin;
+ m_bitmap = field.m_bitmap;
+}
+
+bool wxRichTextFieldTypeStandard::Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& WXUNUSED(context), const wxRichTextRange& WXUNUSED(range), const wxRichTextSelection& selection, const wxRect& rect, int descent, int WXUNUSED(style))
+{
+ if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_COMPOSITE)
+ return false; // USe default composite drawing
+ else // if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_RECTANGLE || m_displayStyle == wxRICHTEXT_FIELD_STYLE_NOBORDER)
{
- wxRichTextObject* child = node->GetData();
- child->Layout(dc, rect, style);
+ int borderSize = 1;
- node = node->GetNext();
+ wxPen borderPen(m_borderColour, 1, wxSOLID);
+ wxBrush backgroundBrush(m_backgroundColour);
+ wxColour textColour(m_textColour);
+
+ if (selection.WithinSelection(obj->GetRange().GetStart(), obj))
+ {
+ wxColour highlightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+ wxColour highlightTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+
+ borderPen = wxPen(highlightTextColour, 1, wxSOLID);
+ backgroundBrush = wxBrush(highlightColour);
+
+ wxCheckSetBrush(dc, backgroundBrush);
+ wxCheckSetPen(dc, wxPen(highlightColour, 1, wxSOLID));
+ dc.DrawRectangle(rect);
+ }
+
+ if (m_displayStyle != wxRICHTEXT_FIELD_STYLE_NO_BORDER)
+ borderSize = 0;
+
+ // objectRect is the area where the content is drawn, after margins around it have been taken into account
+ wxRect objectRect = wxRect(wxPoint(rect.x + m_horizontalMargin, rect.y + wxMax(0, rect.height - descent - obj->GetCachedSize().y)),
+ wxSize(obj->GetCachedSize().x - 2*m_horizontalMargin - borderSize, obj->GetCachedSize().y));
+
+ // clientArea is where the text is actually written
+ wxRect clientArea = objectRect;
+
+ if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_RECTANGLE)
+ {
+ dc.SetPen(borderPen);
+ dc.SetBrush(backgroundBrush);
+ dc.DrawRoundedRectangle(objectRect, 4.0);
+ }
+ else if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_START_TAG)
+ {
+ int arrowLength = objectRect.height/2;
+ clientArea.width -= (arrowLength - m_horizontalPadding);
+
+ wxPoint pts[5];
+ pts[0].x = objectRect.x; pts[0].y = objectRect.y;
+ pts[1].x = objectRect.x + objectRect.width - arrowLength; pts[1].y = objectRect.y;
+ pts[2].x = objectRect.x + objectRect.width; pts[2].y = objectRect.y + (objectRect.height/2);
+ pts[3].x = objectRect.x + objectRect.width - arrowLength; pts[3].y = objectRect.y + objectRect.height;
+ pts[4].x = objectRect.x; pts[4].y = objectRect.y + objectRect.height;
+ dc.SetPen(borderPen);
+ dc.SetBrush(backgroundBrush);
+ dc.DrawPolygon(5, pts);
+ }
+ else if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_END_TAG)
+ {
+ int arrowLength = objectRect.height/2;
+ clientArea.width -= (arrowLength - m_horizontalPadding);
+ clientArea.x += (arrowLength - m_horizontalPadding);
+
+ wxPoint pts[5];
+ pts[0].x = objectRect.x + objectRect.width; pts[0].y = objectRect.y;
+ pts[1].x = objectRect.x + arrowLength; pts[1].y = objectRect.y;
+ pts[2].x = objectRect.x; pts[2].y = objectRect.y + (objectRect.height/2);
+ pts[3].x = objectRect.x + arrowLength; pts[3].y = objectRect.y + objectRect.height;
+ pts[4].x = objectRect.x + objectRect.width; pts[4].y = objectRect.y + objectRect.height;
+ dc.SetPen(borderPen);
+ dc.SetBrush(backgroundBrush);
+ dc.DrawPolygon(5, pts);
+ }
+
+ if (m_bitmap.IsOk())
+ {
+ int x = clientArea.x + (clientArea.width - m_bitmap.GetWidth())/2;
+ int y = clientArea.y + m_verticalPadding;
+ dc.DrawBitmap(m_bitmap, x, y, true);
+
+ if (selection.WithinSelection(obj->GetRange().GetStart(), obj))
+ {
+ wxCheckSetBrush(dc, *wxBLACK_BRUSH);
+ wxCheckSetPen(dc, *wxBLACK_PEN);
+ dc.SetLogicalFunction(wxINVERT);
+ dc.DrawRectangle(wxRect(x, y, m_bitmap.GetWidth(), m_bitmap.GetHeight()));
+ dc.SetLogicalFunction(wxCOPY);
+ }
+ }
+ else
+ {
+ wxString label(m_label);
+ if (label.IsEmpty())
+ label = wxT("??");
+ int w, h, maxDescent;
+ dc.SetFont(m_font);
+ dc.GetTextExtent(m_label, & w, &h, & maxDescent);
+ dc.SetTextForeground(textColour);
+
+ int x = clientArea.x + (clientArea.width - w)/2;
+ int y = clientArea.y + (clientArea.height - (h - maxDescent))/2;
+ dc.DrawText(m_label, x, y);
+ }
}
- m_dirty = false;
+
return true;
+}
+
+bool wxRichTextFieldTypeStandard::Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& WXUNUSED(rect), const wxRect& WXUNUSED(parentRect), int style)
+{
+ if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_COMPOSITE)
+ return false; // USe default composite layout
+ wxSize size = GetSize(obj, dc, context, style);
+ obj->SetCachedSize(size);
+ obj->SetMinSize(size);
+ obj->SetMaxSize(size);
+ return true;
}
-/// Copy
-void wxRichTextBox::Copy(const wxRichTextBox& obj)
+bool wxRichTextFieldTypeStandard::GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
{
- wxRichTextCompositeObject::Copy(obj);
+ if (IsTopLevel(obj))
+ return obj->wxRichTextParagraphLayoutBox::GetRangeSize(range, size, descent, dc, context, flags, position);
+ else
+ {
+ wxSize sz = GetSize(obj, dc, context, 0);
+ if (partialExtents)
+ {
+ int lastSize;
+ if (partialExtents->GetCount() > 0)
+ lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ lastSize = 0;
+ partialExtents->Add(lastSize + sz.x);
+ }
+ size = sz;
+ return true;
+ }
+}
+
+wxSize wxRichTextFieldTypeStandard::GetSize(wxRichTextField* WXUNUSED(obj), wxDC& dc, wxRichTextDrawingContext& WXUNUSED(context), int WXUNUSED(style)) const
+{
+ int borderSize = 1;
+ int w = 0, h = 0, maxDescent = 0;
+
+ wxSize sz;
+ if (m_bitmap.IsOk())
+ {
+ w = m_bitmap.GetWidth();
+ h = m_bitmap.GetHeight();
+
+ sz = wxSize(w + m_horizontalMargin*2, h + m_verticalMargin*2);
+ }
+ else
+ {
+ wxString label(m_label);
+ if (label.IsEmpty())
+ label = wxT("??");
+ dc.SetFont(m_font);
+ dc.GetTextExtent(label, & w, &h, & maxDescent);
+
+ sz = wxSize(w + m_horizontalPadding*2 + m_horizontalMargin*2, h + m_verticalPadding *2 + m_verticalMargin*2);
+ }
+
+ if (m_displayStyle != wxRICHTEXT_FIELD_STYLE_NO_BORDER)
+ {
+ sz.x += borderSize*2;
+ sz.y += borderSize*2;
+ }
+
+ if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_START_TAG || m_displayStyle == wxRICHTEXT_FIELD_STYLE_END_TAG)
+ {
+ // Add space for the arrow
+ sz.x += (sz.y/2 - m_horizontalPadding);
+ }
+
+ return sz;
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextCell, wxRichTextBox)
+
+wxRichTextCell::wxRichTextCell(wxRichTextObject* parent):
+ wxRichTextBox(parent)
+{
+}
+
+/// Draw the item
+bool wxRichTextCell::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+ return wxRichTextBox::Draw(dc, context, range, selection, rect, descent, style);
+}
+
+/// Copy
+void wxRichTextCell::Copy(const wxRichTextCell& obj)
+{
+ wxRichTextBox::Copy(obj);
+}
+
+// Edit properties via a GUI
+bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+ // We need to gather common attributes for all selected cells.
+
+ wxRichTextTable* table = wxDynamicCast(GetParent(), wxRichTextTable);
+ bool multipleCells = false;
+ wxRichTextAttr attr;
+
+ if (table && buffer && buffer->GetRichTextCtrl() && buffer->GetRichTextCtrl()->GetSelection().IsValid() &&
+ buffer->GetRichTextCtrl()->GetSelection().GetContainer() == GetParent())
+ {
+ wxRichTextAttr clashingAttr, absentAttr;
+ const wxRichTextSelection& sel = buffer->GetRichTextCtrl()->GetSelection();
+ size_t i;
+ int selectedCellCount = 0;
+ for (i = 0; i < sel.GetCount(); i++)
+ {
+ const wxRichTextRange& range = sel[i];
+ wxRichTextCell* cell = table->GetCell(range.GetStart());
+ if (cell)
+ {
+ wxRichTextAttr cellStyle = cell->GetAttributes();
+
+ CollectStyle(attr, cellStyle, clashingAttr, absentAttr);
+
+ selectedCellCount ++;
+ }
+ }
+ multipleCells = selectedCellCount > 1;
+ }
+ else
+ {
+ attr = GetAttributes();
+ }
+
+ wxString caption;
+ if (multipleCells)
+ caption = _("Multiple Cell Properties");
+ else
+ caption = _("Cell Properties");
+
+ wxRichTextObjectPropertiesDialog cellDlg(this, wxGetTopLevelParent(parent), wxID_ANY, caption);
+ cellDlg.SetAttributes(attr);
+
+ wxRichTextSizePage* sizePage = wxDynamicCast(cellDlg.FindPage(wxCLASSINFO(wxRichTextSizePage)), wxRichTextSizePage);
+ if (sizePage)
+ {
+ // We don't want position and floating controls for a cell.
+ sizePage->ShowPositionControls(false);
+ sizePage->ShowFloatingControls(false);
+ }
+
+ if (cellDlg.ShowModal() == wxID_OK)
+ {
+ if (multipleCells)
+ {
+ const wxRichTextSelection& sel = buffer->GetRichTextCtrl()->GetSelection();
+ // Apply the style; we interpret indeterminate attributes as 'don't touch this attribute'
+ // since it may represent clashing attributes across multiple objects.
+ table->SetCellStyle(sel, attr);
+ }
+ else
+ // For a single object, indeterminate attributes set by the user should be reflected in the
+ // actual object style, so pass the wxRICHTEXT_SETSTYLE_RESET flag to assign
+ // the style directly instead of applying (which ignores indeterminate attributes,
+ // leaving them as they were).
+ cellDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
+ return true;
+ }
+ else
+ return false;
+}
+
+WX_DEFINE_OBJARRAY(wxRichTextObjectPtrArrayArray)
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextTable, wxRichTextBox)
+
+wxRichTextTable::wxRichTextTable(wxRichTextObject* parent): wxRichTextBox(parent)
+{
+ m_rowCount = 0;
+ m_colCount = 0;
+}
+
+// Draws the object.
+bool wxRichTextTable::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+ return wxRichTextBox::Draw(dc, context, range, selection, rect, descent, style);
+}
+
+WX_DECLARE_OBJARRAY(wxRect, wxRichTextRectArray);
+WX_DEFINE_OBJARRAY(wxRichTextRectArray);
+
+// Lays the object out. rect is the space available for layout. Often it will
+// be the specified overall space for this object, if trying to constrain
+// layout to a particular size, or it could be the total space available in the
+// parent. rect is the overall size, so we must subtract margins and padding.
+// to get the actual available space.
+bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& WXUNUSED(parentRect), int style)
+{
+ SetPosition(rect.GetPosition());
+
+ // TODO: the meaty bit. Calculate sizes of all cells and rows. Try to use
+ // minimum size if within alloted size, then divide up remaining size
+ // between rows/cols.
+
+ double scale = 1.0;
+ wxRichTextBuffer* buffer = GetBuffer();
+ if (buffer) scale = buffer->GetScale();
+
+ wxRect availableSpace = GetAvailableContentArea(dc, context, rect);
+ wxTextAttrDimensionConverter converter(dc, scale, availableSpace.GetSize());
+
+ wxRichTextAttr attr(GetAttributes());
+ context.ApplyVirtualAttributes(attr, this);
+
+ // If we have no fixed table size, and assuming we're not pushed for
+ // space, then we don't have to try to stretch the table to fit the contents.
+ bool stretchToFitTableWidth = false;
+
+ int tableWidth = rect.width;
+ if (attr.GetTextBoxAttr().GetWidth().IsValid())
+ {
+ tableWidth = converter.GetPixels(attr.GetTextBoxAttr().GetWidth());
+
+ // Fixed table width, so we do want to stretch columns out if necessary.
+ stretchToFitTableWidth = true;
+
+ // Shouldn't be able to exceed the size passed to this function
+ tableWidth = wxMin(rect.width, tableWidth);
+ }
+
+ // Get internal padding
+ int paddingLeft = 0, paddingTop = 0;
+ if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsValid())
+ paddingLeft = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetLeft());
+ if (attr.GetTextBoxAttr().GetPadding().GetTop().IsValid())
+ paddingTop = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetTop());
+
+ // Assume that left and top padding are also used for inter-cell padding.
+ int paddingX = paddingLeft;
+ int paddingY = paddingTop;
+
+ int totalLeftMargin = 0, totalRightMargin = 0, totalTopMargin = 0, totalBottomMargin = 0;
+ GetTotalMargin(dc, buffer, attr, totalLeftMargin, totalRightMargin, totalTopMargin, totalBottomMargin);
+
+ // Internal table width - the area for content
+ int internalTableWidth = tableWidth - totalLeftMargin - totalRightMargin;
+
+ int rowCount = m_cells.GetCount();
+ if (m_colCount == 0 || rowCount == 0)
+ {
+ wxRect overallRect(rect.x, rect.y, totalLeftMargin + totalRightMargin, totalTopMargin + totalBottomMargin);
+ SetCachedSize(overallRect.GetSize());
+
+ // Zero content size
+ SetMinSize(overallRect.GetSize());
+ SetMaxSize(GetMinSize());
+ return true;
+ }
+
+ // The final calculated widths
+ wxArrayInt colWidths;
+ colWidths.Add(0, m_colCount);
+
+ wxArrayInt absoluteColWidths;
+ absoluteColWidths.Add(0, m_colCount);
+
+ wxArrayInt percentageColWidths;
+ percentageColWidths.Add(0, m_colCount);
+ // wxArrayInt percentageColWidthsSpanning(m_colCount);
+ // These are only relevant when the first column contains spanning information.
+ // wxArrayInt columnSpans(m_colCount); // Each contains 1 for non-spanning cell, > 1 for spanning cell.
+ wxArrayInt maxColWidths;
+ maxColWidths.Add(0, m_colCount);
+ wxArrayInt minColWidths;
+ minColWidths.Add(0, m_colCount);
+
+ wxSize tableSize(tableWidth, 0);
+
+ int i, j, k;
+
+ for (i = 0; i < m_colCount; i++)
+ {
+ absoluteColWidths[i] = 0;
+ // absoluteColWidthsSpanning[i] = 0;
+ percentageColWidths[i] = -1;
+ // percentageColWidthsSpanning[i] = -1;
+ colWidths[i] = 0;
+ maxColWidths[i] = 0;
+ minColWidths[i] = 0;
+ // columnSpans[i] = 1;
+ }
+
+ // (0) Determine which cells are visible according to spans
+ // 1 2 3 4 5
+ // __________________
+ // | | | | | 1
+ // |------| |----|
+ // |------| | | 2
+ // |------| | | 3
+ // |------------------|
+ // |__________________| 4
+
+ // To calculate cell visibility:
+ // First find all spanning cells. Build an array of span records with start x, y and end x, y.
+ // Then for each cell, test whether we're within one of those cells, and unless we're at the start of
+ // that cell, hide the cell.
+
+ // We can also use this array to match the size of spanning cells to the grid. Or just do
+ // this when we iterate through all cells.
+
+ // 0.1: add spanning cells to an array
+ wxRichTextRectArray rectArray;
+ for (j = 0; j < m_rowCount; j++)
+ {
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextBox* cell = GetCell(j, i);
+ int colSpan = 1, rowSpan = 1;
+ if (cell->GetProperties().HasProperty(wxT("colspan")))
+ colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+ if (cell->GetProperties().HasProperty(wxT("rowspan")))
+ rowSpan = cell->GetProperties().GetPropertyLong(wxT("rowspan"));
+ if (colSpan > 1 || rowSpan > 1)
+ {
+ rectArray.Add(wxRect(i, j, colSpan, rowSpan));
+ }
+ }
+ }
+ // 0.2: find which cells are subsumed by a spanning cell
+ for (j = 0; j < m_rowCount; j++)
+ {
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextBox* cell = GetCell(j, i);
+ if (rectArray.GetCount() == 0)
+ {
+ cell->Show(true);
+ }
+ else
+ {
+ int colSpan = 1, rowSpan = 1;
+ if (cell->GetProperties().HasProperty(wxT("colspan")))
+ colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+ if (cell->GetProperties().HasProperty(wxT("rowspan")))
+ rowSpan = cell->GetProperties().GetPropertyLong(wxT("rowspan"));
+ if (colSpan > 1 || rowSpan > 1)
+ {
+ // Assume all spanning cells are shown
+ cell->Show(true);
+ }
+ else
+ {
+ bool shown = true;
+ for (k = 0; k < (int) rectArray.GetCount(); k++)
+ {
+ if (rectArray[k].Contains(wxPoint(i, j)))
+ {
+ shown = false;
+ break;
+ }
+ }
+ cell->Show(shown);
+ }
+ }
+ }
+ }
+
+ // TODO: find the first spanned cell in each row that spans the most columns and doesn't
+ // overlap with a spanned cell starting at a previous column position.
+ // This means we need to keep an array of rects so we can check. However
+ // it does also mean that some spans simply may not be taken into account
+ // where there are different spans happening on different rows. In these cases,
+ // they will simply be as wide as their constituent columns.
+
+ // (1) Do an initial layout for all cells to get minimum and maximum size, and get
+ // the absolute or percentage width of each column.
+
+ for (j = 0; j < m_rowCount; j++)
+ {
+ // First get the overall margins so we can calculate percentage widths based on
+ // the available content space for all cells on the row
+
+ int overallRowContentMargin = 0;
+ int visibleCellCount = 0;
+
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextBox* cell = GetCell(j, i);
+ if (cell->IsShown())
+ {
+ int cellTotalLeftMargin = 0, cellTotalRightMargin = 0, cellTotalTopMargin = 0, cellTotalBottomMargin = 0;
+ GetTotalMargin(dc, buffer, cell->GetAttributes(), cellTotalLeftMargin, cellTotalRightMargin, cellTotalTopMargin, cellTotalBottomMargin);
+
+ overallRowContentMargin += (cellTotalLeftMargin + cellTotalRightMargin);
+ visibleCellCount ++;
+ }
+ }
+
+ // Add in inter-cell padding
+ overallRowContentMargin += ((visibleCellCount-1) * paddingX);
+
+ int rowContentWidth = internalTableWidth - overallRowContentMargin;
+ wxSize rowTableSize(rowContentWidth, 0);
+ wxTextAttrDimensionConverter converter(dc, scale, rowTableSize);
+
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextBox* cell = GetCell(j, i);
+ if (cell->IsShown())
+ {
+ int colSpan = 1;
+ if (cell->GetProperties().HasProperty(wxT("colspan")))
+ colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+
+ // Lay out cell to find min/max widths
+ cell->Invalidate(wxRICHTEXT_ALL);
+ cell->Layout(dc, context, availableSpace, availableSpace, style);
+
+ if (colSpan == 1)
+ {
+ int absoluteCellWidth = -1;
+ int percentageCellWidth = -1;
+
+ // I think we need to calculate percentages from the internal table size,
+ // minus the padding between cells which we'll need to calculate from the
+ // (number of VISIBLE cells - 1)*paddingX. Then percentages that add up to 100%
+ // will add up to 100%. In CSS, the width specifies the cell's content rect width,
+ // so if we want to conform to that we'll need to add in the overall cell margins.
+ // However, this will make it difficult to specify percentages that add up to
+ // 100% and still fit within the table width.
+ // Let's say two cells have 50% width. They have 10 pixels of overall margin each.
+ // The table content rect is 500 pixels and the inter-cell padding is 20 pixels.
+ // If we're using internal content size for the width, we would calculate the
+ // the overall cell width for n cells as:
+ // (500 - 20*(n-1) - overallCellMargin1 - overallCellMargin2 - ...) * percentage / 100
+ // + thisOverallCellMargin
+ // = 500 - 20 - 10 - 10) * 0.5 + 10 = 240 pixels overall cell width.
+ // Adding this back, we get 240 + 240 + 20 = 500 pixels.
+
+ if (cell->GetAttributes().GetTextBoxAttr().GetWidth().IsValid())
+ {
+ int w = converter.GetPixels(cell->GetAttributes().GetTextBoxAttr().GetWidth());
+ if (cell->GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+ {
+ percentageCellWidth = w;
+ }
+ else
+ {
+ absoluteCellWidth = w;
+ }
+ // Override absolute width with minimum width if necessary
+ if (cell->GetMinSize().x > 0 && absoluteCellWidth !=1 && cell->GetMinSize().x > absoluteCellWidth)
+ absoluteCellWidth = cell->GetMinSize().x;
+ }
+
+ if (absoluteCellWidth != -1)
+ {
+ if (absoluteCellWidth > absoluteColWidths[i])
+ absoluteColWidths[i] = absoluteCellWidth;
+ }
+
+ if (percentageCellWidth != -1)
+ {
+ if (percentageCellWidth > percentageColWidths[i])
+ percentageColWidths[i] = percentageCellWidth;
+ }
+
+ if (colSpan == 1 && cell->GetMinSize().x && cell->GetMinSize().x > minColWidths[i])
+ minColWidths[i] = cell->GetMinSize().x;
+ if (colSpan == 1 && cell->GetMaxSize().x && cell->GetMaxSize().x > maxColWidths[i])
+ maxColWidths[i] = cell->GetMaxSize().x;
+ }
+ }
+ }
+ }
+
+ // (2) Allocate initial column widths from minimum widths, absolute values and proportions
+ // TODO: simply merge this into (1).
+ for (i = 0; i < m_colCount; i++)
+ {
+ if (absoluteColWidths[i] > 0)
+ {
+ colWidths[i] = absoluteColWidths[i];
+ }
+ else if (percentageColWidths[i] > 0)
+ {
+ colWidths[i] = percentageColWidths[i];
+
+ // This is rubbish - we calculated the absolute widths from percentages, so
+ // we can't do it again here.
+ //colWidths[i] = (int) (double(percentageColWidths[i]) * double(tableWidth) / 100.0 + 0.5);
+ }
+ }
+
+ // (3) Process absolute or proportional widths of spanning columns,
+ // now that we know what our fixed column widths are going to be.
+ // Spanned cells will try to adjust columns so the span will fit.
+ // Even existing fixed column widths can be expanded if necessary.
+ // Actually, currently fixed columns widths aren't adjusted; instead,
+ // the algorithm favours earlier rows and adjusts unspecified column widths
+ // the first time only. After that, we can't know whether the column has been
+ // specified explicitly or not. (We could make a note if necessary.)
+ for (j = 0; j < m_rowCount; j++)
+ {
+ // First get the overall margins so we can calculate percentage widths based on
+ // the available content space for all cells on the row
+
+ int overallRowContentMargin = 0;
+ int visibleCellCount = 0;
+
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextBox* cell = GetCell(j, i);
+ if (cell->IsShown())
+ {
+ int cellTotalLeftMargin = 0, cellTotalRightMargin = 0, cellTotalTopMargin = 0, cellTotalBottomMargin = 0;
+ GetTotalMargin(dc, buffer, cell->GetAttributes(), cellTotalLeftMargin, cellTotalRightMargin, cellTotalTopMargin, cellTotalBottomMargin);
+
+ overallRowContentMargin += (cellTotalLeftMargin + cellTotalRightMargin);
+ visibleCellCount ++;
+ }
+ }
+
+ // Add in inter-cell padding
+ overallRowContentMargin += ((visibleCellCount-1) * paddingX);
+
+ int rowContentWidth = internalTableWidth - overallRowContentMargin;
+ wxSize rowTableSize(rowContentWidth, 0);
+ wxTextAttrDimensionConverter converter(dc, scale, rowTableSize);
+
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextBox* cell = GetCell(j, i);
+ if (cell->IsShown())
+ {
+ int colSpan = 1;
+ if (cell->GetProperties().HasProperty(wxT("colspan")))
+ colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+
+ if (colSpan > 1)
+ {
+ int spans = wxMin(colSpan, m_colCount - i);
+ int cellWidth = 0;
+ if (spans > 0)
+ {
+ if (cell->GetAttributes().GetTextBoxAttr().GetWidth().IsValid())
+ {
+ cellWidth = converter.GetPixels(cell->GetAttributes().GetTextBoxAttr().GetWidth());
+ // Override absolute width with minimum width if necessary
+ if (cell->GetMinSize().x > 0 && cellWidth !=1 && cell->GetMinSize().x > cellWidth)
+ cellWidth = cell->GetMinSize().x;
+ }
+ else
+ {
+ // Do we want to do this? It's the only chance we get to
+ // use the cell's min/max sizes, so we need to work out
+ // how we're going to balance the unspecified spanning cell
+ // width with the possibility more-constrained constituent cell widths.
+ // Say there's a tiny bitmap giving it a max width of 10 pixels. We
+ // don't want to constraint all the spanned columns to fit into this cell.
+ // OK, let's say that if any of the constituent columns don't fit,
+ // then we simply stop constraining the columns; instead, we'll just fit the spanning
+ // cells to the columns later.
+ cellWidth = cell->GetMinSize().x;
+ if (cell->GetMaxSize().x > cellWidth)
+ cellWidth = cell->GetMaxSize().x;
+ }
+
+ // Subtract the padding between cells
+ int spanningWidth = cellWidth;
+ spanningWidth -= paddingX * (spans-1);
+
+ if (spanningWidth > 0)
+ {
+ // Now share the spanning width between columns within that span
+ // TODO: take into account min widths of columns within the span
+ int spanningWidthLeft = spanningWidth;
+ int stretchColCount = 0;
+ for (k = i; k < (i+spans); k++)
+ {
+ if (colWidths[k] > 0) // absolute or proportional width has been specified
+ spanningWidthLeft -= colWidths[k];
+ else
+ stretchColCount ++;
+ }
+ // Now divide what's left between the remaining columns
+ int colShare = 0;
+ if (stretchColCount > 0)
+ colShare = spanningWidthLeft / stretchColCount;
+ int colShareRemainder = spanningWidthLeft - (colShare * stretchColCount);
+
+ // If fixed-width columns are currently too big, then we'll later
+ // stretch the spanned cell to fit.
+
+ if (spanningWidthLeft > 0)
+ {
+ for (k = i; k < (i+spans); k++)
+ {
+ if (colWidths[k] <= 0) // absolute or proportional width has not been specified
+ {
+ int newWidth = colShare;
+ if (k == (i+spans-1))
+ newWidth += colShareRemainder; // ensure all pixels are filled
+ colWidths[k] = newWidth;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // (4) Next, share any remaining space out between columns that have not yet been calculated.
+ // TODO: take into account min widths of columns within the span
+ int tableWidthMinusPadding = internalTableWidth - (m_colCount-1)*paddingX;
+ int widthLeft = tableWidthMinusPadding;
+ int stretchColCount = 0;
+ for (i = 0; i < m_colCount; i++)
+ {
+ // TODO: we need to take into account min widths.
+ // Subtract min width from width left, then
+ // add the colShare to the min width
+ if (colWidths[i] > 0) // absolute or proportional width has been specified
+ widthLeft -= colWidths[i];
+ else
+ {
+ if (minColWidths[i] > 0)
+ widthLeft -= minColWidths[i];
+
+ stretchColCount ++;
+ }
+ }
+
+ // Now divide what's left between the remaining columns
+ int colShare = 0;
+ if (stretchColCount > 0)
+ colShare = widthLeft / stretchColCount;
+ int colShareRemainder = widthLeft - (colShare * stretchColCount);
+
+ // Check we don't have enough space, in which case shrink all columns, overriding
+ // any absolute/proportional widths
+ // TODO: actually we would like to divide up the shrinkage according to size.
+ // How do we calculate the proportions that will achieve this?
+ // Could first choose an arbitrary value for stretching cells, and then calculate
+ // factors to multiply each width by.
+ // TODO: want to record this fact and pass to an iteration that tries e.g. min widths
+ if (widthLeft < 0 || (stretchToFitTableWidth && (stretchColCount == 0)))
+ {
+ colShare = tableWidthMinusPadding / m_colCount;
+ colShareRemainder = tableWidthMinusPadding - (colShare * m_colCount);
+ for (i = 0; i < m_colCount; i++)
+ {
+ colWidths[i] = 0;
+ minColWidths[i] = 0;
+ }
+ }
+
+ // We have to adjust the columns if either we need to shrink the
+ // table to fit the parent/table width, or we explicitly set the
+ // table width and need to stretch out the table.
+ if (widthLeft < 0 || stretchToFitTableWidth)
+ {
+ for (i = 0; i < m_colCount; i++)
+ {
+ if (colWidths[i] <= 0) // absolute or proportional width has not been specified
+ {
+ if (minColWidths[i] > 0)
+ colWidths[i] = minColWidths[i] + colShare;
+ else
+ colWidths[i] = colShare;
+ if (i == (m_colCount-1))
+ colWidths[i] += colShareRemainder; // ensure all pixels are filled
+ }
+ }
+ }
+
+ // TODO: if spanned cells have no specified or max width, make them the
+ // as big as the columns they span. Do this for all spanned cells in all
+ // rows, of course. Size any spanned cells left over at the end - even if they
+ // have width > 0, make sure they're limited to the appropriate column edge.
+
+
+/*
+ Sort out confusion between content width
+ and overall width later. For now, assume we specify overall width.
+
+ So, now we've laid out the table to fit into the given space
+ and have used specified widths and minimum widths.
+
+ Now we need to consider how we will try to take maximum width into account.
+
+*/
+
+ // (??) TODO: take max width into account
+
+ // (6) Lay out all cells again with the current values
+
+ int maxRight = 0;
+ int y = availableSpace.y;
+ for (j = 0; j < m_rowCount; j++)
+ {
+ int x = availableSpace.x; // TODO: take into account centering etc.
+ int maxCellHeight = 0;
+ int maxSpecifiedCellHeight = 0;
+
+ wxArrayInt actualWidths;
+ actualWidths.Add(0, m_colCount);
+
+ wxTextAttrDimensionConverter converter(dc, scale);
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextCell* cell = GetCell(j, i);
+ if (cell->IsShown())
+ {
+ // Get max specified cell height
+ // Don't handle percentages for height
+ if (cell->GetAttributes().GetTextBoxAttr().GetHeight().IsValid() && cell->GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() != wxTEXT_ATTR_UNITS_PERCENTAGE)
+ {
+ int h = converter.GetPixels(cell->GetAttributes().GetTextBoxAttr().GetHeight());
+ if (h > maxSpecifiedCellHeight)
+ maxSpecifiedCellHeight = h;
+ }
+
+ if (colWidths[i] > 0) // absolute or proportional width has been specified
+ {
+ int colSpan = 1;
+ if (cell->GetProperties().HasProperty(wxT("colspan")))
+ colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+
+ wxRect availableCellSpace;
+
+ // TODO: take into acount spans
+ if (colSpan > 1)
+ {
+ // Calculate the size of this spanning cell from its constituent columns
+ int xx = x;
+ int spans = wxMin(colSpan, m_colCount - i);
+ for (k = i; k < spans; k++)
+ {
+ if (k != i)
+ xx += paddingX;
+ xx += colWidths[k];
+ }
+ availableCellSpace = wxRect(x, y, xx, -1);
+ }
+ else
+ availableCellSpace = wxRect(x, y, colWidths[i], -1);
+
+ // Store actual width so we can force cell to be the appropriate width on the final loop
+ actualWidths[i] = availableCellSpace.GetWidth();
+
+ // Lay out cell
+ cell->Invalidate(wxRICHTEXT_ALL);
+ cell->Layout(dc, context, availableCellSpace, availableSpace, style);
+
+ // TODO: use GetCachedSize().x to compute 'natural' size
+
+ x += (availableCellSpace.GetWidth() + paddingX);
+ if (cell->GetCachedSize().y > maxCellHeight)
+ maxCellHeight = cell->GetCachedSize().y;
+ }
+ }
+ }
+
+ maxCellHeight = wxMax(maxCellHeight, maxSpecifiedCellHeight);
+
+ for (i = 0; i < m_colCount; i++)
+ {
+ wxRichTextCell* cell = GetCell(j, i);
+ if (cell->IsShown())
+ {
+ wxRect availableCellSpace = wxRect(cell->GetPosition(), wxSize(actualWidths[i], maxCellHeight));
+ // Lay out cell with new height
+ cell->Invalidate(wxRICHTEXT_ALL);
+ cell->Layout(dc, context, availableCellSpace, availableSpace, style);
+
+ // Make sure the cell size really is the appropriate size,
+ // not the calculated box size
+ cell->SetCachedSize(wxSize(actualWidths[i], maxCellHeight));
+
+ maxRight = wxMax(maxRight, cell->GetPosition().x + cell->GetCachedSize().x);
+ }
+ }
+
+ y += maxCellHeight;
+ if (j < (m_rowCount-1))
+ y += paddingY;
+ }
+
+ // We need to add back the margins etc.
+ {
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0, 0), wxSize(maxRight - availableSpace.x, y - availableSpace.y));
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+ SetCachedSize(marginRect.GetSize());
+ }
+
+ // TODO: calculate max size
+ {
+ SetMaxSize(GetCachedSize());
+ }
+
+ // TODO: calculate min size
+ {
+ SetMinSize(GetCachedSize());
+ }
+
+ // TODO: currently we use either a fixed table width or the parent's size.
+ // We also want to be able to calculate the table width from its content,
+ // whether using fixed column widths or cell content min/max width.
+ // Probably need a boolean flag to say whether we need to stretch cells
+ // to fit the table width, or to simply use min/max cell widths. The
+ // trouble with this is that if cell widths are not specified, they
+ // will be tiny; we could use arbitrary defaults but this seems unsatisfactory.
+ // Anyway, ignoring that problem, we probably need to factor layout into a function
+ // that can can calculate the maximum unconstrained layout in case table size is
+ // not specified. Then LayoutToBestSize() can choose to use either parent size to
+ // constrain Layout(), or the previously-calculated max size to constraint layout.
+
+ return true;
+}
+
+// Finds the absolute position and row height for the given character position
+bool wxRichTextTable::FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart)
+{
+ wxRichTextCell* child = GetCell(index+1);
+ if (child)
+ {
+ // Find the position at the start of the child cell, since the table doesn't
+ // have any caret position of its own.
+ return child->FindPosition(dc, context, -1, pt, height, forceLineStart);
+ }
+ else
+ return false;
+}
+
+// Get the cell at the given character position (in the range of the table).
+wxRichTextCell* wxRichTextTable::GetCell(long pos) const
+{
+ int row = 0, col = 0;
+ if (GetCellRowColumnPosition(pos, row, col))
+ {
+ return GetCell(row, col);
+ }
+ else
+ return NULL;
+}
+
+// Get the row/column for a given character position
+bool wxRichTextTable::GetCellRowColumnPosition(long pos, int& row, int& col) const
+{
+ if (m_colCount == 0 || m_rowCount == 0)
+ return false;
+
+ row = (int) (pos / m_colCount);
+ col = pos - (row * m_colCount);
+
+ wxASSERT(row < m_rowCount && col < m_colCount);
+
+ if (row < m_rowCount && col < m_colCount)
+ return true;
+ else
+ return false;
+}
+
+// Calculate range, taking row/cell ordering into account instead of relying
+// on list ordering.
+void wxRichTextTable::CalculateRange(long start, long& end)
+{
+ long current = start;
+ long lastEnd = current;
+
+ if (IsTopLevel())
+ {
+ current = 0;
+ lastEnd = 0;
+ }
+
+ int i, j;
+ for (i = 0; i < m_rowCount; i++)
+ {
+ for (j = 0; j < m_colCount; j++)
+ {
+ wxRichTextCell* child = GetCell(i, j);
+ if (child)
+ {
+ long childEnd = 0;
+
+ child->CalculateRange(current, childEnd);
+
+ lastEnd = childEnd;
+ current = childEnd + 1;
+ }
+ }
+ }
+
+ // A top-level object always has a range of size 1,
+ // because its children don't count at this level.
+ end = start;
+ m_range.SetRange(start, start);
+
+ // An object with no children has zero length
+ if (m_children.GetCount() == 0)
+ lastEnd --;
+ m_ownRange.SetRange(0, lastEnd);
+}
+
+// Gets the range size.
+bool wxRichTextTable::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
+{
+ return wxRichTextBox::GetRangeSize(range, size, descent, dc, context, flags, position, partialExtents);
+}
+
+// Deletes content in the given range.
+bool wxRichTextTable::DeleteRange(const wxRichTextRange& WXUNUSED(range))
+{
+ // TODO: implement deletion of cells
+ return true;
+}
+
+// Gets any text in this object for the given range.
+wxString wxRichTextTable::GetTextForRange(const wxRichTextRange& range) const
+{
+ return wxRichTextBox::GetTextForRange(range);
+}
+
+// Copies this object.
+void wxRichTextTable::Copy(const wxRichTextTable& obj)
+{
+ wxRichTextBox::Copy(obj);
+
+ ClearTable();
+
+ m_rowCount = obj.m_rowCount;
+ m_colCount = obj.m_colCount;
+
+ m_cells.Add(wxRichTextObjectPtrArray(), m_rowCount);
+
+ int i, j;
+ for (i = 0; i < m_rowCount; i++)
+ {
+ wxRichTextObjectPtrArray& colArray = m_cells[i];
+ for (j = 0; j < m_colCount; j++)
+ {
+ wxRichTextCell* cell = wxDynamicCast(obj.GetCell(i, j)->Clone(), wxRichTextCell);
+ AppendChild(cell);
+
+ colArray.Add(cell);
+ }
+ }
+}
+
+void wxRichTextTable::ClearTable()
+{
+ m_cells.Clear();
+ DeleteChildren();
+}
+
+bool wxRichTextTable::CreateTable(int rows, int cols)
+{
+ ClearTable();
+
+ m_rowCount = rows;
+ m_colCount = cols;
+
+ m_cells.Add(wxRichTextObjectPtrArray(), rows);
+
+ int i, j;
+ for (i = 0; i < rows; i++)
+ {
+ wxRichTextObjectPtrArray& colArray = m_cells[i];
+ for (j = 0; j < cols; j++)
+ {
+ wxRichTextCell* cell = new wxRichTextCell;
+ AppendChild(cell);
+ cell->AddParagraph(wxEmptyString);
+
+ colArray.Add(cell);
+ }
+ }
+
+ return true;
+}
+
+wxRichTextCell* wxRichTextTable::GetCell(int row, int col) const
+{
+ wxASSERT(row < m_rowCount);
+ wxASSERT(col < m_colCount);
+
+ if (row < m_rowCount && col < m_colCount)
+ {
+ wxRichTextObjectPtrArray& colArray = m_cells[row];
+ wxRichTextObject* obj = colArray[col];
+ return wxDynamicCast(obj, wxRichTextCell);
+ }
+ else
+ return NULL;
+}
+
+// Returns a selection object specifying the selections between start and end character positions.
+// For example, a table would deduce what cells (of range length 1) are selected when dragging across the table.
+wxRichTextSelection wxRichTextTable::GetSelection(long start, long end) const
+{
+ wxRichTextSelection selection;
+ selection.SetContainer((wxRichTextTable*) this);
+
+ if (start > end)
+ {
+ long tmp = end;
+ end = start;
+ start = tmp;
+ }
+
+ wxASSERT( start >= 0 && end < (m_colCount * m_rowCount));
+
+ if (end >= (m_colCount * m_rowCount))
+ return selection;
+
+ // We need to find the rectangle of cells that is described by the rectangle
+ // with start, end as the diagonal. Make sure we don't add cells that are
+ // not currenty visible because they are overlapped by spanning cells.
+/*
+ --------------------------
+ | 0 | 1 | 2 | 3 | 4 |
+ --------------------------
+ | 5 | 6 | 7 | 8 | 9 |
+ --------------------------
+ | 10 | 11 | 12 | 13 | 14 |
+ --------------------------
+ | 15 | 16 | 17 | 18 | 19 |
+ --------------------------
+
+ Let's say we select 6 -> 18.
+
+ Left and right edge cols of rectangle are 1 and 3 inclusive. Find least/greatest to find
+ which is left and which is right.
+
+ Top and bottom edge rows are 1 and 3 inclusive. Again, find least/greatest to find top and bottom.
+
+ Now go through rows from 1 to 3 and only add cells that are (a) within above column range
+ and (b) shown.
+
+
+*/
+
+ int leftCol = start - m_colCount * int(start/m_colCount);
+ int rightCol = end - m_colCount * int(end/m_colCount);
+
+ int topRow = int(start/m_colCount);
+ int bottomRow = int(end/m_colCount);
+
+ if (leftCol > rightCol)
+ {
+ int tmp = rightCol;
+ rightCol = leftCol;
+ leftCol = tmp;
+ }
+
+ if (topRow > bottomRow)
+ {
+ int tmp = bottomRow;
+ bottomRow = topRow;
+ topRow = tmp;
+ }
+
+ int i, j;
+ for (i = topRow; i <= bottomRow; i++)
+ {
+ for (j = leftCol; j <= rightCol; j++)
+ {
+ wxRichTextCell* cell = GetCell(i, j);
+ if (cell && cell->IsShown())
+ selection.Add(cell->GetRange());
+ }
+ }
+
+ return selection;
+}
+
+// Sets the attributes for the cells specified by the selection.
+bool wxRichTextTable::SetCellStyle(const wxRichTextSelection& selection, const wxRichTextAttr& style, int flags)
+{
+ if (selection.GetContainer() != this)
+ return false;
+
+ wxRichTextBuffer* buffer = GetBuffer();
+ bool haveControl = (buffer && buffer->GetRichTextCtrl() != NULL);
+ bool withUndo = haveControl && ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+
+ if (withUndo)
+ buffer->BeginBatchUndo(_("Set Cell Style"));
+
+ wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxRichTextCell* cell = wxDynamicCast(node->GetData(), wxRichTextCell);
+ if (cell && selection.WithinSelection(cell->GetRange().GetStart()))
+ SetStyle(cell, style, flags);
+ node = node->GetNext();
+ }
+
+ // Do action, or delay it until end of batch.
+ if (withUndo)
+ buffer->EndBatchUndo();
+
+ return true;
+}
+
+bool wxRichTextTable::DeleteRows(int startRow, int noRows)
+{
+ wxASSERT((startRow + noRows) < m_rowCount);
+ if ((startRow + noRows) >= m_rowCount)
+ return false;
+
+ int i, j;
+ for (i = startRow; i < (startRow+noRows); i++)
+ {
+ wxRichTextObjectPtrArray& colArray = m_cells[startRow];
+ for (j = 0; j < (int) colArray.GetCount(); j++)
+ {
+ wxRichTextObject* cell = colArray[j];
+ RemoveChild(cell, true);
+ }
+
+ // Keep deleting at the same position, since we move all
+ // the others up
+ m_cells.RemoveAt(startRow);
+ }
+
+ m_rowCount = m_rowCount - noRows;
+
+ return true;
+}
+
+bool wxRichTextTable::DeleteColumns(int startCol, int noCols)
+{
+ wxASSERT((startCol + noCols) < m_colCount);
+ if ((startCol + noCols) >= m_colCount)
+ return false;
+
+ bool deleteRows = (noCols == m_colCount);
+
+ int i, j;
+ for (i = 0; i < m_rowCount; i++)
+ {
+ wxRichTextObjectPtrArray& colArray = m_cells[deleteRows ? 0 : i];
+ for (j = startCol; j < (startCol+noCols); j++)
+ {
+ wxRichTextObject* cell = colArray[j];
+ RemoveChild(cell, true);
+ }
+
+ if (deleteRows)
+ m_cells.RemoveAt(0);
+ }
+
+ if (deleteRows)
+ m_rowCount = 0;
+ m_colCount = m_colCount - noCols;
+
+ return true;
+}
+
+bool wxRichTextTable::AddRows(int startRow, int noRows, const wxRichTextAttr& attr)
+{
+ wxASSERT(startRow <= m_rowCount);
+ if (startRow > m_rowCount)
+ return false;
+
+ int i, j;
+ for (i = 0; i < noRows; i++)
+ {
+ int idx;
+ if (startRow == m_rowCount)
+ {
+ m_cells.Add(wxRichTextObjectPtrArray());
+ idx = m_cells.GetCount() - 1;
+ }
+ else
+ {
+ m_cells.Insert(wxRichTextObjectPtrArray(), startRow+i);
+ idx = startRow+i;
+ }
+
+ wxRichTextObjectPtrArray& colArray = m_cells[idx];
+ for (j = 0; j < m_colCount; j++)
+ {
+ wxRichTextCell* cell = new wxRichTextCell;
+ cell->GetAttributes() = attr;
+
+ AppendChild(cell);
+ colArray.Add(cell);
+ }
+ }
+
+ m_rowCount = m_rowCount + noRows;
+ return true;
+}
+
+bool wxRichTextTable::AddColumns(int startCol, int noCols, const wxRichTextAttr& attr)
+{
+ wxASSERT(startCol <= m_colCount);
+ if (startCol > m_colCount)
+ return false;
+
+ int i, j;
+ for (i = 0; i < m_rowCount; i++)
+ {
+ wxRichTextObjectPtrArray& colArray = m_cells[i];
+ for (j = 0; j < noCols; j++)
+ {
+ wxRichTextCell* cell = new wxRichTextCell;
+ cell->GetAttributes() = attr;
+
+ AppendChild(cell);
+
+ if (startCol == m_colCount)
+ colArray.Add(cell);
+ else
+ colArray.Insert(cell, startCol+j);
+ }
+ }
+
+ m_colCount = m_colCount + noCols;
+
+ return true;
}
-/// Get/set the size for the given range. Assume only has one child.
-bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const
+// Edit properties via a GUI
+bool wxRichTextTable::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
{
- wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
- if (node)
+ wxRichTextObjectPropertiesDialog boxDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Table Properties"));
+ boxDlg.SetAttributes(GetAttributes());
+
+ if (boxDlg.ShowModal() == wxID_OK)
{
- wxRichTextObject* child = node->GetData();
- return child->GetRangeSize(range, size, descent, dc, flags, position, partialExtents);
+ boxDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
+ return true;
}
else
return false;
wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer);
wxRichTextBuffer::InitStandardHandlers();
wxRichTextParagraph::InitDefaultTabs();
+
+ wxRichTextXMLHandler::RegisterNodeName(wxT("text"), wxT("wxRichTextPlainText"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("symbol"), wxT("wxRichTextPlainText"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("image"), wxT("wxRichTextImage"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("paragraph"), wxT("wxRichTextParagraph"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("paragraphlayout"), wxT("wxRichTextParagraphLayoutBox"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("textbox"), wxT("wxRichTextBox"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("cell"), wxT("wxRichTextCell"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("table"), wxT("wxRichTextTable"));
+ wxRichTextXMLHandler::RegisterNodeName(wxT("field"), wxT("wxRichTextField"));
+
return true;
}
void OnExit()
{
wxRichTextBuffer::CleanUpHandlers();
+ wxRichTextBuffer::CleanUpDrawingHandlers();
+ wxRichTextBuffer::CleanUpFieldTypes();
+ wxRichTextXMLHandler::ClearNodeToClassMap();
wxRichTextDecimalToRoman(-1);
wxRichTextParagraph::ClearDefaultTabs();
wxRichTextCtrl::ClearAvailableFontNames();
*/
wxRichTextCommand::wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer,
- wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(true, name)
+ wxRichTextParagraphLayoutBox* container, wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(true, name)
{
- /* wxRichTextAction* action = */ new wxRichTextAction(this, name, id, buffer, ctrl, ignoreFirstTime);
+ /* wxRichTextAction* action = */ new wxRichTextAction(this, name, id, buffer, container, ctrl, ignoreFirstTime);
}
wxRichTextCommand::wxRichTextCommand(const wxString& name): wxCommand(true, name)
*
*/
-wxRichTextAction::wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer,
- wxRichTextCtrl* ctrl, bool ignoreFirstTime)
+wxRichTextAction::wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id,
+ wxRichTextBuffer* buffer, wxRichTextParagraphLayoutBox* container,
+ wxRichTextCtrl* ctrl, bool ignoreFirstTime)
{
m_buffer = buffer;
+ m_object = NULL;
+ m_containerAddress.Create(buffer, container);
m_ignoreThis = ignoreFirstTime;
m_cmdId = id;
m_position = -1;
wxRichTextAction::~wxRichTextAction()
{
+ if (m_object)
+ delete m_object;
+}
+
+// Returns the container that this action refers to, using the container address and top-level buffer.
+wxRichTextParagraphLayoutBox* wxRichTextAction::GetContainer() const
+{
+ wxRichTextParagraphLayoutBox* container = wxDynamicCast(GetContainerAddress().GetObject(m_buffer), wxRichTextParagraphLayoutBox);
+ return container;
}
+
void wxRichTextAction::CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions)
{
// Store a list of line start character and y positions so we can figure out which area
// we need to refresh
#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+ wxRichTextParagraphLayoutBox* container = GetContainer();
+ wxASSERT(container != NULL);
+ if (!container)
+ return;
+
// NOTE: we're assuming that the buffer is laid out correctly at this point.
// If we had several actions, which only invalidate and leave layout until the
// paint handler is called, then this might not be true. So we may need to switch
// optimisation on only when we're simply adding text and not simultaneously
// deleting a selection, for example. Or, we make sure the buffer is laid out correctly
// first, but of course this means we'll be doing it twice.
- if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly
+ if (!m_buffer->IsDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly
{
- wxSize clientSize = m_ctrl->GetClientSize();
- wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint();
+ wxSize clientSize = m_ctrl->GetUnscaledSize(m_ctrl->GetClientSize());
+ wxPoint firstVisiblePt = m_ctrl->GetUnscaledPoint(m_ctrl->GetFirstVisiblePoint());
int lastY = firstVisiblePt.y + clientSize.y;
- wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetRange().GetStart());
- wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
+ wxRichTextParagraph* para = container->GetParagraphAtPosition(GetRange().GetStart());
+ wxRichTextObjectList::compatibility_iterator node = container->GetChildren().Find(para);
while (node)
{
wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData();
{
m_buffer->Modify(true);
+ wxRichTextParagraphLayoutBox* container = GetContainer();
+ wxASSERT(container != NULL);
+ if (!container)
+ return false;
+
switch (m_cmdId)
{
case wxRICHTEXT_INSERT:
CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
#endif
- m_buffer->InsertFragment(GetRange().GetStart(), m_newParagraphs);
- m_buffer->UpdateRanges();
- m_buffer->Invalidate(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd()));
+ container->InsertFragment(GetRange().GetStart(), m_newParagraphs);
+ container->UpdateRanges();
+
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd()));
- long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength();
+ long newCaretPosition = GetPosition() + m_newParagraphs.GetOwnRange().GetLength();
// Character position to caret position
newCaretPosition --;
newCaretPosition --;
}
- newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));
+ newCaretPosition = wxMin(newCaretPosition, (container->GetOwnRange().GetEnd()-1));
UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */);
cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
cmdEvent.SetRange(GetRange());
cmdEvent.SetPosition(GetRange().GetStart());
+ cmdEvent.SetContainer(container);
m_buffer->SendEvent(cmdEvent);
CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
#endif
- m_buffer->DeleteRange(GetRange());
- m_buffer->UpdateRanges();
- m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
+ container->DeleteRange(GetRange());
+ container->UpdateRanges();
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
long caretPos = GetRange().GetStart()-1;
- if (caretPos >= m_buffer->GetRange().GetEnd())
+ if (caretPos >= container->GetOwnRange().GetEnd())
caretPos --;
UpdateAppearance(caretPos, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */);
cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
cmdEvent.SetRange(GetRange());
cmdEvent.SetPosition(GetRange().GetStart());
+ cmdEvent.SetContainer(container);
m_buffer->SendEvent(cmdEvent);
break;
}
case wxRICHTEXT_CHANGE_STYLE:
+ case wxRICHTEXT_CHANGE_PROPERTIES:
{
ApplyParagraphs(GetNewParagraphs());
- m_buffer->Invalidate(GetRange());
+
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(GetRange());
+
+ UpdateAppearance(GetPosition());
+
+ wxRichTextEvent cmdEvent(
+ m_cmdId == wxRICHTEXT_CHANGE_STYLE ? wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED : wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED,
+ m_ctrl ? m_ctrl->GetId() : -1);
+ cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+ cmdEvent.SetRange(GetRange());
+ cmdEvent.SetPosition(GetRange().GetStart());
+ cmdEvent.SetContainer(container);
+
+ m_buffer->SendEvent(cmdEvent);
+
+ break;
+ }
+ case wxRICHTEXT_CHANGE_ATTRIBUTES:
+ {
+ wxRichTextObject* obj = m_objectAddress.GetObject(m_buffer); // container->GetChildAtPosition(GetRange().GetStart());
+ if (obj)
+ {
+ wxRichTextAttr oldAttr = obj->GetAttributes();
+ obj->GetAttributes() = m_attributes;
+ m_attributes = oldAttr;
+ }
+
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(GetRange());
UpdateAppearance(GetPosition());
cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
cmdEvent.SetRange(GetRange());
cmdEvent.SetPosition(GetRange().GetStart());
+ cmdEvent.SetContainer(container);
m_buffer->SendEvent(cmdEvent);
+ break;
+ }
+ case wxRICHTEXT_CHANGE_OBJECT:
+ {
+ wxRichTextObject* obj = m_objectAddress.GetObject(m_buffer);
+ // wxRichTextObject* obj = container->GetChildAtPosition(GetRange().GetStart());
+ if (obj && m_object)
+ {
+ wxRichTextObjectList::compatibility_iterator node = container->GetChildren().Find(obj);
+ if (node)
+ {
+ wxRichTextObject* obj = node->GetData();
+ node->SetData(m_object);
+ m_object = obj;
+ }
+ }
+
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(GetRange());
+
+ UpdateAppearance(GetPosition());
+
+ // TODO: send new kind of modification event
+
break;
}
default:
{
m_buffer->Modify(true);
+ wxRichTextParagraphLayoutBox* container = GetContainer();
+ wxASSERT(container != NULL);
+ if (!container)
+ return false;
+
switch (m_cmdId)
{
case wxRICHTEXT_INSERT:
CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
#endif
- m_buffer->DeleteRange(GetRange());
- m_buffer->UpdateRanges();
- m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
+ container->DeleteRange(GetRange());
+ container->UpdateRanges();
+
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
long newCaretPosition = GetPosition() - 1;
cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
cmdEvent.SetRange(GetRange());
cmdEvent.SetPosition(GetRange().GetStart());
+ cmdEvent.SetContainer(container);
m_buffer->SendEvent(cmdEvent);
CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
#endif
- m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
- m_buffer->UpdateRanges();
- m_buffer->Invalidate(GetRange());
+ container->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
+ container->UpdateRanges();
+
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(GetRange());
UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */);
cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
cmdEvent.SetRange(GetRange());
cmdEvent.SetPosition(GetRange().GetStart());
+ cmdEvent.SetContainer(container);
m_buffer->SendEvent(cmdEvent);
break;
}
case wxRICHTEXT_CHANGE_STYLE:
+ case wxRICHTEXT_CHANGE_PROPERTIES:
{
ApplyParagraphs(GetOldParagraphs());
- m_buffer->Invalidate(GetRange());
+ // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+ // Layout() would stop prematurely at the top level.
+ container->InvalidateHierarchy(GetRange());
UpdateAppearance(GetPosition());
wxRichTextEvent cmdEvent(
- wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED,
+ m_cmdId == wxRICHTEXT_CHANGE_STYLE ? wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED : wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED,
m_ctrl ? m_ctrl->GetId() : -1);
cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
cmdEvent.SetRange(GetRange());
cmdEvent.SetPosition(GetRange().GetStart());
+ cmdEvent.SetContainer(container);
m_buffer->SendEvent(cmdEvent);
break;
}
+ case wxRICHTEXT_CHANGE_ATTRIBUTES:
+ case wxRICHTEXT_CHANGE_OBJECT:
+ {
+ return Do();
+ }
default:
break;
}
}
/// Update the control appearance
-void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* WXUNUSED(optimizationLineCharPositions), wxArrayInt* WXUNUSED(optimizationLineYPositions), bool WXUNUSED(isDoCmd))
+void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions, bool isDoCmd)
{
+ wxRichTextParagraphLayoutBox* container = GetContainer();
+ wxASSERT(container != NULL);
+ if (!container)
+ return;
+
if (m_ctrl)
{
+ m_ctrl->SetFocusObject(container);
m_ctrl->SetCaretPosition(caretPosition);
+
if (!m_ctrl->IsFrozen())
{
+ wxRect containerRect = container->GetRect();
+
m_ctrl->LayoutContent();
- // TODO Refresh the whole client area now
- m_ctrl->Refresh(false);
-#if wxRICHTEXT_USE_OWN_CARET
- m_ctrl->PositionCaret();
+ // Refresh everything if there were floating objects or the container changed size
+ // (we can't yet optimize in these cases, since more complex interaction with other content occurs)
+ if (container->GetFloatingObjectCount() > 0 || (container->GetParent() && containerRect != container->GetRect()))
+ {
+ m_ctrl->Refresh(false);
+ }
+ else
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+ // Find refresh rectangle if we are in a position to optimise refresh
+ if ((m_cmdId == wxRICHTEXT_INSERT || m_cmdId == wxRICHTEXT_DELETE) && optimizationLineCharPositions)
+ {
+ size_t i;
+
+ wxSize clientSize = m_ctrl->GetUnscaledSize(m_ctrl->GetClientSize());
+ wxPoint firstVisiblePt = m_ctrl->GetUnscaledPoint(m_ctrl->GetFirstVisiblePoint());
+
+ // Start/end positions
+ int firstY = 0;
+ int lastY = firstVisiblePt.y + clientSize.y;
+
+ bool foundEnd = false;
+
+ // position offset - how many characters were inserted
+ int positionOffset = GetRange().GetLength();
+
+ // Determine whether this is Do or Undo, and adjust positionOffset accordingly
+ if ((m_cmdId == wxRICHTEXT_DELETE && isDoCmd) || (m_cmdId == wxRICHTEXT_INSERT && !isDoCmd))
+ positionOffset = - positionOffset;
+
+ // find the first line which is being drawn at the same position as it was
+ // before. Since we're talking about a simple insertion, we can assume
+ // that the rest of the window does not need to be redrawn.
+
+ wxRichTextParagraph* para = container->GetParagraphAtPosition(GetPosition());
+ // Since we support floating layout, we should redraw the whole para instead of just
+ // the first line touching the invalid range.
+ if (para)
+ {
+ firstY = para->GetPosition().y;
+ }
+
+ wxRichTextObjectList::compatibility_iterator node = container->GetChildren().Find(para);
+ while (node)
+ {
+ wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData();
+ wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+ while (node2)
+ {
+ wxRichTextLine* line = node2->GetData();
+ wxPoint pt = line->GetAbsolutePosition();
+ wxRichTextRange range = line->GetAbsoluteRange();
+
+ // we want to find the first line that is in the same position
+ // as before. This will mean we're at the end of the changed text.
+
+ if (pt.y > lastY) // going past the end of the window, no more info
+ {
+ node2 = wxRichTextLineList::compatibility_iterator();
+ node = wxRichTextObjectList::compatibility_iterator();
+ }
+ // Detect last line in the buffer
+ else if (!node2->GetNext() && para->GetRange().Contains(container->GetOwnRange().GetEnd()))
+ {
+ // If deleting text, make sure we refresh below as well as above
+ if (positionOffset >= 0)
+ {
+ foundEnd = true;
+ lastY = pt.y + line->GetSize().y;
+ }
+
+ node2 = wxRichTextLineList::compatibility_iterator();
+ node = wxRichTextObjectList::compatibility_iterator();
+
+ break;
+ }
+ else
+ {
+ // search for this line being at the same position as before
+ for (i = 0; i < optimizationLineCharPositions->GetCount(); i++)
+ {
+ if (((*optimizationLineCharPositions)[i] + positionOffset == range.GetStart()) &&
+ ((*optimizationLineYPositions)[i] == pt.y))
+ {
+ // Stop, we're now the same as we were
+ foundEnd = true;
+
+ lastY = pt.y;
+
+ node2 = wxRichTextLineList::compatibility_iterator();
+ node = wxRichTextObjectList::compatibility_iterator();
+
+ break;
+ }
+ }
+ }
+
+ if (node2)
+ node2 = node2->GetNext();
+ }
+
+ if (node)
+ node = node->GetNext();
+ }
+
+ firstY = wxMax(firstVisiblePt.y, firstY);
+ if (!foundEnd)
+ lastY = firstVisiblePt.y + clientSize.y;
+
+ // Convert to device coordinates
+ wxRect rect(m_ctrl->GetPhysicalPoint(m_ctrl->GetScaledPoint(wxPoint(firstVisiblePt.x, firstY))), m_ctrl->GetScaledSize(wxSize(clientSize.x, lastY - firstY)));
+ m_ctrl->RefreshRect(rect);
+ }
+ else
#endif
+ m_ctrl->Refresh(false);
+
+ m_ctrl->PositionCaret();
+
+ // This causes styles to persist when doing programmatic
+ // content creation except when Freeze/Thaw is used, so
+ // disable this and check for the consequences.
+ // m_ctrl->SetDefaultStyleToCursorStyle();
+
if (sendUpdateEvent)
wxTextCtrl::SendTextUpdatedEvent(m_ctrl);
}
/// Replace the buffer paragraphs with the new ones.
void wxRichTextAction::ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment)
{
+ wxRichTextParagraphLayoutBox* container = GetContainer();
+ wxASSERT(container != NULL);
+ if (!container)
+ return;
+
wxRichTextObjectList::compatibility_iterator node = fragment.GetChildren().GetFirst();
while (node)
{
// delete its node data, and setting a copy as the new node data.
// TODO: make more efficient by simply swapping old and new paragraph objects.
- wxRichTextParagraph* existingPara = m_buffer->GetParagraphAtPosition(para->GetRange().GetStart());
+ wxRichTextParagraph* existingPara = container->GetParagraphAtPosition(para->GetRange().GetStart());
if (existingPara)
{
- wxRichTextObjectList::compatibility_iterator bufferParaNode = m_buffer->GetChildren().Find(existingPara);
+ wxRichTextObjectList::compatibility_iterator bufferParaNode = container->GetChildren().Find(existingPara);
if (bufferParaNode)
{
wxRichTextParagraph* newPara = new wxRichTextParagraph(*para);
- newPara->SetParent(m_buffer);
+ newPara->SetParent(container);
bufferParaNode->SetData(newPara);
* This stores beginning and end positions for a range of data.
*/
+WX_DEFINE_OBJARRAY(wxRichTextRangeArray);
+
/// Limit this range to be within 'range'
bool wxRichTextRange::LimitTo(const wxRichTextRange& range)
{
wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxRichTextAttr* charStyle):
wxRichTextObject(parent)
{
+ Init();
m_imageBlock.MakeImageBlockDefaultQuality(image, wxBITMAP_TYPE_PNG);
if (charStyle)
SetAttributes(*charStyle);
wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxRichTextAttr* charStyle):
wxRichTextObject(parent)
{
+ Init();
m_imageBlock = imageBlock;
if (charStyle)
SetAttributes(*charStyle);
}
+void wxRichTextImage::Init()
+{
+ m_originalImageSize = wxSize(-1, -1);
+}
+
/// Create a cached image at the required size
bool wxRichTextImage::LoadImageCache(wxDC& dc, bool resetCache)
{
- if (resetCache || !m_imageCache.IsOk() /* || m_imageCache.GetWidth() != size.x || m_imageCache.GetHeight() != size.y */)
+ if (!m_imageBlock.IsOk())
+ return false;
+
+ // If we have an original image size, use that to compute the cached bitmap size
+ // instead of loading the image each time. This way we can avoid loading
+ // the image so long as the new cached bitmap size hasn't changed.
+
+ wxImage image;
+ if (resetCache || m_originalImageSize == wxSize(-1, -1))
{
- if (!m_imageBlock.IsOk())
- return false;
+ m_imageCache = wxNullBitmap;
- wxImage image;
m_imageBlock.Load(image);
if (!image.IsOk())
return false;
- int width = image.GetWidth();
- int height = image.GetHeight();
+ m_originalImageSize = wxSize(image.GetWidth(), image.GetHeight());
+ }
+
+ int width = m_originalImageSize.GetWidth();
+ int height = m_originalImageSize.GetHeight();
+
+ int parentWidth = 0;
+ int parentHeight = 0;
- if (GetAttributes().GetTextBoxAttr().GetWidth().IsPresent() && GetAttributes().GetTextBoxAttr().GetWidth().GetValue() > 0)
+ int maxWidth = -1;
+ int maxHeight = -1;
+
+ wxRichTextBuffer* buffer = GetBuffer();
+ if (buffer)
+ {
+ wxSize sz;
+ if (buffer->GetRichTextCtrl())
{
- if (GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
- width = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetWidth().GetValue());
- else
- width = GetAttributes().GetTextBoxAttr().GetWidth().GetValue();
+ // Subtract borders
+ sz = buffer->GetRichTextCtrl()->GetClientSize();
+
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ marginRect = wxRect(0, 0, sz.x, sz.y);
+ buffer->GetBoxRects(dc, buffer, buffer->GetAttributes(), marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+ sz = contentRect.GetSize();
+
+ // Start with a maximum width of the control size, even if not specified by the content,
+ // to minimize the amount of picture overlapping the right-hand side
+ maxWidth = sz.x;
}
- if (GetAttributes().GetTextBoxAttr().GetHeight().IsPresent() && GetAttributes().GetTextBoxAttr().GetHeight().GetValue() > 0)
+ else
+ sz = buffer->GetCachedSize();
+ parentWidth = sz.GetWidth();
+ parentHeight = sz.GetHeight();
+ }
+
+ if (GetAttributes().GetTextBoxAttr().GetWidth().IsValid() && GetAttributes().GetTextBoxAttr().GetWidth().GetValue() > 0)
+ {
+ if (parentWidth > 0 && GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+ width = (int) ((GetAttributes().GetTextBoxAttr().GetWidth().GetValue() * parentWidth)/100.0);
+ else if (GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+ width = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetWidth().GetValue());
+ else if (GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+ width = GetAttributes().GetTextBoxAttr().GetWidth().GetValue();
+ }
+
+ // Limit to max width
+
+ if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().IsValid() && GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue() > 0)
+ {
+ int mw = -1;
+
+ if (parentWidth > 0 && GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+ mw = (int) ((GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue() * parentWidth)/100.0);
+ else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+ mw = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue());
+ else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+ mw = GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue();
+
+ // If we already have a smaller max width due to the constraints of the control size,
+ // don't use the larger max width.
+ if (mw != -1 && ((maxWidth == -1) || (mw < maxWidth)))
+ maxWidth = mw;
+ }
+
+ if (maxWidth > 0 && width > maxWidth)
+ width = maxWidth;
+
+ // Preserve the aspect ratio
+ if (width != m_originalImageSize.GetWidth())
+ height = (int) (float(m_originalImageSize.GetHeight()) * (float(width)/float(m_originalImageSize.GetWidth())));
+
+ if (GetAttributes().GetTextBoxAttr().GetHeight().IsValid() && GetAttributes().GetTextBoxAttr().GetHeight().GetValue() > 0)
+ {
+ if (parentHeight > 0 && GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+ height = (int) ((GetAttributes().GetTextBoxAttr().GetHeight().GetValue() * parentHeight)/100.0);
+ else if (GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+ height = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetHeight().GetValue());
+ else if (GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+ height = GetAttributes().GetTextBoxAttr().GetHeight().GetValue();
+
+ // Preserve the aspect ratio
+ if (height != m_originalImageSize.GetHeight())
+ width = (int) (float(m_originalImageSize.GetWidth()) * (float(height)/float(m_originalImageSize.GetHeight())));
+ }
+
+ // Limit to max height
+
+ if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().IsValid() && GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue() > 0)
+ {
+ if (parentHeight > 0 && GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+ maxHeight = (int) ((GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue() * parentHeight)/100.0);
+ else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+ maxHeight = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue());
+ else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+ maxHeight = GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue();
+ }
+
+ if (maxHeight > 0 && height > maxHeight)
+ {
+ height = maxHeight;
+
+ // Preserve the aspect ratio
+ if (height != m_originalImageSize.GetHeight())
+ width = (int) (float(m_originalImageSize.GetWidth()) * (float(height)/float(m_originalImageSize.GetHeight())));
+ }
+
+ if (m_imageCache.IsOk() && m_imageCache.GetWidth() == width && m_imageCache.GetHeight() == height)
+ {
+ // Do nothing, we didn't need to change the image cache
+ }
+ else
+ {
+ if (!image.IsOk())
{
- if (GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
- height = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetHeight().GetValue());
- else
- height = GetAttributes().GetTextBoxAttr().GetHeight().GetValue();
+ m_imageBlock.Load(image);
+ if (!image.IsOk())
+ return false;
}
if (image.GetWidth() == width && image.GetHeight() == height)
}
/// Draw the item
-bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int WXUNUSED(style))
+bool wxRichTextImage::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& WXUNUSED(range), const wxRichTextSelection& selection, const wxRect& rect, int WXUNUSED(descent), int WXUNUSED(style))
{
+ if (!IsShown())
+ return true;
+
// Don't need cached size AFAIK
// wxSize size = GetCachedSize();
if (!LoadImageCache(dc))
return false;
- int y = rect.y + (rect.height - m_imageCache.GetHeight());
+ wxRichTextAttr attr(GetAttributes());
+ context.ApplyVirtualAttributes(attr, this);
+
+ DrawBoxAttributes(dc, GetBuffer(), attr, wxRect(rect.GetPosition(), GetCachedSize()));
- dc.DrawBitmap(m_imageCache, rect.x, y, true);
+ wxSize imageSize(m_imageCache.GetWidth(), m_imageCache.GetHeight());
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ marginRect = rect; // outer rectangle, will calculate contentRect
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
- if (selectionRange.Contains(range.GetStart()))
+ dc.DrawBitmap(m_imageCache, contentRect.x, contentRect.y, true);
+
+ if (selection.WithinSelection(GetRange().GetStart(), this))
{
wxCheckSetBrush(dc, *wxBLACK_BRUSH);
wxCheckSetPen(dc, *wxBLACK_PEN);
dc.SetLogicalFunction(wxINVERT);
- dc.DrawRectangle(rect);
+ dc.DrawRectangle(contentRect);
dc.SetLogicalFunction(wxCOPY);
}
}
/// Lay the item out
-bool wxRichTextImage::Layout(wxDC& dc, const wxRect& rect, int WXUNUSED(style))
+bool wxRichTextImage::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& WXUNUSED(parentRect), int WXUNUSED(style))
{
if (!LoadImageCache(dc))
return false;
- SetCachedSize(wxSize(m_imageCache.GetWidth(), m_imageCache.GetHeight()));
+ wxSize imageSize(m_imageCache.GetWidth(), m_imageCache.GetHeight());
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0,0), imageSize);
+
+ wxRichTextAttr attr(GetAttributes());
+ context.ApplyVirtualAttributes(attr, this);
+
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+ wxSize overallSize = marginRect.GetSize();
+
+ SetCachedSize(overallSize);
+ SetMaxSize(overallSize);
+ SetMinSize(overallSize);
SetPosition(rect.GetPosition());
return true;
/// Get/set the object size for the given range. Returns false if the range
/// is invalid for this object.
-bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& dc, int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const
+bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& dc, wxRichTextDrawingContext& context, int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const
{
if (!range.IsWithin(GetRange()))
return false;
return false;
}
- int width = m_imageCache.GetWidth();
- int height = m_imageCache.GetHeight();
+ wxRichTextAttr attr(GetAttributes());
+ context.ApplyVirtualAttributes(attr, (wxRichTextObject*) this);
+
+ wxSize imageSize(m_imageCache.GetWidth(), m_imageCache.GetHeight());
+ wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+ contentRect = wxRect(wxPoint(0,0), imageSize);
+ GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+ wxSize overallSize = marginRect.GetSize();
if (partialExtents)
- partialExtents->Add(width);
+ partialExtents->Add(overallSize.x);
- size.x = width;
- size.y = height;
+ size = overallSize;
return true;
}
+// Get the 'natural' size for an object. For an image, it would be the
+// image size.
+wxTextAttrSize wxRichTextImage::GetNaturalSize() const
+{
+ wxTextAttrSize size;
+ if (GetImageCache().IsOk())
+ {
+ size.SetWidth(GetImageCache().GetWidth(), wxTEXT_ATTR_UNITS_PIXELS);
+ size.SetHeight(GetImageCache().GetHeight(), wxTEXT_ATTR_UNITS_PIXELS);
+ }
+ return size;
+}
+
+
/// Copy
void wxRichTextImage::Copy(const wxRichTextImage& obj)
{
wxRichTextObject::Copy(obj);
m_imageBlock = obj.m_imageBlock;
+ m_originalImageSize = obj.m_originalImageSize;
}
/// Edit properties via a GUI
bool wxRichTextImage::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
{
- wxRichTextImageDialog imageDlg(wxGetTopLevelParent(parent));
- imageDlg.SetImageObject(this, buffer);
+ wxRichTextObjectPropertiesDialog imageDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Picture Properties"));
+ imageDlg.SetAttributes(GetAttributes());
if (imageDlg.ShowModal() == wxID_OK)
{
- imageDlg.ApplyImageAttr();
+ // By passing wxRICHTEXT_SETSTYLE_RESET, indeterminate attributes set by the user will be set as
+ // indeterminate in the object.
+ imageDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
return true;
}
else
return (attr1 == attr2);
}
-// Partial equality test taking flags into account
-bool wxTextAttrEqPartial(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2)
-{
- return attr1.EqPartial(attr2);
-}
-
/// Compare tabs
bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2)
{
bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
{
wxFFileInputStream stream(filename);
- if (stream.Ok())
+ if (stream.IsOk())
return LoadFile(buffer, stream);
return false;
bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
{
wxFFileOutputStream stream(filename);
- if (stream.Ok())
+ if (stream.IsOk())
return SaveFile(buffer, stream);
return false;
unsigned char* block = new unsigned char[memStream.GetSize()];
if (!block)
- return NULL;
+ return false;
if (m_data)
delete[] m_data;
// Write data in hex to a stream
bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
{
- const int bufSize = 512;
- char buf[bufSize+1];
+ if (m_dataSize == 0)
+ return true;
+
+ int bufSize = 100000;
+ if (int(2*m_dataSize) < bufSize)
+ bufSize = 2*m_dataSize;
+ char* buf = new char[bufSize+1];
int left = m_dataSize;
int n, i, j;
buf[n] = 0;
stream.Write((const char*) buf, n);
}
+ delete[] buf;
return true;
}
unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size)
{
wxFileInputStream stream(filename);
- if (!stream.Ok())
+ if (!stream.IsOk())
return NULL;
return ReadBlock(stream, size);
bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size)
{
wxFileOutputStream outStream(filename);
- if (!outStream.Ok())
+ if (!outStream.IsOk())
return false;
return WriteBlock(outStream, block, size);
public:
wxRichTextFontTableData() {}
- wxFont FindFont(const wxRichTextAttr& fontSpec);
+ wxFont FindFont(const wxRichTextAttr& fontSpec, double fontScale);
wxRichTextFontTableHashMap m_hashMap;
};
-wxFont wxRichTextFontTableData::FindFont(const wxRichTextAttr& fontSpec)
+wxFont wxRichTextFontTableData::FindFont(const wxRichTextAttr& fontSpec, double fontScale)
{
wxString facename(fontSpec.GetFontFaceName());
- wxString spec(wxString::Format(wxT("%d-%d-%d-%d-%s-%d"), fontSpec.GetFontSize(), fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), (int) fontSpec.GetFontUnderlined(), facename.c_str(), (int) fontSpec.GetFontEncoding()));
- wxRichTextFontTableHashMap::iterator entry = m_hashMap.find(spec);
+ int fontSize = fontSpec.GetFontSize();
+ if (fontScale != 1.0)
+ fontSize = (int) ((double(fontSize) * fontScale) + 0.5);
+
+ wxString units;
+ if (fontSpec.HasFontPixelSize() && !fontSpec.HasFontPointSize())
+ units = wxT("px");
+ else
+ units = wxT("pt");
+ wxString spec = wxString::Format(wxT("%d-%s-%d-%d-%d-%d-%s-%d"),
+ fontSize, units.c_str(), fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), (int) fontSpec.GetFontUnderlined(), (int) fontSpec.GetFontStrikethrough(),
+ facename.c_str(), (int) fontSpec.GetFontEncoding());
+
+ wxRichTextFontTableHashMap::iterator entry = m_hashMap.find(spec);
if ( entry == m_hashMap.end() )
{
- wxFont font(fontSpec.GetFontSize(), wxDEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str());
- m_hashMap[spec] = font;
- return font;
+ if (fontSpec.HasFontPixelSize() && !fontSpec.HasFontPointSize())
+ {
+ wxFont font(wxSize(0, fontSize), wxFONTFAMILY_DEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename);
+ if (fontSpec.HasFontStrikethrough() && fontSpec.GetFontStrikethrough())
+ font.SetStrikethrough(true);
+ m_hashMap[spec] = font;
+ return font;
+ }
+ else
+ {
+ wxFont font(fontSize, wxFONTFAMILY_DEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str());
+ if (fontSpec.HasFontStrikethrough() && fontSpec.GetFontStrikethrough())
+ font.SetStrikethrough(true);
+
+ m_hashMap[spec] = font;
+ return font;
+ }
}
else
{
wxRichTextFontTable::wxRichTextFontTable()
{
m_refData = new wxRichTextFontTableData;
+ m_fontScale = 1.0;
}
wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table)
void wxRichTextFontTable::operator= (const wxRichTextFontTable& table)
{
Ref(table);
+ m_fontScale = table.m_fontScale;
}
wxFont wxRichTextFontTable::FindFont(const wxRichTextAttr& fontSpec)
{
wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData;
if (data)
- return data->FindFont(fontSpec);
+ return data->FindFont(fontSpec, m_fontScale);
else
return wxFont();
}
data->m_hashMap.clear();
}
-// wxTextBoxAttr
+void wxRichTextFontTable::SetFontScale(double fontScale)
+{
+ if (fontScale != m_fontScale)
+ Clear();
+ m_fontScale = fontScale;
+}
+// wxTextBoxAttr
void wxTextBoxAttr::Reset()
{
m_flags = 0;
- m_floatMode = 0;
- m_clearMode = 0;
- m_collapseMode = 0;
+ m_floatMode = wxTEXT_BOX_ATTR_FLOAT_NONE;
+ m_clearMode = wxTEXT_BOX_ATTR_CLEAR_NONE;
+ m_collapseMode = wxTEXT_BOX_ATTR_COLLAPSE_NONE;
+ m_verticalAlignment = wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_NONE;
+ m_boxStyleName = wxEmptyString;
m_margins.Reset();
m_padding.Reset();
m_position.Reset();
- m_width.Reset();
- m_height.Reset();
+ m_size.Reset();
+ m_minSize.Reset();
+ m_maxSize.Reset();
m_border.Reset();
m_outline.Reset();
m_floatMode == attr.m_floatMode &&
m_clearMode == attr.m_clearMode &&
m_collapseMode == attr.m_collapseMode &&
+ m_verticalAlignment == attr.m_verticalAlignment &&
m_margins == attr.m_margins &&
m_padding == attr.m_padding &&
m_position == attr.m_position &&
- m_width == attr.m_width &&
- m_height == attr.m_height &&
+ m_size == attr.m_size &&
+ m_minSize == attr.m_minSize &&
+ m_maxSize == attr.m_maxSize &&
m_border == attr.m_border &&
- m_outline == attr.m_outline
+ m_outline == attr.m_outline &&
+
+ m_boxStyleName == attr.m_boxStyleName
);
}
// Partial equality test
-bool wxTextBoxAttr::EqPartial(const wxTextBoxAttr& attr) const
+bool wxTextBoxAttr::EqPartial(const wxTextBoxAttr& attr, bool weakTest) const
{
+ if (!weakTest &&
+ ((!HasFloatMode() && attr.HasFloatMode()) ||
+ (!HasClearMode() && attr.HasClearMode()) ||
+ (!HasCollapseBorders() && attr.HasCollapseBorders()) ||
+ (!HasVerticalAlignment() && attr.HasVerticalAlignment()) ||
+ (!HasBoxStyleName() && attr.HasBoxStyleName())))
+ {
+ return false;
+ }
if (attr.HasFloatMode() && HasFloatMode() && (GetFloatMode() != attr.GetFloatMode()))
return false;
if (attr.HasCollapseBorders() && HasCollapseBorders() && (attr.GetCollapseBorders() != GetCollapseBorders()))
return false;
+ if (attr.HasVerticalAlignment() && HasVerticalAlignment() && (attr.GetVerticalAlignment() != GetVerticalAlignment()))
+ return false;
+
+ if (attr.HasBoxStyleName() && HasBoxStyleName() && (attr.GetBoxStyleName() != GetBoxStyleName()))
+ return false;
+
// Position
- if (!m_position.EqPartial(attr.m_position))
+ if (!m_position.EqPartial(attr.m_position, weakTest))
+ return false;
+
+ // Size
+
+ if (!m_size.EqPartial(attr.m_size, weakTest))
+ return false;
+ if (!m_minSize.EqPartial(attr.m_minSize, weakTest))
+ return false;
+ if (!m_maxSize.EqPartial(attr.m_maxSize, weakTest))
return false;
// Margins
- if (!m_margins.EqPartial(attr.m_margins))
+ if (!m_margins.EqPartial(attr.m_margins, weakTest))
return false;
// Padding
- if (!m_padding.EqPartial(attr.m_padding))
+ if (!m_padding.EqPartial(attr.m_padding, weakTest))
return false;
// Border
- if (!GetBorder().EqPartial(attr.GetBorder()))
+ if (!GetBorder().EqPartial(attr.GetBorder(), weakTest))
return false;
// Outline
- if (!GetOutline().EqPartial(attr.GetOutline()))
+ if (!GetOutline().EqPartial(attr.GetOutline(), weakTest))
return false;
return true;
if (attr.HasCollapseBorders())
{
if (!(compareWith && compareWith->HasCollapseBorders() && compareWith->GetCollapseBorders() == attr.GetCollapseBorders()))
- SetCollapseBorders(true);
+ SetCollapseBorders(attr.GetCollapseBorders());
+ }
+
+ if (attr.HasVerticalAlignment())
+ {
+ if (!(compareWith && compareWith->HasVerticalAlignment() && compareWith->GetVerticalAlignment() == attr.GetVerticalAlignment()))
+ SetVerticalAlignment(attr.GetVerticalAlignment());
+ }
+
+ if (attr.HasBoxStyleName())
+ {
+ if (!(compareWith && compareWith->HasBoxStyleName() && compareWith->GetBoxStyleName() == attr.GetBoxStyleName()))
+ SetBoxStyleName(attr.GetBoxStyleName());
}
m_margins.Apply(attr.m_margins, compareWith ? (& attr.m_margins) : (const wxTextAttrDimensions*) NULL);
m_padding.Apply(attr.m_padding, compareWith ? (& attr.m_padding) : (const wxTextAttrDimensions*) NULL);
m_position.Apply(attr.m_position, compareWith ? (& attr.m_position) : (const wxTextAttrDimensions*) NULL);
- m_width.Apply(attr.m_width, compareWith ? (& attr.m_width) : (const wxTextAttrDimension*) NULL);
- m_height.Apply(attr.m_height, compareWith ? (& attr.m_height) : (const wxTextAttrDimension*) NULL);
+ m_size.Apply(attr.m_size, compareWith ? (& attr.m_size) : (const wxTextAttrSize*) NULL);
+ m_minSize.Apply(attr.m_minSize, compareWith ? (& attr.m_minSize) : (const wxTextAttrSize*) NULL);
+ m_maxSize.Apply(attr.m_maxSize, compareWith ? (& attr.m_maxSize) : (const wxTextAttrSize*) NULL);
m_border.Apply(attr.m_border, compareWith ? (& attr.m_border) : (const wxTextAttrBorders*) NULL);
m_outline.Apply(attr.m_outline, compareWith ? (& attr.m_outline) : (const wxTextAttrBorders*) NULL);
if (attr.HasCollapseBorders())
RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
+ if (attr.HasVerticalAlignment())
+ RemoveFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
+
+ if (attr.HasBoxStyleName())
+ {
+ SetBoxStyleName(wxEmptyString);
+ RemoveFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
+ }
+
m_margins.RemoveStyle(attr.m_margins);
m_padding.RemoveStyle(attr.m_padding);
m_position.RemoveStyle(attr.m_position);
- if (attr.m_width.IsPresent())
- m_width.Reset();
- if (attr.m_height.IsPresent())
- m_height.Reset();
+ m_size.RemoveStyle(attr.m_size);
+ m_minSize.RemoveStyle(attr.m_minSize);
+ m_maxSize.RemoveStyle(attr.m_maxSize);
m_border.RemoveStyle(attr.m_border);
m_outline.RemoveStyle(attr.m_outline);
else
absentAttr.AddFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
+ if (attr.HasVerticalAlignment())
+ {
+ if (!clashingAttr.HasVerticalAlignment() && !absentAttr.HasVerticalAlignment())
+ {
+ if (HasVerticalAlignment())
+ {
+ if (GetVerticalAlignment() != attr.GetVerticalAlignment())
+ {
+ clashingAttr.AddFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
+ RemoveFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
+ }
+ }
+ else
+ SetVerticalAlignment(attr.GetVerticalAlignment());
+ }
+ }
+ else
+ absentAttr.AddFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
+
+ if (attr.HasBoxStyleName())
+ {
+ if (!clashingAttr.HasBoxStyleName() && !absentAttr.HasBoxStyleName())
+ {
+ if (HasBoxStyleName())
+ {
+ if (GetBoxStyleName() != attr.GetBoxStyleName())
+ {
+ clashingAttr.AddFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
+ RemoveFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
+ }
+ }
+ else
+ SetBoxStyleName(attr.GetBoxStyleName());
+ }
+ }
+ else
+ absentAttr.AddFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
+
m_margins.CollectCommonAttributes(attr.m_margins, clashingAttr.m_margins, absentAttr.m_margins);
m_padding.CollectCommonAttributes(attr.m_padding, clashingAttr.m_padding, absentAttr.m_padding);
m_position.CollectCommonAttributes(attr.m_position, clashingAttr.m_position, absentAttr.m_position);
- m_width.CollectCommonAttributes(attr.m_width, clashingAttr.m_width, absentAttr.m_width);
- m_height.CollectCommonAttributes(attr.m_height, clashingAttr.m_height, absentAttr.m_height);
+ m_size.CollectCommonAttributes(attr.m_size, clashingAttr.m_size, absentAttr.m_size);
+ m_minSize.CollectCommonAttributes(attr.m_minSize, clashingAttr.m_minSize, absentAttr.m_minSize);
+ m_maxSize.CollectCommonAttributes(attr.m_maxSize, clashingAttr.m_maxSize, absentAttr.m_maxSize);
m_border.CollectCommonAttributes(attr.m_border, clashingAttr.m_border, absentAttr.m_border);
m_outline.CollectCommonAttributes(attr.m_outline, clashingAttr.m_outline, absentAttr.m_outline);
}
+bool wxTextBoxAttr::IsDefault() const
+{
+ return GetFlags() == 0 && !m_border.IsValid() && !m_outline.IsValid() &&
+ !m_size.IsValid() && !m_minSize.IsValid() && !m_maxSize.IsValid() &&
+ !m_position.IsValid() && !m_padding.IsValid() && !m_margins.IsValid();
+}
+
// wxRichTextAttr
void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
return (m_textBoxAttr == attr.m_textBoxAttr);
}
-// Partial equality test taking comparison object into account
-bool wxRichTextAttr::EqPartial(const wxRichTextAttr& attr) const
+// Partial equality test
+bool wxRichTextAttr::EqPartial(const wxRichTextAttr& attr, bool weakTest) const
{
- if (!(wxTextAttr::EqPartial(attr)))
+ if (!(wxTextAttr::EqPartial(attr, weakTest)))
return false;
- return m_textBoxAttr.EqPartial(attr.m_textBoxAttr);
+ return m_textBoxAttr.EqPartial(attr.m_textBoxAttr, weakTest);
}
// Merges the given attributes. If compareWith
}
// Partial equality test
-bool wxTextAttrBorder::EqPartial(const wxTextAttrBorder& border) const
+bool wxTextAttrBorder::EqPartial(const wxTextAttrBorder& border, bool weakTest) const
{
- if (border.HasStyle() && !HasStyle() && (border.GetStyle() != GetStyle()))
+ if (!weakTest &&
+ ((!HasStyle() && border.HasStyle()) ||
+ (!HasColour() && border.HasColour()) ||
+ (!HasWidth() && border.HasWidth())))
+ {
+ return false;
+ }
+
+ if (border.HasStyle() && HasStyle() && (border.GetStyle() != GetStyle()))
return false;
- if (border.HasColour() && !HasColour() && (border.GetColourLong() != GetColourLong()))
+ if (border.HasColour() && HasColour() && (border.GetColourLong() != GetColourLong()))
return false;
- if (border.HasWidth() && !HasWidth() && !(border.GetWidth() == GetWidth()))
+ if (border.HasWidth() && HasWidth() && !(border.GetWidth() == GetWidth()))
return false;
return true;
}
// Partial equality test
-bool wxTextAttrBorders::EqPartial(const wxTextAttrBorders& borders) const
+bool wxTextAttrBorders::EqPartial(const wxTextAttrBorders& borders, bool weakTest) const
{
- return m_left.EqPartial(borders.m_left) && m_right.EqPartial(borders.m_right) &&
- m_top.EqPartial(borders.m_top) && m_bottom.EqPartial(borders.m_bottom);
+ return m_left.EqPartial(borders.m_left, weakTest) && m_right.EqPartial(borders.m_right, weakTest) &&
+ m_top.EqPartial(borders.m_top, weakTest) && m_bottom.EqPartial(borders.m_bottom, weakTest);
}
// Apply border to 'this', but not if the same as compareWith
}
// Partial equality test
-bool wxTextAttrDimension::EqPartial(const wxTextAttrDimension& dim) const
+bool wxTextAttrDimension::EqPartial(const wxTextAttrDimension& dim, bool weakTest) const
{
- if (dim.IsPresent() && IsPresent() && !((*this) == dim))
+ if (!weakTest && !IsValid() && dim.IsValid())
+ return false;
+
+ if (dim.IsValid() && IsValid() && !((*this) == dim))
return false;
else
return true;
bool wxTextAttrDimension::Apply(const wxTextAttrDimension& dim, const wxTextAttrDimension* compareWith)
{
- if (dim.IsPresent())
+ if (dim.IsValid())
{
if (!(compareWith && dim == (*compareWith)))
(*this) = dim;
// which attributes are absent in some objects and which clash in some objects.
void wxTextAttrDimension::CollectCommonAttributes(const wxTextAttrDimension& attr, wxTextAttrDimension& clashingAttr, wxTextAttrDimension& absentAttr)
{
- if (attr.IsPresent())
+ if (attr.IsValid())
{
- if (!clashingAttr.IsPresent() && !absentAttr.IsPresent())
+ if (!clashingAttr.IsValid() && !absentAttr.IsValid())
{
- if (IsPresent())
+ if (IsValid())
{
if (!((*this) == attr))
{
- clashingAttr.SetPresent(true);
- SetPresent(false);
+ clashingAttr.SetValid(true);
+ SetValid(false);
}
}
else
}
}
else
- absentAttr.SetPresent(true);
+ absentAttr.SetValid(true);
}
wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(wxDC& dc, double scale, const wxSize& parentSize)
}
// Partial equality test
-bool wxTextAttrDimensions::EqPartial(const wxTextAttrDimensions& dims) const
+bool wxTextAttrDimensions::EqPartial(const wxTextAttrDimensions& dims, bool weakTest) const
{
- if (!m_left.EqPartial(dims.m_left))
+ if (!m_left.EqPartial(dims.m_left, weakTest))
return false;
- if (!m_right.EqPartial(dims.m_right))
+ if (!m_right.EqPartial(dims.m_right, weakTest))
return false;
- if (!m_top.EqPartial(dims.m_top))
+ if (!m_top.EqPartial(dims.m_top, weakTest))
return false;
- if (!m_bottom.EqPartial(dims.m_bottom))
+ if (!m_bottom.EqPartial(dims.m_bottom, weakTest))
return false;
return true;
// Remove specified attributes from this object
bool wxTextAttrDimensions::RemoveStyle(const wxTextAttrDimensions& attr)
{
- if (attr.m_left.IsPresent())
+ if (attr.m_left.IsValid())
m_left.Reset();
- if (attr.m_right.IsPresent())
+ if (attr.m_right.IsValid())
m_right.Reset();
- if (attr.m_top.IsPresent())
+ if (attr.m_top.IsValid())
m_top.Reset();
- if (attr.m_bottom.IsPresent())
+ if (attr.m_bottom.IsValid())
m_bottom.Reset();
return true;
m_bottom.CollectCommonAttributes(attr.m_bottom, clashingAttr.m_bottom, absentAttr.m_bottom);
}
+// Partial equality test
+bool wxTextAttrSize::EqPartial(const wxTextAttrSize& size, bool weakTest) const
+{
+ if (!m_width.EqPartial(size.m_width, weakTest))
+ return false;
+
+ if (!m_height.EqPartial(size.m_height, weakTest))
+ return false;
+
+ return true;
+}
+
+// Apply border to 'this', but not if the same as compareWith
+bool wxTextAttrSize::Apply(const wxTextAttrSize& size, const wxTextAttrSize* compareWith)
+{
+ m_width.Apply(size.m_width, compareWith ? (& compareWith->m_width) : (const wxTextAttrDimension*) NULL);
+ m_height.Apply(size.m_height, compareWith ? (& compareWith->m_height): (const wxTextAttrDimension*) NULL);
+
+ return true;
+}
+
+// Remove specified attributes from this object
+bool wxTextAttrSize::RemoveStyle(const wxTextAttrSize& attr)
+{
+ if (attr.m_width.IsValid())
+ m_width.Reset();
+ if (attr.m_height.IsValid())
+ m_height.Reset();
+
+ return true;
+}
+
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextAttrSize::CollectCommonAttributes(const wxTextAttrSize& attr, wxTextAttrSize& clashingAttr, wxTextAttrSize& absentAttr)
+{
+ m_width.CollectCommonAttributes(attr.m_width, clashingAttr.m_width, absentAttr.m_width);
+ m_height.CollectCommonAttributes(attr.m_height, clashingAttr.m_height, absentAttr.m_height);
+}
+
// Collects the attributes that are common to a range of content, building up a note of
// which attributes are absent in some objects and which clash in some objects.
void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr)
if (attr.HasFont())
{
- if (attr.HasFontSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_SIZE))
+ // If different font size units are being used, this is a clash.
+ if (((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) | (currentStyle.GetFlags() & wxTEXT_ATTR_FONT_SIZE)) == wxTEXT_ATTR_FONT_SIZE)
+ {
+ currentStyle.SetFontSize(0);
+ currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_SIZE);
+ clashingAttr.AddFlag(wxTEXT_ATTR_FONT_SIZE);
+ }
+ else
{
- if (currentStyle.HasFontSize())
+ if (attr.HasFontPointSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_POINT_SIZE))
{
- if (currentStyle.GetFontSize() != attr.GetFontSize())
+ if (currentStyle.HasFontPointSize())
{
- // Clash of attr - mark as such
- clashingAttr.AddFlag(wxTEXT_ATTR_FONT_SIZE);
- currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_SIZE);
+ if (currentStyle.GetFontSize() != attr.GetFontSize())
+ {
+ // Clash of attr - mark as such
+ clashingAttr.AddFlag(wxTEXT_ATTR_FONT_POINT_SIZE);
+ currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_POINT_SIZE);
+ }
}
+ else
+ currentStyle.SetFontSize(attr.GetFontSize());
+ }
+
+ if (attr.HasFontPixelSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_PIXEL_SIZE))
+ {
+ if (currentStyle.HasFontPixelSize())
+ {
+ if (currentStyle.GetFontSize() != attr.GetFontSize())
+ {
+ // Clash of attr - mark as such
+ clashingAttr.AddFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE);
+ currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE);
+ }
+ }
+ else
+ currentStyle.SetFontPixelSize(attr.GetFontSize());
}
- else
- currentStyle.SetFontSize(attr.GetFontSize());
}
if (attr.HasFontItalic() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_ITALIC))
else
currentStyle.SetFontUnderlined(attr.GetFontUnderlined());
}
+
+ if (attr.HasFontStrikethrough() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_STRIKETHROUGH))
+ {
+ if (currentStyle.HasFontStrikethrough())
+ {
+ if (currentStyle.GetFontStrikethrough() != attr.GetFontStrikethrough())
+ {
+ // Clash of attr - mark as such
+ clashingAttr.AddFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH);
+ currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH);
+ }
+ }
+ else
+ currentStyle.SetFontStrikethrough(attr.GetFontStrikethrough());
+ }
}
if (attr.HasTextColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_TEXT_COLOUR))
return -1;
}
+bool wxRichTextProperties::Remove(const wxString& name)
+{
+ int idx = Find(name);
+ if (idx != -1)
+ {
+ m_properties.RemoveAt(idx);
+ return true;
+ }
+ else
+ return false;
+}
+
wxVariant* wxRichTextProperties::FindOrCreateProperty(const wxString& name)
{
int idx = Find(name);
SetProperty(name, wxVariant(value, name));
}
+void wxRichTextProperties::RemoveProperties(const wxRichTextProperties& properties)
+{
+ size_t i;
+ for (i = 0; i < properties.GetCount(); i++)
+ {
+ wxString name = properties.GetProperties()[i].GetName();
+ if (HasProperty(name))
+ Remove(name);
+ }
+}
+
+void wxRichTextProperties::MergeProperties(const wxRichTextProperties& properties)
+{
+ size_t i;
+ for (i = 0; i < properties.GetCount(); i++)
+ {
+ SetProperty(properties.GetProperties()[i]);
+ }
+}
+
+wxRichTextObject* wxRichTextObjectAddress::GetObject(wxRichTextParagraphLayoutBox* topLevelContainer) const
+{
+ if (m_address.GetCount() == 0)
+ return topLevelContainer;
+
+ wxRichTextCompositeObject* p = topLevelContainer;
+ size_t i = 0;
+ while (p && i < m_address.GetCount())
+ {
+ int pos = m_address[i];
+ wxASSERT(pos >= 0 && pos < (int) p->GetChildren().GetCount());
+ if (pos < 0 || pos >= (int) p->GetChildren().GetCount())
+ return NULL;
+
+ wxRichTextObject* p1 = p->GetChild(pos);
+ if (i == (m_address.GetCount()-1))
+ return p1;
+
+ p = wxDynamicCast(p1, wxRichTextCompositeObject);
+ i ++;
+ }
+ return NULL;
+}
+
+bool wxRichTextObjectAddress::Create(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj)
+{
+ m_address.Clear();
+
+ if (topLevelContainer == obj)
+ return true;
+
+ wxRichTextObject* o = obj;
+ while (o)
+ {
+ wxRichTextCompositeObject* p = wxDynamicCast(o->GetParent(), wxRichTextCompositeObject);
+ if (!p)
+ return false;
+
+ int pos = p->GetChildren().IndexOf(o);
+ if (pos == -1)
+ return false;
+
+ m_address.Insert(pos, 0);
+
+ if (p == topLevelContainer)
+ return true;
+
+ o = p;
+ }
+ return false;
+}
+
+// Equality test
+bool wxRichTextSelection::operator==(const wxRichTextSelection& sel) const
+{
+ if (m_container != sel.m_container)
+ return false;
+ if (m_ranges.GetCount() != sel.m_ranges.GetCount())
+ return false;
+ size_t i;
+ for (i = 0; i < m_ranges.GetCount(); i++)
+ if (!(m_ranges[i] == sel.m_ranges[i]))
+ return false;
+ return true;
+}
+
+// Get the selections appropriate to the specified object, if any; returns wxRICHTEXT_NO_SELECTION if none
+// or none at the level of the object's container.
+wxRichTextRangeArray wxRichTextSelection::GetSelectionForObject(wxRichTextObject* obj) const
+{
+ if (IsValid())
+ {
+ wxRichTextParagraphLayoutBox* container = obj->GetParentContainer();
+
+ if (container == m_container)
+ return m_ranges;
+
+ container = obj->GetContainer();
+ while (container)
+ {
+ if (container->GetParent())
+ {
+ // If we found that our object's container is within the range of
+ // a selection higher up, then assume the whole original object
+ // is also selected.
+ wxRichTextParagraphLayoutBox* parentContainer = container->GetParentContainer();
+ if (parentContainer == m_container)
+ {
+ if (WithinSelection(container->GetRange().GetStart(), m_ranges))
+ {
+ wxRichTextRangeArray ranges;
+ ranges.Add(obj->GetRange());
+ return ranges;
+ }
+ }
+
+ container = parentContainer;
+ }
+ else
+ {
+ container = NULL;
+ break;
+ }
+ }
+ }
+ return wxRichTextRangeArray();
+}
+
+// Is the given position within the selection?
+bool wxRichTextSelection::WithinSelection(long pos, wxRichTextObject* obj) const
+{
+ if (!IsValid())
+ return false;
+ else
+ {
+ wxRichTextRangeArray selectionRanges = GetSelectionForObject(obj);
+ return WithinSelection(pos, selectionRanges);
+ }
+}
+
+// Is the given position within the selection range?
+bool wxRichTextSelection::WithinSelection(long pos, const wxRichTextRangeArray& ranges)
+{
+ size_t i;
+ for (i = 0; i < ranges.GetCount(); i++)
+ {
+ const wxRichTextRange& range = ranges[i];
+ if (pos >= range.GetStart() && pos <= range.GetEnd())
+ return true;
+ }
+ return false;
+}
+
+// Is the given range completely within the selection range?
+bool wxRichTextSelection::WithinSelection(const wxRichTextRange& range, const wxRichTextRangeArray& ranges)
+{
+ size_t i;
+ for (i = 0; i < ranges.GetCount(); i++)
+ {
+ const wxRichTextRange& eachRange = ranges[i];
+ if (range.IsWithin(eachRange))
+ return true;
+ }
+ return false;
+}
+
+IMPLEMENT_CLASS(wxRichTextDrawingHandler, wxObject)
+IMPLEMENT_CLASS(wxRichTextDrawingContext, wxObject)
+
+bool wxRichTextDrawingContext::HasVirtualAttributes(wxRichTextObject* obj) const
+{
+ wxList::compatibility_iterator node = m_buffer->GetDrawingHandlers().GetFirst();
+ while (node)
+ {
+ wxRichTextDrawingHandler *handler = (wxRichTextDrawingHandler*)node->GetData();
+ if (handler->HasVirtualAttributes(obj))
+ return true;
+
+ node = node->GetNext();
+ }
+ return false;
+}
+
+wxRichTextAttr wxRichTextDrawingContext::GetVirtualAttributes(wxRichTextObject* obj) const
+{
+ wxRichTextAttr attr;
+ // We apply all handlers, so we can may combine several different attributes
+ wxList::compatibility_iterator node = m_buffer->GetDrawingHandlers().GetFirst();
+ while (node)
+ {
+ wxRichTextDrawingHandler *handler = (wxRichTextDrawingHandler*)node->GetData();
+ if (handler->HasVirtualAttributes(obj))
+ {
+ bool success = handler->GetVirtualAttributes(attr, obj);
+ wxASSERT(success);
+ wxUnusedVar(success);
+ }
+
+ node = node->GetNext();
+ }
+ return attr;
+}
+
+bool wxRichTextDrawingContext::ApplyVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const
+{
+ if (HasVirtualAttributes(obj))
+ {
+ wxRichTextAttr a(GetVirtualAttributes(obj));
+ attr.Apply(a);
+ return true;
+ }
+ else
+ return false;
+}
+
+/// Adds a handler to the end
+void wxRichTextBuffer::AddDrawingHandler(wxRichTextDrawingHandler *handler)
+{
+ sm_drawingHandlers.Append(handler);
+}
+
+/// Inserts a handler at the front
+void wxRichTextBuffer::InsertDrawingHandler(wxRichTextDrawingHandler *handler)
+{
+ sm_drawingHandlers.Insert( handler );
+}
+
+/// Removes a handler
+bool wxRichTextBuffer::RemoveDrawingHandler(const wxString& name)
+{
+ wxRichTextDrawingHandler *handler = FindDrawingHandler(name);
+ if (handler)
+ {
+ sm_drawingHandlers.DeleteObject(handler);
+ delete handler;
+ return true;
+ }
+ else
+ return false;
+}
+
+wxRichTextDrawingHandler* wxRichTextBuffer::FindDrawingHandler(const wxString& name)
+{
+ wxList::compatibility_iterator node = sm_drawingHandlers.GetFirst();
+ while (node)
+ {
+ wxRichTextDrawingHandler *handler = (wxRichTextDrawingHandler*)node->GetData();
+ if (handler->GetName().Lower() == name.Lower()) return handler;
+
+ node = node->GetNext();
+ }
+ return NULL;
+}
+
+void wxRichTextBuffer::CleanUpDrawingHandlers()
+{
+ wxList::compatibility_iterator node = sm_drawingHandlers.GetFirst();
+ while (node)
+ {
+ wxRichTextDrawingHandler* handler = (wxRichTextDrawingHandler*)node->GetData();
+ wxList::compatibility_iterator next = node->GetNext();
+ delete handler;
+ node = next;
+ }
+
+ sm_drawingHandlers.Clear();
+}
+
+void wxRichTextBuffer::AddFieldType(wxRichTextFieldType *fieldType)
+{
+ sm_fieldTypes[fieldType->GetName()] = fieldType;
+}
+
+bool wxRichTextBuffer::RemoveFieldType(const wxString& name)
+{
+ wxRichTextFieldTypeHashMap::iterator it = sm_fieldTypes.find(name);
+ if (it == sm_fieldTypes.end())
+ return false;
+ else
+ {
+ wxRichTextFieldType* fieldType = it->second;
+ sm_fieldTypes.erase(it);
+ delete fieldType;
+ return true;
+ }
+}
+
+wxRichTextFieldType *wxRichTextBuffer::FindFieldType(const wxString& name)
+{
+ wxRichTextFieldTypeHashMap::iterator it = sm_fieldTypes.find(name);
+ if (it == sm_fieldTypes.end())
+ return NULL;
+ else
+ return it->second;
+}
+
+void wxRichTextBuffer::CleanUpFieldTypes()
+{
+ wxRichTextFieldTypeHashMap::iterator it;
+ for( it = sm_fieldTypes.begin(); it != sm_fieldTypes.end(); ++it )
+ {
+ wxRichTextFieldType* fieldType = it->second;
+ delete fieldType;
+ }
+
+ sm_fieldTypes.clear();
+}
+
#endif
// wxUSE_RICHTEXT
projects / wxWidgets.git / blobdiff