X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.h;h=e93ea8735d8806a8c8479933bf0b1569e4f45589;hb=378c7af432186b6b6a905dbe72690a587757124d;hp=7d9a891fd13d2a0c16173375f6d152ed65bdabf3;hpb=971c543b34253e6ded4afdd644fee8ba89df2b05;p=features.git diff --git a/src/Row.h b/src/Row.h index 7d9a891fd1..e93ea8735d 100644 --- a/src/Row.h +++ b/src/Row.h @@ -17,6 +17,8 @@ #include "support/types.h" +#include "Dimension.h" + namespace lyx { @@ -40,19 +42,21 @@ public: /// pos_type endpos() const; /// - int height() const { return ascent_ + descent_; } + Dimension const & dimension() const { return dim_; } + /// + int height() const { return dim_.height(); } /// - void width(int w); + void width(int w) { dim_.wid = w; } /// - int width() const; + int width() const { return dim_.wid; } /// - void ascent(int b); + void ascent(int a) { dim_.asc = a; } /// - int ascent() const; + int ascent() const { return dim_.asc; } /// - void descent(int b) { descent_ = b; } + void descent(int d) { dim_.des = d; } /// - int descent() const { return descent_; } + int descent() const { return dim_.des; } /// current debugging only void dump(const char * = "") const; @@ -61,12 +65,8 @@ private: pos_type pos_; /// one behind last pos covered by this row pos_type end_; - /// - int ascent_; - /// - int descent_; - /// - int width_; + /// Row dimension. + Dimension dim_; };