fix display of top labels

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10458 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-09-19 10:18:37 +00:00
parent dea6e50734
commit cf182ead75
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2005-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* rowpainter.C (paintFirst): use a 'labeladdon' for TOP_* labels,
as is already done for "chapter".
2005-09-16 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxfunc.C (dispatch): LFUN_TEXTCLASS_APPLY: actually set the

View File

@ -489,9 +489,7 @@ void RowPainter::paintFirst()
} else {
spacing_val = buffer.params().spacing().getValue();
}
#ifdef WITH_WARNINGS
#warning Look is this correct?
#endif
int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
int const maxdesc = int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val)
@ -531,6 +529,8 @@ void RowPainter::paintFirst()
else
spacing_val = buffer.params().spacing().getValue();
int const labeladdon = int(font_metrics::maxHeight(font) * layout->spacing.getValue() * spacing_val);
int maxdesc =
int(font_metrics::maxDescent(font) * layout->spacing.getValue() * spacing_val
+ (layout->labelbottomsep * defaultRowHeight()));
@ -544,7 +544,7 @@ void RowPainter::paintFirst()
x = width_ - leftMargin() -
font_metrics::width(str, font);
}
pain_.text(int(x), yo_ - maxdesc, str, font);
pain_.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
}
}