Let tm be a reference here as elsewhere

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index ade98739ed8c59d50c18d4f1a5860928fa12f48a..a4a1e23740871b933367a3efaf3cecf1f0f9d26c 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -55,13 +55,19 @@ public:
 
 
        /// compute text metrics.
-       bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0);
+       bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0,
+                    bool const expand_on_multipars = true);
 
        ///
        void newParMetricsDown();
        ///
        void newParMetricsUp();
 
+       /// 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 +97,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 +125,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 +145,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 +158,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:
@@ -150,8 +166,7 @@ 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. This takes in account horizontal cursor row scrolling.
-       pos_type getPosNearX(Row const & row, int & x, bool & boundary,
-                            bool select = false) const;
+       pos_type getPosNearX(Row const & row, int & x, bool & boundary) const;
 
        /// returns pos in given par at given x coord.
        pos_type x2pos(pit_type pit, int row, int x) const;
@@ -180,7 +195,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().
@@ -189,10 +206,7 @@ public:
 
        /// sets cursor only within this Text.
        /// x,y are screen coordinates
-       /// If select is true, move to the next position if closer to the right
-       /// edge.
-       void setCursorFromCoordinates(Cursor & cur, int x, int y,
-                                     bool select = false);
+       void setCursorFromCoordinates(Cursor & cur, int x, int y);
 
        ///
        int cursorX(CursorSlice const & cursor, bool boundary) const;
@@ -217,15 +231,6 @@ public:
        /// \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;