mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 02:28:35 +00:00
Do not rely on x_ when painting label
Additionally fixes a warning about unused value (from clang-analyzer).
This commit is contained in:
parent
6316b9b7ae
commit
051b6ce68a
@ -429,14 +429,10 @@ void RowPainter::paintLabel() const
|
||||
Layout const & layout = par_.layout();
|
||||
FontInfo const font = labelFont(false);
|
||||
FontMetrics const & fm = theFontMetrics(font);
|
||||
double x = x_;
|
||||
int const x = row_.isRTL() ? row_.width() + fm.width(layout.labelsep)
|
||||
: row_.left_margin - fm.width(layout.labelsep) - fm.width(str);
|
||||
|
||||
if (row_.isRTL())
|
||||
x = xo_ + row_.width() + fm.width(layout.labelsep);
|
||||
else
|
||||
x = x_ - fm.width(layout.labelsep) - fm.width(str);
|
||||
|
||||
pi_.pain.text(int(x), yo_, str, font);
|
||||
pi_.pain.text(xo_ + x, yo_, str, font);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1934,15 +1934,11 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
|
||||
rp.paintDepthBar();
|
||||
if (row.needsChangeBar())
|
||||
rp.paintChangeBar();
|
||||
if (i == 0 && !row.isRTL())
|
||||
if (i == 0)
|
||||
rp.paintFirst();
|
||||
if (i == nrows - 1 && row.isRTL())
|
||||
if (i == nrows - 1)
|
||||
rp.paintLast();
|
||||
rp.paintText();
|
||||
if (i == nrows - 1 && !row.isRTL())
|
||||
rp.paintLast();
|
||||
if (i == 0 && row.isRTL())
|
||||
rp.paintFirst();
|
||||
rp.paintTooLargeMarks(row_x + row.left_x() < 0,
|
||||
row_x + row.right_x() > bv_->workWidth());
|
||||
y += row.descent();
|
||||
|
Loading…
Reference in New Issue
Block a user