X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.h;h=7ae9c11b1e3850adc16ccaddf129edd7b382e5cd;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=0bd4597746616ac5dd03fb3f2a6b57a226f933f4;hpb=1639abb8edaa492c649e69d093436f8a96f07bec;p=lyx.git diff --git a/src/Row.h b/src/Row.h index 0bd4597746..7ae9c11b1e 100644 --- a/src/Row.h +++ b/src/Row.h @@ -61,11 +61,22 @@ public: : type(t), pos(p), endpos(p + 1), inset(0), extra(0), font(f), change(ch), final(false) {} - // Return total width of element, including separator overhead - double full_width() const { return dim.wid + extra * countSeparators(); } // Return the number of separator in the element (only STRING type) int countSeparators() const; + // Return total width of element, including separator overhead + // FIXME: Cache this value or the number of expanders? + double full_width() const { return dim.wid + extra * countExpanders(); } + // Return the number of expanding characters in the element (only STRING + // type). + int countExpanders() const; + // Return the amount of expansion: the number of expanding characters + // that get stretched during justification, times the em of the font + // (only STRING type). + int expansionAmount() const; + // set extra proportionally to the font em value. + void setExtra(double extra_per_em); + /** Return position in pixels (from the left) of position * \param i in the row element. */ @@ -181,8 +192,10 @@ public: // Return the number of separators in the row int countSeparators() const; - // Set the extra spacing for every separator in STRING elements - void setSeparatorExtraWidth(double w); + // Set the extra spacing for every expanding character in STRING-type + // elements. \param w is the total amount of extra width for the row to be + // distributed among expanders. \return false if the justification fails. + bool setExtraWidth(int w); /// void add(pos_type pos, Inset const * ins, Dimension const & dim,