Less expensive OP first as this might be called often.

[lyx.git] / src / ParagraphMetrics.h

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 6d9a3fa828ca74b9e3195dd098223710e78cc3f4..0d186f158bc217917d0d563d47a7592871892061 100644 (file)
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -5,10 +5,10 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  * \author Abdelrazak Younes
  *
  * Full author contact details are available in file CREDITS.
@@ -17,82 +17,75 @@
 #ifndef PARAGRAPH_METRICS_H
 #define PARAGRAPH_METRICS_H
 
-#include "Paragraph.h"
+#include "Dimension.h"
+#include "Row.h"
 
 namespace lyx {
 
-/**
- * Each paragraph is broken up into a number of rows on the screen.
- * This is a list of such on-screen rows, ordered from the top row
- * downwards.
- */
-typedef std::vector<Row> RowList;
+class BufferView;
+class Paragraph;
 
-class MetricsInfo;
-class PainterInfo;
-
-/// Helper class for Paragraph Metrics.
-class ParagraphMetrics  {
+/// Helper class for paragraph metrics.
+class ParagraphMetrics {
 public:
        /// Default constructor (only here for STL containers).
-       ParagraphMetrics(): par_(0) {};
+       ParagraphMetrics() {}
        /// The only useful constructor.
-       ParagraphMetrics(Paragraph const & par);
+       explicit ParagraphMetrics(Paragraph const & par);
 
        /// Copy operator.
-       /// Important note: We don't copy \c row_change_status_ and
-       /// \c row_signature_ because those are updated externally with
-       /// \c updateRowChangeStatus() in TextMetrics::redoParagraph().
        ParagraphMetrics & operator=(ParagraphMetrics const &);
 
-       ///
-       Row & getRow(pos_type pos, bool boundary);
+       void reset(Paragraph const & par);
+
        ///
        Row const & getRow(pos_type pos, bool boundary) const;
        ///
        size_t pos2row(pos_type pos) const;
 
-       /// BufferView::redoParagraph updates this
+       /// TextMetrics::redoParagraph updates this
        Dimension const & dim() const { return dim_; }
        Dimension & dim() { return dim_; }
        /// total height of paragraph
-       unsigned int height() const { return dim_.height(); }
+       int height() const { return dim_.height(); }
        /// total width of paragraph, may differ from workwidth
-       unsigned int width() const { return dim_.width(); }
+       int width() const { return dim_.width(); }
        /// ascend of paragraph above baseline
-       unsigned int ascent() const { return dim_.ascent(); }
+       int ascent() const { return dim_.ascent(); }
        /// descend of paragraph below baseline
-       unsigned int descent() const { return dim_.descent(); }
+       int descent() const { return dim_.descent(); }
        /// Text updates the rows using this access point
        RowList & rows() { return rows_; }
        /// The painter and others use this
        RowList const & rows() const { return rows_; }
-       /// The painter and others use this
-       std::vector<bool> const & rowChangeStatus() const
-       { return row_change_status_; }
        ///
-       void updateRowChangeStatus();
+       int rightMargin(BufferView const & bv) const;
        ///
-       int rightMargin(Buffer const & buffer) const;
+       Paragraph const & par() const { return *par_; }
 
        /// dump some information to lyxerr
        void dump() const;
 
-private:
        ///
-       typedef std::vector<size_type> RowSignature;
+       bool hfillExpansion(Row const & row, pos_type pos) const;
+
        ///
-       size_type calculateRowSignature(Row const &);
+       int position() const { return position_; }
+       void setPosition(int position);
        ///
-       mutable RowList rows_;
+       int id() const { return id_; }
+
+private:
+       ///
+       int position_ = 0;
        ///
-       RowSignature row_signature_;
+       int id_ = -1;
        ///
-       std::vector<bool> row_change_status_;
+       mutable RowList rows_;
        /// cached dimensions of paragraph
        Dimension dim_;
        ///
-       Paragraph const * par_;
+       Paragraph const * par_ = nullptr;
 };
 
 } // namespace lyx