X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRow.h;h=c26752bde861c7c557630cc3ba41938612dc242b;hb=ec3aed75ad965160a96547b7e36c924c5df7a91b;hp=cb25a4dcd99f17608fad48271527f2b71c6f427f;hpb=926abae7536ad564072163057bf8a95758d0be27;p=lyx.git

diff --git a/src/Row.h b/src/Row.h
index cb25a4dcd9..c26752bde8 100644
--- a/src/Row.h
+++ b/src/Row.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -22,6 +22,8 @@
 
 namespace lyx {
 
+class DocIterator;
+
 /**
  * An on-screen row of text. A paragraph is broken into a
  * RowList for display. Each Row contains position pointers
@@ -32,16 +34,24 @@ public:
 	///
 	Row();
 	///
-	Row(pos_type pos);
-	///
 	bool changed() const { return changed_; }
 	///
 	void setChanged(bool c) { changed_ = c; }
 	///
 	void setCrc(size_type crc) const;
-	///
-	void setSelection(pos_type sel_beg, pos_type sel_end);
-
+	/// 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;
+	///
+	bool selection() const;
+	/// Set the selection begin and end and whether the left and/or right
+	/// margins are selected.
+	void setSelectionAndMargins(DocIterator const & beg, 
+		DocIterator const & end) const;
+	
 	///
 	void pos(pos_type p);
 	///
@@ -68,17 +78,29 @@ public:
 
 	/// width of a separator (i.e. space)
 	double separator;
-	/// width of hfills in the body
-	double hfill;
 	/// width of hfills in the label
 	double label_hfill;
 	/// the x position of the row
 	double x;
 	///
-	pos_type sel_beg;
+	mutable pos_type sel_beg;
 	///
-	pos_type sel_end;
+	mutable pos_type sel_end;
+	///
+	mutable bool begin_margin_sel;
+	///
+	mutable bool end_margin_sel;
+
 private:
+	/// Decides whether the margin is selected.
+	/**
+	  * \param margin_begin
+	  * \param beg
+	  * \param end
+	  */
+	bool isMarginSelected(bool left_margin, DocIterator const & beg,
+		DocIterator const & end) const;
+
 	/// has the Row appearance changed since last drawing?
 	mutable bool changed_;
 	/// CRC of row contents.