X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=b854cbebd4777261cf64a34933582264efe469b9;hb=3826ff643433ad166c3402b146b3860ab5d6861e;hp=39fd2dac64a44f2c440b274badbdf065ac81010d;hpb=cf3107793295e5550c67a1bd7e26776309e5dbc7;p=lyx.git diff --git a/src/TextMetrics.h b/src/TextMetrics.h index 39fd2dac64..b854cbebd4 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 *); @@ -103,51 +104,42 @@ 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; - /** 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 draw(PainterInfo & pi, int x, int y) const; - - 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; + void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) 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 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(Row & row, int width) const; - /// returns the minimum space a row needs on the screen in pixel - int rowWidth( - int right_margin, - pit_type const pit, - pos_type const first, - pos_type const end - ) 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); @@ -155,11 +147,10 @@ private: // Temporary public: public: - /// returns the column near the specified x-coordinate of the row. + /// 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 getColumnNearX(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; @@ -186,7 +177,7 @@ 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 */ @@ -199,12 +190,16 @@ public: /// x,y are screen coordinates void setCursorFromCoordinates(Cursor & cur, int x, int y); + /// Helper function: find row element that contains pos, and + /// compute x offset. + Row::const_iterator const + findRowElement(Row const & row, pos_type const pos, + bool const boundary, double & x) const; + /// - 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); @@ -214,9 +209,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 @@ -234,7 +229,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: @@ -247,7 +242,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; /// @@ -261,7 +255,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_;