using lyx::pos_type;
-using std::max;
-using std::min;
+
+RowMetrics::RowMetrics() : separator(0), hfill(0), label_hfill(0), x(0)
+{}
+
Row::Row()
- : pos_(0), end_(0), fill_(0), height_(0), width_(0), y_(0),
- ascent_of_text_(0), baseline_(0),
- x_(0), fill_separator_(0), fill_hfill_(0), fill_label_hfill_(0)
+ : pos_(0), end_(0), height_(0), width_(0), y_offset_(0),
+ ascent_of_text_(0), baseline_(0)
{}
Row::Row(pos_type pos)
- : pos_(pos), end_(0), fill_(0), height_(0), width_(0), y_(0),
- ascent_of_text_(0), baseline_(0),
- x_(0), fill_separator_(0), fill_hfill_(0), fill_label_hfill_(0)
+ : pos_(pos), end_(0), height_(0), width_(0), y_offset_(0),
+ ascent_of_text_(0), baseline_(0)
{}
}
-void Row::end(pos_type p)
+void Row::endpos(pos_type p)
{
end_ = p;
}
-pos_type Row::end() const
+pos_type Row::endpos() const
{
return end_;
}
-void Row::fill(int f)
-{
- fill_ = f;
-}
-
-
-int Row::fill() const
-{
- return fill_;
-}
-
-
void Row::width(unsigned int w)
{
width_ = w;
}
-float Row::x() const
-{
- return x_;
-}
-
-
-void Row::x(float f)
-{
- x_ = f;
-}
-
-
-float Row::fill_separator() const
-{
- return fill_separator_;
-}
-
-
-void Row::fill_separator(float f)
-{
- fill_separator_ = f;
-}
-
-
-float Row::fill_hfill() const
-{
- return fill_hfill_;
-}
-
-
-void Row::fill_hfill(float f)
-{
- fill_hfill_ = f;
-}
-
-
-float Row::fill_label_hfill() const
-{
- return fill_label_hfill_;
-}
-
-
-void Row::fill_label_hfill(float f)
-{
- fill_label_hfill_ = f;
-}
-
-
bool Row::isParStart() const
{
return !pos();
{
lyxerr << s << " pos: " << pos_ << " width: " << width_
<< " height: " << height_
- << " fill: " << fill_
<< " ascent_of_text: " << ascent_of_text_
<< " top_of_text: " << top_of_text_
- << " y: " << y_ << std::endl;
+ << " y_offset: " << y_offset_ << std::endl;
}
-