X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=006836fb0a186b0f88795de6a1095a942aaaaf20;hb=bab184e49e4420ad5277eacd45f2447727f55bbd;hp=e5b32a1904650c9e986d87604befa2abb09f70d4;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git diff --git a/src/TextMetrics.h b/src/TextMetrics.h index e5b32a1904..006836fb0a 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" @@ -32,35 +33,50 @@ class Text; /// A map from a Text to the map of paragraphs metrics class TextMetrics { + /// noncopyable + TextMetrics(TextMetrics const &); + void operator=(TextMetrics const &); 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 *); /// bool contains(pit_type pit) const; /// - ParagraphMetrics const & parMetrics(pit_type) const; - /// std::pair first() const; /// std::pair last() const; + /// is this row the last in the text? + bool isLastRow(Row const & row) const; + /// is this row the first in the text? + bool isFirstRow(Row const & row) const; + /// + void setRowChanged(pit_type pit, pos_type pos); /// - Dimension const & dimension() const { return dim_; } + Dimension const & dim() const { return dim_; } /// Point const & origin() const { return origin_; } - /// compute text metrics. - bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0); - + /// + ParagraphMetrics const & parMetrics(pit_type) const; /// void newParMetricsDown(); /// void newParMetricsUp(); + /// compute text metrics. + bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0, + bool const expand_on_multipars = true); + + /// The "nodraw" drawing stage for one single paragraph: set the + /// positions of the insets contained this paragraph in metrics + /// cache. Related to BufferView::updatePosCache. + void updatePosCache(pit_type pit) const; + /// Gets the fully instantiated font at a given position in a paragraph /// Basically the same routine as Paragraph::getFont() in Paragraph.cpp. /// The difference is that this one is used for displaying, and thus we @@ -90,9 +106,11 @@ public: /// Rebreaks the given paragraph. /// \retval true if a full screen redraw is needed. /// \retval false if a single paragraph redraw is enough. - bool redoParagraph(pit_type const pit); + bool redoParagraph(pit_type const pit, bool align_rows = true); /// 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,9 +121,6 @@ public: /// current text height. int height() const { return dim_.height(); } - /// - int maxWidth() const { return max_width_; } - /// int rightMargin(ParagraphMetrics const & pm) const; int rightMargin(pit_type const pit) const; @@ -115,41 +130,51 @@ 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); + /** + * Returns the left beginning of the text. + * This information cannot be taken from the layout object, because + * in LaTeX the beginning of the text fits in some cases + * (for example sections) exactly the label-width. + */ + int leftMargin(pit_type pit, pos_type pos) const; + int leftMargin(pit_type pit) const; + /// 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; + + // Expands the alignment of row \param row in paragraph \param par + LyXAlignment getAlign(Paragraph const & par, Row const & row) const; + /// Aligns properly the row contents (computes spaces and fills) + void setRowAlignment(Row & row, int width) const; - // Expand the alignment of paragraph \param par at position \param pos - int 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; + /// 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); + InsetList::Element * checkInsetHit(pit_type pit, int x, int y); // Temporary public: 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. + /// 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. @@ -177,9 +202,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(). @@ -191,11 +218,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); @@ -204,28 +229,14 @@ public: /// void deleteLineForward(Cursor & cur); - /// is this row the last in the text? - bool isLastRow(pit_type pit, Row const & row) const; - /// is this row the first in the text? - bool isFirstRow(pit_type pit, 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 /// outermost inset within this Text. /// \sa BufferView::getCoveringInset() to get the innermost inset. Inset * checkInsetHit(int x, int y); - /** - * Returns the left beginning of the text. - * This information cannot be taken from the layout object, because - * in LaTeX the beginning of the text fits in some cases - * (for example sections) exactly the label-width. - */ - int leftMargin(int max_width, pit_type pit, pos_type pos) const; - 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: @@ -238,7 +249,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; /// @@ -252,7 +262,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_;