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

RichText: RichTextLayoutTracer added npy parameter to TableCell

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1655 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-10-25 17:58:33 +00:00
parent 91f7073523
commit 7f7c10aaac
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlLib/TabCtrl.cpp
View file

@ -136,6 +136,7 @@ void TabCtrl::Layout()
if(tab.GetCount() && tab.Top().Right() < TabsRight())
x0 = 0;
SyncHot();
if(sel < tab.GetCount())
ScrollInto(sel);
pane.VSizePos(style->tabheight + style->edge.top, style->edge.bottom)
.HSizePos(style->edge.left, style->edge.right);

2
uppsrc/RichText/RichText.h
View file

@ -105,7 +105,7 @@ struct RichTextLayoutTracer {
virtual void EndTable(PageY y);
virtual void TableRow(const Rect& page, PageY y, int i, const RichTable& table);
virtual void EndTableRow(PageY y);
virtual void TableCell(const Rect& page, PageY y, int i, int j, const RichTable& table);
virtual void TableCell(const Rect& page, PageY y, int i, int j, const RichTable& table, PageY ny);
virtual void EndTableCell(PageY y);
};

2
uppsrc/RichText/TablePaint.cpp
View file

@ -75,7 +75,7 @@ bool RichTable::RowPaint(PageDraw& pw, const RichStyles& st, const Layout& tab,
}
if(paint) {
if(pw.tracer)
pw.tracer->TableCell(rc.page, rc.py, i, j, *this);
pw.tracer->TableCell(rc.page, rc.py, i, j, *this, pyy);
row[j].Paint(pw, rc, pyy, xpg, y, ny, pi,
sel && j >= pi.cells.left && i >= pi.cells.top &&
j + cell.hspan <= pi.cells.right && i + cell.vspan <= pi.cells.bottom);

2
uppsrc/RichText/TextData.cpp
View file

@ -344,7 +344,7 @@ void RichTextLayoutTracer::Table(const Rect& page, PageY y, const RichTable& tab
void RichTextLayoutTracer::EndTable(PageY y) {}
void RichTextLayoutTracer::TableRow(const Rect& page, PageY y, int i, const RichTable& table) {}
void RichTextLayoutTracer::EndTableRow(PageY y) {}
void RichTextLayoutTracer::TableCell(const Rect& page, PageY y, int i, int j, const RichTable& table) {}
void RichTextLayoutTracer::TableCell(const Rect& page, PageY y, int i, int j, const RichTable& table, PageY npy) {}
void RichTextLayoutTracer::EndTableCell(PageY y) {}
END_UPP_NAMESPACE