X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=4e9fc0dc2d05fc5955a4790356b2cd1f79fe3eca;hb=858c12c6bb850b7ed7a708e3e66fd58ba6f06cb9;hp=c7feaa778ca29879303a2d5e3af146ef147d758a;hpb=f686375eecc92a2658425a6bb93ee184c5049ec1;p=lyx.git diff --git a/src/TextMetrics.h b/src/TextMetrics.h index c7feaa778c..4e9fc0dc2d 100644 --- a/src/TextMetrics.h +++ b/src/TextMetrics.h @@ -16,6 +16,7 @@ #include "Font.h" #include "InsetList.h" +#include "LayoutEnums.h" #include "ParagraphMetrics.h" #include "support/types.h" @@ -105,8 +106,6 @@ public: /// int maxWidth() const { return max_width_; } - /// - int singleWidth(pit_type const pit, pos_type pos) const; /// int rightMargin(ParagraphMetrics const & pm) const; @@ -138,7 +137,7 @@ private: void breakRow(Row & row, int right_margin, pit_type const pit) const; // Expand the alignment of paragraph \param par at position \param pos - int getAlign(Paragraph const & par, pos_type pos) const; + LyXAlignment getAlign(Paragraph const & par, pos_type pos) const; /** this calculates the specified parameters. needed when setting * the cursor and when creating a visible row */ void computeRowMetrics(pit_type pit, Row & row, int width) const; @@ -152,8 +151,7 @@ public: /// returns the position near the specified x-coordinate of the row. /// x is an absolute screen coord, it is set to the real beginning /// of this column. - pos_type getPosNearX(pit_type pit, Row const & row, int & x, - bool & boundary) const; + pos_type getPosNearX(Row const & row, int & x, bool & boundary) const; /// returns pos in given par at given x coord. pos_type x2pos(pit_type pit, int row, int x) const; @@ -228,7 +226,7 @@ public: int leftMargin(int max_width, pit_type pit) const; /// calculates the position of a completion popup - void completionPosAndDim(Cursor const & cur, int & x, int & y, + void completionPosAndDim(Cursor const & cur, int & x, int & y, Dimension & dim) const; private: @@ -255,7 +253,7 @@ public: /// our 'outermost' font. /// This is handed down from the surrounding /// inset through the pi/mi parameter (pi.base.font) - /// It is used in applyOuterFont() and setCharFont() for reasons + /// It is used in applyOuterFont() and setCharFont() for reasons /// that are not clear... to hand hand the outermost language and /// also for char style apparently. Font font_;