github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Fixing RichEdit

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@534 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-10-14 22:11:50 +00:00
parent 8d5b468bee
commit 6e1e5a6d28
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uppsrc/RichEdit/Modify.cpp
View file

@ -79,14 +79,14 @@ void RichEdit::Remove(int pos, int len, bool joinnext)
if(InvalidRange(pos, pos + len))
return;
AddUndo(new UndoRemove(text, pos, len));
RichText::FormatInfo fmt;
RichPara::Format f = text.GetRichPos(pos).format;
if(joinnext)
fmt.Set(f);
// RichText::FormatInfo fmt;
// RichPara::Format f = text.GetRichPos(pos).format;
// if(joinnext)
// fmt.Set(f);
text.Remove(pos, len);
if(!joinnext)
fmt.Set(text.GetRichPos(pos).format);
fmt.newpage = f.newpage;
// if(!joinnext)
// fmt.Set(text.GetRichPos(pos).format);
// fmt.newpage = f.newpage;
SetModify();
modified = true;
}

6
uppsrc/RichText/TextData.cpp
View file

@ -86,13 +86,13 @@ void RichText::Remove(int pos, int count)
txt.Put(pi, pa, style);
}
else {
RichPara pa2 = txt.Get(pi2, style);
RichPara pa = txt.Get(pi, pa2.format.styleid, style);
RichPara pa = txt.Get(pi, style);
RichPara pa2 = txt.Get(pi2, pa.format.styleid, style);
txt.part.Remove(pi, pi2 - pi);
pa.Trim(pos);
pa2.Mid(pos2);
pa.Append(pa2);
pa.format = pa2.format;
pa2.format = pa.format;
txt.Put(pi, pa, style);
txt.SetRefreshFrom(pi);
}