X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=006836fb0a186b0f88795de6a1095a942aaaaf20;hb=36edbffe2f71d050a09d5231c8428dd7575573fa;hp=2f6181d0b0d91592d92198f0112473e5d83dd001;hpb=1fca708c7f33f089055d8ca258d8cd6a357cf2a6;p=lyx.git diff --git a/src/TextMetrics.h b/src/TextMetrics.h index 2f6181d0b0..006836fb0a 100644 --- a/src/TextMetrics.h +++ b/src/TextMetrics.h @@ -33,6 +33,9 @@ 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) {} @@ -42,26 +45,38 @@ public: /// 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 @@ -91,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; } @@ -117,6 +134,15 @@ 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; @@ -128,11 +154,10 @@ private: /// \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 + // 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; @@ -142,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: @@ -179,7 +204,9 @@ public: 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 + \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(). @@ -202,26 +229,12 @@ 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. /// \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, Dimension & dim) const;