AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrections to HasCharacterAttributes, HasParagraphAttributes

Browse Source 
EditProperties functions don't try to change read-only content
Page up/down behaviour now takes into account margins and scale
Transparency and y poition corrections to field labels


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2014-10-08 10:29:01 +00:00
parent e762c4ce83
commit 8c56462500
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/richtext/richtextbuffer.cpp
View File

@ -1537,7 +1537,10 @@ wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range
wxRichTextRange childRange = range;
if (!child->GetRange().IsOutside(range))
{
childRange.LimitTo(child->GetRange());
if (child->IsTopLevel())
childRange = child->GetOwnRange();
else
childRange.LimitTo(child->GetRange());
wxString childText = child->GetTextForRange(childRange);
@ -3277,7 +3280,10 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
if (!child->GetRange().IsOutside(range))
{
wxRichTextRange childRange = range;
childRange.LimitTo(child->GetRange());
if (child->IsTopLevel())
childRange = child->GetOwnRange();
else
childRange.LimitTo(child->GetRange());
wxString childText = child->GetTextForRange(childRange);
@ -3807,6 +3813,7 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
{
foundCount ++;
wxRichTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes());
textAttr.SetFlags(textAttr.GetFlags() & ~wxTEXT_ATTR_PARAGRAPH);
if (textAttr.EqPartial(style, false /* strong test - attributes must be valid in both objects */))
matchingCount ++;
@ -3850,6 +3857,12 @@ bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange&
// Apply the paragraph style
wxRichTextApplyStyle(textAttr, para->GetAttributes());
// These flags can mess up EqPartial because they don't represent existence of the attributes,
// only the attributes.
int flags = wxTEXT_ATTR_AVOID_PAGE_BREAK_BEFORE|wxTEXT_ATTR_AVOID_PAGE_BREAK_AFTER|wxTEXT_ATTR_PAGE_BREAK;
int theseFlags = (textAttr.GetFlags() & ~flags) | (textAttr.GetFlags() & flags & style.GetFlags());
textAttr.SetFlags(theseFlags);
foundCount ++;
if (textAttr.EqPartial(style, false /* strong test */))
matchingCount ++;
@ -9201,7 +9214,7 @@ bool wxRichTextBox::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
wxRichTextObjectPropertiesDialog boxDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Box Properties"));
boxDlg.SetAttributes(GetAttributes());
if (boxDlg.ShowModal() == wxID_OK)
if (boxDlg.ShowModal() == wxID_OK && buffer->GetRichTextCtrl()->IsEditable())
{
// By passing wxRICHTEXT_SETSTYLE_RESET, indeterminate attributes set by the user will be set as
// indeterminate in the object.
@ -9477,10 +9490,11 @@ bool wxRichTextFieldTypeStandard::Draw(wxRichTextField* obj, wxDC& dc, wxRichTex
int w, h, maxDescent;
dc.SetFont(m_font);
dc.GetTextExtent(m_label, & w, &h, & maxDescent);
dc.SetBackgroundMode(wxTRANSPARENT);
dc.SetTextForeground(textColour);
int x = clientArea.x + (clientArea.width - w)/2;
int y = clientArea.y + (clientArea.height - (h - maxDescent))/2;
int y = clientArea.y + (clientArea.height - h)/2;
dc.DrawText(m_label, x, y);
}
}
@ -9794,7 +9808,7 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
wxRichTextSizePage::ShowPositionControls(true);
wxRichTextSizePage::ShowFloatingControls(true);
if (ok)
if (ok && buffer->GetRichTextCtrl()->IsEditable())
{
wxRichTextAttr newAttr = cellDlg.GetAttributes();
if (!(newAttr == attr))
@ -12635,7 +12649,7 @@ bool wxRichTextImage::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
wxRichTextObjectPropertiesDialog imageDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Picture Properties"));
imageDlg.SetAttributes(GetAttributes());
if (imageDlg.ShowModal() == wxID_OK)
if (imageDlg.ShowModal() == wxID_OK && buffer->GetRichTextCtrl()->IsEditable())
{
// By passing wxRICHTEXT_SETSTYLE_RESET, indeterminate attributes set by the user will be set as
// indeterminate in the object.

5
src/richtext/richtextctrl.cpp
View File

@ -2639,7 +2639,10 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
if (line)
{
wxSize clientSize = GetClientSize();
int newY = line->GetAbsolutePosition().y + noPages*clientSize.y;
int topMargin = GetBuffer().GetTopMargin();
int bottomMargin = GetBuffer().GetBottomMargin();
int height = int( 0.5 + ((clientSize.y - topMargin - bottomMargin) / GetScale()));
int newY = line->GetAbsolutePosition().y + noPages*height;
wxRichTextLine* newLine = GetFocusObject()->GetLineAtYPosition(newY);
if (newLine)