anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make code more readable (to me). No change in behaviour (intended).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35296 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2010-09-06 10:56:27 +00:00
parent 4f45a35918
commit 4fb23cc217
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/rowpainter.cpp
View File

@ -476,29 +476,28 @@ int RowPainter::paintAppendixStart(int y)
void RowPainter::paintFirst()
{
ParagraphParameters const & parparams = par_.params();
ParagraphParameters const & pparams = par_.params();
Buffer const & buffer = pi_.base.bv->buffer();
BufferParams const & bparams = buffer.params();
Layout const & layout = par_.layout();
int y_top = 0;
// start of appendix?
if (parparams.startOfAppendix())
if (pparams.startOfAppendix())
y_top += paintAppendixStart(yo_ - row_.ascent() + 2 * defaultRowHeight());
Buffer const & buffer = pi_.base.bv->buffer();
Layout const & layout = par_.layout();
if (buffer.params().paragraph_separation == BufferParams::ParagraphSkipSeparation) {
if (pit_ != 0) {
if (layout.latextype == LATEX_PARAGRAPH
&& !par_.getDepth()) {
y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
} else {
Layout const & playout = pars_[pit_ - 1].layout();
if (playout.latextype == LATEX_PARAGRAPH
&& !pars_[pit_ - 1].getDepth()) {
// is it right to use defskip here, too? (AS)
y_top += buffer.params().getDefSkip().inPixels(*pi_.base.bv);
}
if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation
&& pit_ != 0) {
if (layout.latextype == LATEX_PARAGRAPH
&& !par_.getDepth()) {
y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
} else {
Layout const & playout = pars_[pit_ - 1].layout();
if (playout.latextype == LATEX_PARAGRAPH
&& !pars_[pit_ - 1].getDepth()) {
// is it right to use defskip here, too? (AS)
y_top += bparams.getDefSkip().inPixels(*pi_.base.bv);
}
}
}
@ -525,10 +524,10 @@ void RowPainter::paintFirst()
// the top.
if (layout.counter == "chapter") {
double spacing_val = 1.0;
if (!parparams.spacing().isDefault()) {
spacing_val = parparams.spacing().getValue();
if (!pparams.spacing().isDefault()) {
spacing_val = pparams.spacing().getValue();
} else {
spacing_val = buffer.params().spacing().getValue();
spacing_val = bparams.spacing().getValue();
}
int const labeladdon = int(fm.maxHeight() * layout.spacing.getValue() * spacing_val);
@ -565,10 +564,10 @@ void RowPainter::paintFirst()
docstring const str = par_.labelString();
if (!str.empty()) {
double spacing_val = 1.0;
if (!parparams.spacing().isDefault())
spacing_val = parparams.spacing().getValue();
if (!pparams.spacing().isDefault())
spacing_val = pparams.spacing().getValue();
else
spacing_val = buffer.params().spacing().getValue();
spacing_val = bparams.spacing().getValue();
FontMetrics const & fm = theFontMetrics(font);