X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=4e9fc0dc2d05fc5955a4790356b2cd1f79fe3eca;hb=af6cb2d0e239a4e84a8e25c947862c215aac93f4;hp=1a0945d4ffa57cbb4fde7d39403268dc95a89516;hpb=cdbebdf0933d5acb9880b5fafa6584e4fcb7cfbb;p=lyx.git diff --git a/src/TextMetrics.h b/src/TextMetrics.h index 1a0945d4ff..4e9fc0dc2d 100644 --- a/src/TextMetrics.h +++ b/src/TextMetrics.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author John Levon * \author Abdelrazak Younes * @@ -15,6 +15,8 @@ #define TEXT_METRICS_H #include "Font.h" +#include "InsetList.h" +#include "LayoutEnums.h" #include "ParagraphMetrics.h" #include "support/types.h" @@ -36,7 +38,7 @@ public: TextMetrics() : text_(0) {} /// The only useful constructor. TextMetrics(BufferView *, Text *); - + /// bool contains(pit_type pit) const; /// @@ -46,9 +48,6 @@ public: /// std::pair last() const; - /// - int parPosition(pit_type pit) const; - /// Dimension const & dimension() const { return dim_; } /// @@ -102,35 +101,26 @@ public: int descent() const { return dim_.des; } /// current text width. int width() const { return dim_.wid; } - /// current text heigth. + /// 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. - Dimension rowHeight( - pit_type const pit, - pos_type const first, - pos_type const end, - bool topBottomSpace = true) const; + void setRowHeight(Row & row, pit_type const pit, + bool topBottomSpace = true) const; private: /// @@ -144,32 +134,24 @@ private: /// sets row.end to the pos value *after* which a row should break. /// for example, the pos after which isNewLine(pos) == true - pit_type rowBreakPoint( - int width, - pit_type const pit, - pit_type first - ) 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; - - /// draw selection for a single row - void drawRowSelection(PainterInfo & pi, int x, Row const & row, - DocIterator const & beg, DocIterator const & end, - bool drawOnBegMargin, bool drawOnEndMargin) const; + void breakRow(Row & row, int right_margin, pit_type const pit) const; + + // Expand the alignment of paragraph \param par at position \param pos + 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; + + // Helper function for the other checkInsetHit method. + InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y); + // 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; + 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; @@ -177,11 +159,11 @@ public: // FIXME: is there a need for this? //int pos2x(pit_type pit, pos_type pos) const; - /** returns row near the specified - * y-coordinate in given paragraph (relative to the screen). - */ - Row const & getRowNearY(int y, - pit_type pit) const; + /// returns the row near the specified y-coordinate in a given paragraph + /// (relative to the screen). If assert_in_view is true, it is made sure + /// that the row is on screen completely; this might change the given pit. + Row const & getPitAndRowNearY(int & y, pit_type & pit, + bool assert_in_view, bool up); /// returns the paragraph number closest to screen y-coordinate. /// This method uses the BufferView CoordCache to locate the @@ -194,11 +176,16 @@ public: /** \return the inset pointer if x,y is covering that inset \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 + assert_in_view is true \retval inset is non-null if the cursor is positionned inside */ /// FIXME: cleanup to use BufferView::getCoveringInset() and /// setCursorFromCoordinates() instead of checkInsetHit(). - Inset * editXY(Cursor & cur, int x, int y); + Inset * editXY(Cursor & cur, int x, int y, + bool assert_in_view = false, bool up = true); /// sets cursor only within this Text. /// x,y are screen coordinates @@ -239,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: @@ -266,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_;