mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix drawing of labels in insets
In many cases, the origin xo_ of insets was forgotten. Fixes bug #11425.
This commit is contained in:
parent
c65b146d86
commit
5c1d65afee
@ -432,7 +432,7 @@ void RowPainter::paintLabel() const
|
||||
double x = x_;
|
||||
|
||||
if (row_.isRTL())
|
||||
x = tm_.width() - row_.right_margin + fm.width(layout.labelsep);
|
||||
x = xo_ + tm_.width() - row_.right_margin + fm.width(layout.labelsep);
|
||||
else
|
||||
x = x_ - fm.width(layout.labelsep) - fm.width(str);
|
||||
|
||||
@ -467,10 +467,10 @@ void RowPainter::paintTopLevelLabel() const
|
||||
|
||||
double x = x_;
|
||||
if (layout.labeltype == LABEL_CENTERED) {
|
||||
x = row_.left_margin + (tm_.width() - row_.left_margin - row_.right_margin) / 2;
|
||||
x += (tm_.width() - row_.left_margin - row_.right_margin) / 2;
|
||||
x -= fm.width(str) / 2;
|
||||
} else if (row_.isRTL()) {
|
||||
x = tm_.width() - row_.right_margin - fm.width(str);
|
||||
x = xo_ + tm_.width() - row_.right_margin - fm.width(str);
|
||||
}
|
||||
pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
|
||||
}
|
||||
@ -557,9 +557,9 @@ void RowPainter::paintLast() const
|
||||
}
|
||||
|
||||
if (endlabel == END_LABEL_BOX)
|
||||
pi_.pain.rectangle(x, y, size, size, font.realColor());
|
||||
pi_.pain.rectangle(xo_ + x, y, size, size, font.realColor());
|
||||
else
|
||||
pi_.pain.fillRectangle(x, y, size, size, font.realColor());
|
||||
pi_.pain.fillRectangle(xo_ + x, y, size, size, font.realColor());
|
||||
break;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user