X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=0518231a8da9212f1bed27274bd9888278f36d9d;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=c7feaa778ca29879303a2d5e3af146ef147d758a;hpb=f686375eecc92a2658425a6bb93ee184c5049ec1;p=lyx.git diff --git a/src/TextMetrics.h b/src/TextMetrics.h index c7feaa778c..0518231a8d 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" @@ -34,7 +35,7 @@ class TextMetrics { public: /// Default constructor (only here for STL containers). - TextMetrics() : text_(0) {} + TextMetrics() : bv_(0), text_(0), max_width_(0) {} /// The only useful constructor. TextMetrics(BufferView *, Text *); @@ -93,6 +94,8 @@ public: bool redoParagraph(pit_type const pit); /// Clear cache of paragraph metrics void clear() { par_metrics_.clear(); } + /// Is cache of paragraph metrics empty ? + bool empty() const { return par_metrics_.empty(); } /// int ascent() const { return dim_.asc; } @@ -103,11 +106,6 @@ public: /// current text height. int height() const { return dim_.height(); } - /// - int maxWidth() const { return max_width_; } - /// - int singleWidth(pit_type const pit, pos_type pos) const; - /// int rightMargin(ParagraphMetrics const & pm) const; int rightMargin(pit_type const pit) const; @@ -117,31 +115,33 @@ public: void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const; - /// Returns the height of the row (width member is set to 0). - /// If \c topBottomSpace is true, extra space is added for the - /// top and bottom row. - void setRowHeight(Row & row, pit_type const pit, - bool topBottomSpace = true) const; - private: /// ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph); /// the minimum space a manual label needs on the screen in pixels - int labelFill(pit_type const pit, Row const & row) const; + int labelFill(Row const & row) const; /// FIXME?? int labelEnd(pit_type const pit) const; /// sets row.end to the pos value *after* which a row should break. /// for example, the pos after which isNewLine(pos) == true - void breakRow(Row & row, int right_margin, pit_type const pit) const; + /// \return true when another row is required (after a newline) + bool breakRow(Row & row, int right_margin) const; - // Expand the alignment of paragraph \param par at position \param pos - int getAlign(Paragraph const & par, pos_type pos) const; + // Expand the alignment of row \param row in paragraph \param par + LyXAlignment getAlign(Paragraph const & par, Row const & row) 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; + void computeRowMetrics(Row & row, int width) const; + + /// Set the height of the row (without space above/below paragraph) + void setRowHeight(Row & row) const; + // Compute the space on top of a paragraph + int parTopSpacing(pit_type pit) const; + // Compute the space below a a paragraph + int parBottomSpacing(pit_type pit) const; // Helper function for the other checkInsetHit method. InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y); @@ -151,9 +151,8 @@ private: 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; + /// of this column. This takes in account horizontal cursor row scrolling. + 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; @@ -180,9 +179,11 @@ public: \param x,y are absolute screen coordinates. \param assert_in_view if true the cursor will be set on a row that is completely visible - \param up whether we are going up or down (only used when + \param up whether we are going up or down (only used when assert_in_view is true - \retval inset is non-null if the cursor is positionned inside + \retval inset is null if the cursor is positioned over normal + text in the current Text object. Otherwise it is the inset + that the cursor points to, like for Inset::editXY. */ /// FIXME: cleanup to use BufferView::getCoveringInset() and /// setCursorFromCoordinates() instead of checkInsetHit(). @@ -194,11 +195,9 @@ public: void setCursorFromCoordinates(Cursor & cur, int x, int y); /// - int cursorX(CursorSlice const & cursor, - bool boundary) const; + int cursorX(CursorSlice const & cursor, bool boundary) const; /// - int cursorY(CursorSlice const & cursor, - bool boundary) const; + int cursorY(CursorSlice const & cursor, bool boundary) const; /// bool cursorHome(Cursor & cur); @@ -208,9 +207,9 @@ public: void deleteLineForward(Cursor & cur); /// is this row the last in the text? - bool isLastRow(pit_type pit, Row const & row) const; + bool isLastRow(Row const & row) const; /// is this row the first in the text? - bool isFirstRow(pit_type pit, Row const & row) const; + bool isFirstRow(Row const & row) const; /// Returns an inset if inset was hit, or 0 if not. /// \warning This method is not recursive! It will return the @@ -228,7 +227,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: @@ -241,7 +240,6 @@ private: /// \todo FIXME: this should be const. Text * text_; - bool main_text_; /// A map from paragraph index number to paragraph metrics typedef std::map ParMetricsCache; /// @@ -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_;