X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.h;h=d210174ef9460b269433dc9ac1c88fc2d7cc318e;hb=4da19ef8330fc90e712308d63aa7ddc0abfaef7b;hp=c840698f1c071b00bd1980197a8537270afe8f3a;hpb=eb4a2a190f2640d2a6ab7146cfcc347e70b57044;p=lyx.git

diff --git a/src/Row.h b/src/Row.h
index c840698f1c..d210174ef9 100644
--- a/src/Row.h
+++ b/src/Row.h
@@ -80,13 +80,12 @@ public:
 		/** Return position in pixels (from the left) of position
 		 * \param i in the row element.
 		 */
-		double pos2x(pos_type i) const;
+		double pos2x(pos_type const i) const;
 		/** Return character position that is the closest to
 		 *  pixel position \param x. The value \param x is
 		 *  adjusted to the actual pixel position.
-		 *  \param select if true, return the right edge when closer.
-		 */
-		pos_type x2pos(int & x, bool select = false) const;
+		*/
+		pos_type x2pos(int &x) const;
 		/** Break the element if possible, so that its width is less
 		 * than \param w. Returns true on success. When \param force
 		 * is true, the string is cut at any place, other wise it
@@ -137,24 +136,45 @@ public:
 
 	///
 	Row();
+	/**
+	 * Helper function: set variable \c var to value \c val, and mark
+	 * row as changed is the values were different. This is intended
+	 * for use when changing members of the row object.
+	 */
+	template<class T1, class T2>
+	void change(T1 & var, T2 const val) {
+		if (var != val)
+			changed(true);
+		var = val;
+	}
+	/**
+	 * Helper function: set variable \c var to value \c val, and mark
+	 * row as changed is the values were different. This is intended
+	 * for use when changing members of the row object.
+	 * This is the const version, useful for mutable members.
+	 */
+	template<class T1, class T2>
+	void change(T1 & var, T2 const val) const {
+		if (var != val)
+			changed(true);
+		var = val;
+	}
 	///
 	bool changed() const { return changed_; }
 	///
-	void setChanged(bool c) { changed_ = c; }
-	///
-	void setCrc(size_type crc) const;
-	/// Set the selection begin and end.
-	/**
-	  * This is const because we update the selection status only at draw()
-	  * time.
-	  */
-	void setSelection(pos_type sel_beg, pos_type sel_end) const;
+	void changed(bool c) const { changed_ = c; }
 	///
 	bool selection() const;
-	/// Set the selection begin and end and whether the left and/or right
-	/// margins are selected.
+	/**
+	 * Set the selection begin and end and whether the left and/or
+	 * right margins are selected.
+	 * This is const because we update the selection status only at
+	 * draw() time.
+	 */
 	void setSelectionAndMargins(DocIterator const & beg,
 		DocIterator const & end) const;
+	/// no selection on this row.
+	void clearSelectionAndMargins() const;
 
 	///
 	void pit(pit_type p) { pit_ = p; }
@@ -178,9 +198,9 @@ public:
 	bool flushed() const { return flushed_; }
 
 	///
-	Dimension const & dimension() const { return dim_; }
+	Dimension const & dim() const { return dim_; }
 	///
-	Dimension & dimension() { return dim_; }
+	Dimension & dim() { return dim_; }
 	///
 	int height() const { return dim_.height(); }
 	/// The width of the row, including the left margin, but not the right one.
@@ -241,8 +261,6 @@ public:
 	Element const & back() const { return elements_.back(); }
 	/// remove last element
 	void pop_back();
-	/// remove all row elements
-	void clear() { elements_.clear(); }
 	/**
 	 * if row width is too large, remove all elements after last
 	 * separator and update endpos if necessary. If all that
@@ -267,6 +285,11 @@ public:
 	void reverseRTL(bool rtl_par);
 	///
 	bool isRTL() const { return rtl_; }
+	///
+	bool needsChangeBar() const { return changebar_; }
+	///
+	void needsChangeBar(bool ncb) { changebar_ = ncb; }
+
 	/// Find row element that contains \c pos, and compute x offset.
 	const_iterator const findElement(pos_type pos, bool boundary, double & x) const;
 
@@ -296,8 +319,10 @@ private:
 	  * \param beg
 	  * \param end
 	  */
-	bool isMarginSelected(bool left_margin, DocIterator const & beg,
+	bool isMarginSelected(bool left, DocIterator const & beg,
 		DocIterator const & end) const;
+	/// Set the selection begin and end.
+	void setSelection(pos_type sel_beg, pos_type sel_end) const;
 
 	/**
 	 * Returns true if a char or string with font \c f and change
@@ -311,8 +336,6 @@ private:
 
 	/// has the Row appearance changed since last drawing?
 	mutable bool changed_;
-	/// CRC of row contents.
-	mutable size_type crc_;
 	/// Index of the paragraph that contains this row
 	pit_type pit_;
 	/// first pos covered by this row
@@ -327,6 +350,8 @@ private:
 	Dimension dim_;
 	/// true when this row lives in a right-to-left paragraph
 	bool rtl_;
+	/// true when a changebar should be drawn in the margin
+	bool changebar_;
 };