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

RichText: Header/Footer can be changed by paragraph/table

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10084 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-07-21 05:45:44 +00:00
parent d65073ef29
commit 4b1727cab9
25 changed files with 506 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

30
uppsrc/RichText/TextPaint.cpp
View file

@ -2,16 +2,6 @@
NAMESPACE_UPP
RichContext RichText::Context(const Rect& page, PageY py) const
{
RichContext c(style);
c.page = GetPageMinusHeaderFooter(page);
c.py = py;
if(py.y < c.page.top)
c.py.y = c.page.top;
return c;
}
PageY RichText::GetHeight(const Rect& page) const
{
return RichTxt::GetHeight(Context(page, PageY(0, 0)));
@ -114,13 +104,23 @@ bool RichText::GetInvalid(PageY& top, PageY& bottom, const Rect& page,
bottom = GetHeight(page);
return true;
}
#if 0
RichContext rc = Context(page, PageY(0, 0));
if(rtype == SPARA) {
rc.py = top = GetPartPageY(spi, rc);
bottom = GetNextPageY(spi, rc);
return true;
}
rc.py = top = GetPartPageY(r_parti, rc);
#endif
RichContext begin;
if(rtype == SPARA) { // selection changed within single paragraph
RichContext rc = GetPartContext(spi, Context(page));
top = rc.py;
bottom = GetAdvanced(spi, rc, begin).py;
return true;
}
RichContext rc = GetPartContext(r_parti, Context(page));
top = rc.py;
if(rtype == PARA) {
if(IsTable(r_parti))
switch(GetTable(r_parti).GetInvalid(top, bottom, rc)) {
@ -135,11 +135,11 @@ bool RichText::GetInvalid(PageY& top, PageY& bottom, const Rect& page,
const Para& pp = part[r_parti].Get<Para>();
if(r_paraocx == pp.ccx &&
r_paraocy == Sum(pp.linecy, 0) + pp.ruler + pp.before + pp.after &&
r_keep == pp.keep &&
r_keepnext == pp.keepnext &&
r_keep == pp.keep &&
r_keepnext == pp.keepnext &&
r_newpage == pp.newpage) {
bottom = GetNextPageY(r_parti, rc);
return true;
bottom = GetAdvanced(r_parti, rc, begin).py;
return true;
}
}
}