Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index ae99490955f948a180dcbd24c6a74ed0dd98cade..006836fb0a186b0f88795de6a1095a942aaaaf20 100644 (file)
--- 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,33 @@ public:
        ///
        bool contains(pit_type pit) const;
        ///
-       ParagraphMetrics const & parMetrics(pit_type) const;
-       ///
        std::pair<pit_type, ParagraphMetrics const *> first() const;
        ///
        std::pair<pit_type, ParagraphMetrics const *> 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.
@@ -96,7 +106,7 @@ 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 ?
@@ -144,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;
@@ -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:
@@ -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.