anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

At metrics time, store paragraph id too

Browse Source 
Instead of actually fixing the messiness of InsetInfo, let's just fix
the symptom and avoid the access to Paragraph::id() that was crashing
LyX every time updateBuffer/validate/metrics/draw did not happen in
the right order.

Fixes bug #12639.
This commit is contained in:
Jean-Marc Lasgouttes 2023-02-22 18:09:03 +01:00
parent 190d2ba2c3
commit 00c39208ac
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ParagraphMetrics.cpp
View File

@ -42,7 +42,7 @@ namespace lyx {
ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
position_(-1), par_(&par)
position_(-1), id_(par.id()), par_(&par)
{}

4
src/ParagraphMetrics.h
View File

@ -72,11 +72,15 @@ public:
///
int position() const { return position_; }
void setPosition(int position);
///
int id() const { return id_; }
private:
///
int position_;
///
int id_;
///
mutable RowList rows_;
/// cached dimensions of paragraph
Dimension dim_;

2
src/TextMetrics.cpp
View File

@ -1986,7 +1986,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
swap(pi.leftx, pi.rightx);
BookmarksSection::BookmarkPosList bpl =
theSession().bookmarks().bookmarksInPar(bv_->buffer().fileName(), pm.par().id());
theSession().bookmarks().bookmarksInPar(bv_->buffer().fileName(), pm.id());
for (size_t i = 0; i != nrows; ++i) {