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 newpage now allowed in level>0

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10089 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-07-21 19:15:29 +00:00
parent 41a2085483
commit e778c4bcef
4 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/RichEdit/FormatDlg.cpp
View file

@ -85,7 +85,6 @@ void ParaFormatting::SyncHdrFtr()
void ParaFormatting::Set(int unit, const RichText::FormatInfo& formatinfo, bool baselevel)
{
page.Enable(baselevel);
newhdrftr.Enable(baselevel);
hdrftr.Enable(baselevel);
font = formatinfo;

1
uppsrc/RichEdit/Table.cpp
View file

@ -149,7 +149,6 @@ void RichEdit::TableProps()
dlg.footer_qtf = fmt.footer_qtf;
r(dlg.gridcolor, fmt.gridcolor);
dlg.SyncHdrFtr();
dlg.newpage.Enable(cursorp.level == 1);
dlg.newhdrftr.Enable(cursorp.level == 1);
dlg.hdrftr.Enable(cursorp.level == 1);
for(;;) {

2
uppsrc/RichText/ParaPaint.cpp
View file

@ -402,7 +402,7 @@ void RichPara::Paint(PageDraw& pw, const Rect& page, PageY py, const PaintInfo&
pw.Page(py.page).DrawImage(z * x, z * y0 - sz.cy,
RichTextImg::EndParaChar(),
format.indexentry.GetCount() ? pi.indexentry : pi.showcodes);
if((format.newpage || format.newhdrftr) && !IsNull(pi.showcodes) && baselevel) {
if((format.newpage || format.newhdrftr && baselevel) && !IsNull(pi.showcodes)) {
Draw& w = pw.Page(opy.page);
int wd = z * page.right - z * page.left;
int step = w.Pixels() ? 8 : 50;

16
uppsrc/RichText/TxtPaint.cpp
View file

@ -76,15 +76,13 @@ void RichTxt::Advance(int parti, RichContext& rc, RichContext& begin) const
{
if(part[parti].Is<RichTable>()) {
const RichTable& tab = GetTable(parti);
if(rc.text == this) {
if(tab.format.newhdrftr) {
rc.NewHeaderFooter(~tab.header, ~tab.footer);
rc.Page();
}
else
if(tab.format.newpage)
rc.Page();
if(tab.format.newhdrftr && rc.text == this) {
rc.NewHeaderFooter(~tab.header, ~tab.footer);
rc.Page();
}
else
if(tab.format.newpage)
rc.Page();
begin = rc;
rc.py = GetTable(parti).GetHeight(rc);
}
@ -110,7 +108,7 @@ void RichTxt::Advance(int parti, RichContext& rc, RichContext& begin) const
rc.Page();
}
else
if(pp.newpage && rc.text == this || rc.py.y + cy + nbefore + nline > rc.page.bottom && cy < rc.page.Height())
if(pp.newpage || rc.py.y + cy + nbefore + nline > rc.page.bottom && cy < rc.page.Height())
rc.Page();
begin = rc;
rc.py.y += pp.before + pp.ruler;