X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=cf53faa13282407acd05c6f8278ea3bfed52958d;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=ae99490955f948a180dcbd24c6a74ed0dd98cade;hpb=3d590d3bd71a3522d525ce71220e99bd25b6a648;p=lyx.git diff --git a/src/TextMetrics.h b/src/TextMetrics.h index ae99490955..cf53faa132 100644 --- a/src/TextMetrics.h +++ b/src/TextMetrics.h @@ -21,49 +21,61 @@ #include "support/types.h" +#include + namespace lyx { class BufferView; class Cursor; class CursorSlice; -class DocIterator; class MetricsInfo; 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() : bv_(0), text_(0), max_width_(0) {} + TextMetrics() : bv_(0), text_(0), max_width_(0), tight_(false) {} /// 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; + /// + ParagraphMetrics & parMetrics(pit_type); /// void newParMetricsDown(); /// void newParMetricsUp(); + /// compute text metrics. + bool metrics(MetricsInfo const & mi, Dimension & dim, int min_width = 0); + /// The "nodraw" drawing stage for one single paragraph: set the - /// positions of the insets contained this paragraph in metrics + /// positions of the insets contained in this paragraph in metrics /// cache. Related to BufferView::updatePosCache. void updatePosCache(pit_type pit) const; @@ -86,17 +98,15 @@ public: /// is this position in the paragraph right-to-left? bool isRTL(CursorSlice const & sl, bool boundary) const; /// is between pos-1 and pos an RTL<->LTR boundary? - bool isRTLBoundary(pit_type pit, - pos_type pos) const; + bool isRTLBoundary(pit_type pit, pos_type pos) const; /// would be a RTL<->LTR boundary between pos and the given font? - bool isRTLBoundary(pit_type pit, - pos_type pos, Font const & font) const; + bool isRTLBoundary(pit_type pit, pos_type pos, Font const & font) const; /// 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 ? @@ -111,6 +121,17 @@ public: /// current text height. int height() const { return dim_.height(); } + /** + * Returns the left beginning of a row starting at \c pos. + * 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; + /// Return the left beginning of a row which is not the first one. + /// This is the left margin when there is no indentation. + int leftMargin(pit_type pit) const; + /// int rightMargin(ParagraphMetrics const & pm) const; int rightMargin(pit_type const pit) const; @@ -124,31 +145,19 @@ 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(Row const & row) const; - /// FIXME?? - int labelEnd(pit_type const pit) const; + // Turn paragraph oh index \c pit into a single row + Row tokenizeParagraph(pit_type pit) const; - /// sets row.end to the pos value *after* which a row should break. - /// for example, the pos after which isNewLine(pos) == true - /// \return true when another row is required (after a newline) - bool breakRow(Row & row, int right_margin) const; + // Break the row produced by tokenizeParagraph() into a list of rows. + RowList breakParagraph(Row const & row) const; - // Expand the alignment of row \param row in paragraph \param par + // Expands 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; + /// Aligns properly the row contents (computes spaces and fills) + void setRowAlignment(Row & row, int width) const; /// Set the height of the row (without space above/below paragraph) void setRowHeight(Row & row) const; @@ -158,7 +167,7 @@ private: 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: @@ -209,9 +218,9 @@ public: void setCursorFromCoordinates(Cursor & cur, int x, int y); /// - int cursorX(CursorSlice const & cursor, bool boundary) const; + int cursorX(CursorSlice const & sl, bool boundary) const; /// - int cursorY(CursorSlice const & cursor, bool boundary) const; + int cursorY(CursorSlice const & sl, bool boundary) const; /// bool cursorHome(Cursor & cur); @@ -220,11 +229,6 @@ public: /// void deleteLineForward(Cursor & cur); - /// 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; - /// 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. @@ -236,7 +240,6 @@ public: Dimension & dim) const; private: - friend class BufferView; /// The BufferView owner. BufferView * bv_; @@ -251,6 +254,8 @@ private: mutable ParMetricsCache par_metrics_; Dimension dim_; int max_width_; + /// if true, do not expand insets to max width artificially + bool tight_; mutable Point origin_; // temporary public: