root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.1 086

Browse Source 
Files correlati     : ve1.exe
Ricompilazione Demo : [ ]
Commento            :
Il MESSAGE _ALIGN,<ID Campo>,BOTTOM non funziona più.

Codice : AO21021


git-svn-id: svn://10.65.10.50/trunk@12239 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2004-07-09 13:06:38 +00:00
parent 1e5d71ff9b
commit 206234636c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/report.cpp
View File

@ -927,10 +927,10 @@ bool TReport_field::dynamic_height() const
const TRectangle& TReport_field::get_draw_rect() const
{
TRectangle& rct = ((TReport_field*)this)->_draw_rct;
if (dynamic_height())
{
TRectangle& rct = ((TReport_field*)this)->_draw_rct;
rct = _rct;
// rct = _rct;
int h = 100;
TParagraph_string str(formatted_text(), rct.width()/100);
@ -942,9 +942,9 @@ const TRectangle& TReport_field::get_draw_rect() const
if (h > _rct.height())
h = _rct.height();
rct.set_height(h);
return rct;
// return rct;
}
return _rct;
return rct;
}
const TReport_font& TReport_field::font() const
@ -2082,7 +2082,8 @@ bool TReport::do_message(const TVariant& var, FLDMSG_FUNC msg, void* jolly)
case 4: // E' un gruppo
{
TReport_section& sec = section(type, level);
for (int i = 0; i < sec.items(); i++)
const int items = sec.items();
for (int i = 0; i < items; i++)
{
TReport_field& rf = sec.field(i);
if (rf.in_group(id))

3
include/reprint.cpp
View File

@ -1722,7 +1722,8 @@ bool TReport_book::add(TReport& rep, bool progind)
TReport_section* fl = _report->find_section('F',1);
if (fl != NULL) // Gestione footer last (se esite)
{
const int fy = fl->pos().y;
const TReport_section& fp = _report->section('F',0);
const int fy = fp.pos().y;
if (fy > 0) // Ha una coordinata y imposta
{
if (fy < _delta.y) // Sono gia' andato oltre quindi salto pagina