Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Setting the current style from the UI is a mode that is cancelled when moving away

Browse Source 
from the current caret position. This must be done to avoid confusing default
attributes and attributes at the current caret position, in normal use.
Style feedback now correct when caret is at the start of a paragraph (don't use
previous paragraph's style), and out-by-one style feedback bug fixed (start/end
of styled content).
Added ApplyStyle for applying a character or paragraph style.
Some coding style cleanup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-09-12 08:42:40 +00:00
parent 720a0aab26
commit ab14c7aa57
4 changed files with 157 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/richtext/richtextctrl.cpp
View File

@@ -19,6 +19,7 @@
#if wxUSE_RICHTEXT
#include "wx/richtext/richtextctrl.h"
#include "wx/richtext/richtextstyles.h"
#ifndef WX_PRECOMP
#include "wx/settings.h"
@@ -186,6 +187,7 @@ void wxRichTextCtrl::Init()
m_fullLayoutTime = 0;
m_fullLayoutSavedPosition = 0;
m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;
m_caretPositionForDefaultStyle = -2;
}
/// Call Freeze to prevent refresh
@@ -212,6 +214,7 @@ void wxRichTextCtrl::Clear()
m_buffer.Reset();
m_buffer.SetDirty(true);
m_caretPosition = -1;
m_caretPositionForDefaultStyle = -2;
m_caretAtLineStart = false;
m_selectionRange.SetRange(-2, -2);
@@ -1428,6 +1431,15 @@ void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
ShowPosition(m_fullLayoutSavedPosition);
Refresh(false);
}
if (m_caretPositionForDefaultStyle != -2)
{
// If the caret position has changed, no longer reflect the default style
// in the UI.
if (GetCaretPosition() != m_caretPositionForDefaultStyle)
m_caretPositionForDefaultStyle = -2;
}
event.Skip();
}
@@ -1968,6 +1980,7 @@ void wxRichTextCtrl::MarkDirty()
void wxRichTextCtrl::DiscardEdits()
{
m_caretPositionForDefaultStyle = -2;
m_buffer.Modify(false);
m_buffer.GetCommandProcessor()->ClearCommands();
}
@@ -2420,9 +2433,12 @@ bool wxRichTextCtrl::IsSelectionBold() const
// to see what the effect would be if we started typing.
wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
if (GetStyle(GetCaretPosition()+1, attr))
long pos = GetAdjustedCaretPosition(GetCaretPosition());
if (GetStyle(pos, attr))
{
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
return attr.GetFontWeight() == wxBOLD;
}
}
@@ -2447,9 +2463,12 @@ bool wxRichTextCtrl::IsSelectionItalics() const
// to see what the effect would be if we started typing.
wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
if (GetStyle(GetCaretPosition()+1, attr))
long pos = GetAdjustedCaretPosition(GetCaretPosition());
if (GetStyle(pos, attr))
{
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
return attr.GetFontStyle() == wxITALIC;
}
}
@@ -2474,9 +2493,12 @@ bool wxRichTextCtrl::IsSelectionUnderlined() const
// to see what the effect would be if we started typing.
wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
if (GetStyle(GetCaretPosition()+1, attr))
long pos = GetAdjustedCaretPosition(GetCaretPosition());
if (GetStyle(pos, attr))
{
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
return attr.GetFontUnderlined();
}
}
@@ -2493,7 +2515,7 @@ bool wxRichTextCtrl::ApplyBoldToSelection()
if (HasSelection())
return SetStyle(GetSelectionRange(), attr);
else
SetDefaultStyle(attr);
SetAndShowDefaultStyle(attr);
return true;
}
@@ -2507,7 +2529,7 @@ bool wxRichTextCtrl::ApplyItalicToSelection()
if (HasSelection())
return SetStyle(GetSelectionRange(), attr);
else
SetDefaultStyle(attr);
SetAndShowDefaultStyle(attr);
return true;
}
@@ -2521,7 +2543,7 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection()
if (HasSelection())
return SetStyle(GetSelectionRange(), attr);
else
SetDefaultStyle(attr);
SetAndShowDefaultStyle(attr);
return true;
}
@@ -2562,13 +2584,35 @@ bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
return true;
}
/// Apply a named style to the selection
void wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
{
// Flags are defined within each definition, so only certain
// attributes are applied.
wxRichTextAttr attr(def->GetStyle());
// Make sure the attr has the style name
if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
attr.SetParagraphStyleName(def->GetName());
else
attr.SetCharacterStyleName(def->GetName());
if (HasSelection())
SetStyle(GetSelectionRange(), attr);
else
SetAndShowDefaultStyle(attr);
}
/// Sets the default style to the style under the cursor
bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
{
wxTextAttrEx attr;
attr.SetFlags(wxTEXT_ATTR_CHARACTER);
if (GetStyle(GetCaretPosition(), attr))
// If at the start of a paragraph, use the next position.
long pos = GetAdjustedCaretPosition(GetCaretPosition());
if (GetStyle(pos, attr))
{
SetDefaultStyle(attr);
return true;
@@ -2587,5 +2631,17 @@ long wxRichTextCtrl::GetFirstVisiblePosition() const
return 0;
}
/// The adjusted caret position is the character position adjusted to take
/// into account whether we're at the start of a paragraph, in which case
/// style information should be taken from the next position, not current one.
long wxRichTextCtrl::GetAdjustedCaretPosition(long caretPos) const
{
wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPos+1);
if (para && (caretPos+1 == para->GetRange().GetStart()))
caretPos ++;
return caretPos;
}
#endif
// wxUSE_RICHTEXT