- : separator(0), hfill(0), label_hfill(0), x(0),
+ : separator(0), label_hfill(0), x(0),
sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(0), end_(0)
{}
Row::Row(pos_type pos)
sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(0), end_(0)
{}
Row::Row(pos_type pos)
- : separator(0), hfill(0), label_hfill(0), x(0),
+ : separator(0), label_hfill(0), x(0),
sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(pos), end_(0)
{}
sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(pos), end_(0)
{}
/// width of a separator (i.e. space)
double separator;
/// width of a separator (i.e. space)
double separator;
- /// width of hfills in the body
- double hfill;
/// width of hfills in the label
double label_hfill;
/// the x position of the row
/// width of hfills in the label
double label_hfill;
/// the x position of the row
Row & row, int width) const
{
row.label_hfill = 0;
Row & row, int width) const
{
row.label_hfill = 0;
row.separator = 0;
Buffer & buffer = bv_->buffer();
row.separator = 0;
Buffer & buffer = bv_->buffer();
row.label_hfill = labelFill(pit, row) / double(nlh);
}
row.label_hfill = labelFill(pit, row) / double(nlh);
}
- // are there any hfills in the row?
- int const nh = numberOfHfills(par, row);
-
- if (nh) {
- if (w > 0)
- row.hfill = w / nh;
+ double hfill = 0;
+ if (w > 0) {
+ // are there any hfills in the row?
+ if (int nh = numberOfHfills(par, row))
+ hfill = w / double(nh);
// we don't have to look at the alignment if it is ALIGN_LEFT and
// if the row is already larger then the permitted width as then
// we force the LEFT_ALIGN'edness!
// we don't have to look at the alignment if it is ALIGN_LEFT and
// if the row is already larger then the permitted width as then
// we force the LEFT_ALIGN'edness!
continue;
Dimension dim = row.dimension();
if (pm.hfillExpansion(row, ii->pos))
continue;
Dimension dim = row.dimension();
if (pm.hfillExpansion(row, ii->pos))
- dim.wid = int(ii->pos >= body_pos ? row.hfill : row.label_hfill);
+ dim.wid = int(ii->pos >= body_pos ? hfill : row.label_hfill);
else
dim.wid = 3;
// Cache the inset dimension.
else
dim.wid = 3;
// Cache the inset dimension.