anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix flushing of row that was cut after an hyphen

Browse Source 
When using Qt stuff in breakAt, it may happen that the row is broken
after an hyphen (whereas the old code would only consider spaces).

The fact that we abuse the Row::right_boundary() property to detect when
a row should be flushed broke justification when a row is cut at an
hyphen.

Fix this by introducing a new Row::flushed() property and set it as needed.
This commit is contained in:
Jean-Marc Lasgouttes 2017-01-27 16:09:03 +01:00
parent ef387c81af
commit 8e7d0c2002
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Row.cpp
View File

@ -164,7 +164,7 @@ Row::Row()
sel_beg(-1), sel_end(-1),
begin_margin_sel(false), end_margin_sel(false),
changed_(false), crc_(0),
pit_(0), pos_(0), end_(0), right_boundary_(false)
pit_(0), pos_(0), end_(0), right_boundary_(false), flushed_(false)
{}

8
src/Row.h
View File

@ -171,6 +171,10 @@ public:
void right_boundary(bool b) { right_boundary_ = b; }
///
bool right_boundary() const { return right_boundary_; }
///
void flushed(bool b) { flushed_ = b; }
///
bool flushed() const { return flushed_; }
///
Dimension const & dimension() const { return dim_; }
@ -310,8 +314,10 @@ private:
pos_type pos_;
/// one behind last pos covered by this row
pos_type end_;
// Is there is a boundary at the end of the row (display inset...)
// Is there a boundary at the end of the row (display inset...)
bool right_boundary_;
// Shall the row be flushed when it is supposed to be justified?
bool flushed_;
/// Row dimension.
Dimension dim_;
};

14
src/TextMetrics.cpp
View File

@ -561,8 +561,7 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
// not justify stuff, then don't stretch.
// A forced block alignment can only be overridden the 'no
// justification on screen' setting.
if (((row.right_boundary() || row.endpos() == par.size())
&& !forced_block)
if ((row.flushed() && !forced_block)
|| !bv_->buffer().params().justification)
align = text_->isRTL(par) ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT;
}
@ -911,7 +910,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
&& inset->display())
|| (!row.empty() && row.back().inset
&& row.back().inset->display())) {
row.right_boundary(true);
row.flushed(true);
need_new_row = par.isNewline(i);
++i;
break;
@ -943,8 +942,13 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
// of success, reset indication that the row was broken abruptly.
int const next_width = max_width_ - leftMargin(max_width_, row.pit(), row.endpos())
- rightMargin(row.pit());
if (row.shortenIfNeeded(body_pos, width, next_width))
row.right_boundary(!row.empty() && row.back().endpos == row.endpos());
row.shortenIfNeeded(body_pos, width, next_width);
row.right_boundary(!row.empty() && row.endpos() < end
&& row.back().endpos == row.endpos());
// Last row in paragraph is flushed
if (row.endpos() == end)
row.flushed(true);
// make sure that the RTL elements are in reverse ordering
row.reverseRTL(is_rtl);