commit 45191d04f9999ba5c8ac4466e058e1271f17649d
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Sat Jul 16 18:13:47 2022 +0200
Rename Row::right_boundary to end_boundary
This is more correct for RtL paragraphs.
---
src/Row.cpp | 2 +-
src/Row.h | 6 +++---
src/TextMetrics.cpp | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Row.cpp b/src/Row.cpp
index 68ab984..418e0c6 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -336,7 +336,7 @@ ostream & operator<<(ostream & os, Row const & row)
<< " descent: " << row.dim_.des
<< " separator: " << row.separator
<< " label_hfill: " << row.label_hfill
- << " right_boundary: " << row.right_boundary()
+ << " end_boundary: " << row.end_boundary()
<< " flushed: " << row.flushed() << "\n";
// We cannot use the operator above, unfortunately
double x = row.left_margin;
diff --git a/src/Row.h b/src/Row.h
index a4be0ad..8dc4112 100644
--- a/src/Row.h
+++ b/src/Row.h
@@ -206,9 +206,9 @@ public:
///
pos_type endpos() const { return end_; }
///
- void right_boundary(bool b) { right_boundary_ = b; }
+ void end_boundary(bool b) { end_boundary_ = b; }
///
- bool right_boundary() const { return right_boundary_; }
+ bool end_boundary() const { return end_boundary_; }
///
void flushed(bool b) { flushed_ = b; }
///
@@ -368,7 +368,7 @@ private:
/// one behind last pos covered by this row
pos_type end_ = 0;
// Is there a boundary at the end of the row (display inset...)
- bool right_boundary_ = false;
+ bool end_boundary_ = false;
// Shall the row be flushed when it is supposed to be justified?
bool flushed_ = false;
/// Row dimension.
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 53b6838..00fb217 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1059,7 +1059,7 @@ void cleanupRow(Row & row, bool at_end)
if (!at_end && !row.flushed())
row.back().rtrim();
// boundary exists when there was no space at the end of row
- row.right_boundary(!at_end && row.back().endpos == row.endpos());
+ row.end_boundary(!at_end && row.back().endpos == row.endpos());
// make sure that the RTL elements are in reverse ordering
row.reverseRTL();
}
@@ -1368,7 +1368,7 @@ pos_type TextMetrics::getPosNearX(Row const & row, int &
x,
|| inset->lyxCode() == SEPARATOR_CODE))
pos = row.back().pos;
else
- boundary = row.right_boundary();
+ boundary = row.end_boundary();
}
x += xo - offset;
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
