github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Changed RichText/RichEdit apply-style operation

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@503 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-10-02 15:25:38 +00:00
parent 1622fd8518
commit ff1ec91efb
7 changed files with 90 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uppsrc/RichText/TxtOp.cpp
View file

@ -147,8 +147,20 @@ void RichTxt::CombineFormat(FormatInfo& fi, int pi, int pi2, bool& first, const
}
}
void RichTxt::Apply(const RichText::FormatInfo& fi, RichPara& pa)
void RichTxt::ApplyStyle(const RichText::FormatInfo& fi, RichPara& pa, const RichStyles& style)
{
if(fi.paravalid & STYLE) {
int q = style.Find(fi.styleid);
if(q >= 0) {
pa.ApplyStyle(style[q].format);
pa.format.styleid = fi.styleid;
}
}
}
void RichTxt::Apply(const RichText::FormatInfo& fi, RichPara& pa, const RichStyles& style)
{
ApplyStyle(fi, pa, style);
for(int i = 0; i < pa.GetCount(); i++)
fi.ApplyTo(pa[i].format);
fi.ApplyTo(pa.format);
@ -173,7 +185,7 @@ void RichTxt::ApplyFormat(const FormatInfo& fi, int pi, int pi2, const RichStyle
pa = RichTxt::Get(pi, fi.styleid, style);
else
pa = Get(pi, style);
Apply(fi, pa);
Apply(fi, pa, style);
Put(pi, pa, style);
}
pi++;