anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make LABEL_MANUAL label breakable when larger than the screen.

Browse Source 
This is what the situation was in 2.3.X.
This commit is contained in:
Jean-Marc Lasgouttes 2022-01-17 17:33:21 +01:00
parent 6f7505300e
commit da3c3796ee
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Row.cpp
View File

@ -460,12 +460,12 @@ void Row::add(pos_type const pos, Inset const * ins, Dimension const & dim,
void Row::add(pos_type const pos, char_type const c,
Font const & f, Change const & ch, bool can_break)
Font const & f, Change const & ch)
{
if (!sameString(f, ch)) {
finalizeLast();
Element e(STRING, pos, f, ch);
e.row_flags = can_break ? CanBreakInside : Inline;
e.row_flags = CanBreakInside;
elements_.push_back(e);
}
back().str += c;

2
src/Row.h
View File

@ -250,7 +250,7 @@ public:
Font const & f, Change const & ch);
///
void add(pos_type pos, char_type const c,
Font const & f, Change const & ch, bool can_break);
Font const & f, Change const & ch);
///
void addVirtual(pos_type pos, docstring const & s,
Font const & f, Change const & ch);

4
src/TextMetrics.cpp
View File

@ -916,10 +916,10 @@ Row TextMetrics::tokenizeParagraph(pit_type const pit) const
// ⤶ U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS
// ¶ U+00B6 PILCROW SIGN
char_type const screen_char = (c == 0x2028) ? 0x2936 : 0x00B6;
row.add(i, screen_char, *fi, par.lookupChange(i), i >= body_pos);
row.add(i, screen_char, *fi, par.lookupChange(i));
} else
// row elements before body are unbreakable
row.add(i, c, *fi, par.lookupChange(i), i >= body_pos);
row.add(i, c, *fi, par.lookupChange(i));
// add inline completion width
// draw logically behind the previous character