#include <config.h>
-#include <algorithm>
-
#include "RowPainter.h"
#include "Buffer.h"
#include "support/gettext.h"
#include "support/lassert.h"
+#include <algorithm>
using namespace std;
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
//row_.dump();
- LBUFERR(row.pit() < text.paragraphs().size());
+ LBUFERR(row.pit() >= 0);
+ LBUFERR(row.pit() < int(text.paragraphs().size()));
}
double x = x_;
if (layout.labeltype == LABEL_CENTERED) {
- x += (tm_.width() - row_.left_margin - row_.right_margin) / 2;
- x -= fm.width(str) / 2;
+ /* Currently, x points at row_.left_margin (which contains the
+ * indent). First remove that, and then center the title with
+ * respect to the left and right margins.
+ */
+ int const leftm = row_.isRTL() ? tm_.rightMargin(row_.pit())
+ : tm_.leftMargin(row_.pit());
+ int const rightm = row_.isRTL() ? tm_.leftMargin(row_.pit())
+ : tm_.rightMargin(row_.pit());
+ x += leftm - row_.left_margin + (tm_.width() - leftm -rightm) / 2
+ - fm.width(str) / 2;
} else if (row_.isRTL()) {
x = xo_ + tm_.width() - row_.right_margin - fm.width(str);
}