In many cases, the origin xo_ of insets was forgotten.
Fixes bug #11425.
double x = x_;
if (row_.isRTL())
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);
else
x = x_ - fm.width(layout.labelsep) - fm.width(str);
double x = x_;
if (layout.labeltype == LABEL_CENTERED) {
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 -= 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);
}
}
pi_.pain.text(int(x), yo_ - maxdesc - labeladdon, str, font);
}
}
if (endlabel == END_LABEL_BOX)
}
if (endlabel == END_LABEL_BOX)
- pi_.pain.rectangle(x, y, size, size, font.realColor());
+ pi_.pain.rectangle(xo_ + x, y, size, size, font.realColor());
- pi_.pain.fillRectangle(x, y, size, size, font.realColor());
+ pi_.pain.fillRectangle(xo_ + x, y, size, size, font.realColor());