From 79ba8fe22a957123f47a1b125b9e74efbd698397 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Wed, 29 Aug 2007 23:06:14 +0000 Subject: [PATCH] Bug fixes. changed_ was always true... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19901 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Row.cpp | 2 -- src/Row.h | 2 ++ src/TextMetrics.cpp | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Row.cpp b/src/Row.cpp index 4bba320cf2..3bf393b7ce 100644 --- a/src/Row.cpp +++ b/src/Row.cpp @@ -51,14 +51,12 @@ void Row::setDimension(Dimension const & dim) void Row::pos(pos_type p) { - changed_ |= p != pos_; pos_ = p; } void Row::endpos(pos_type p) { - changed_ |= p != end_; end_ = p; } diff --git a/src/Row.h b/src/Row.h index 6d57857680..2838f48e74 100644 --- a/src/Row.h +++ b/src/Row.h @@ -36,6 +36,8 @@ public: /// bool changed() const { return changed_; } /// + void setChanged(bool c) { changed_ = c; } + /// void setCrc(size_type crc); /// void pos(pos_type p); diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 5bdd4c2755..5dd582195a 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -247,6 +247,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) if (row_index == pm.rows().size()) pm.rows().push_back(Row()); Row & row = pm.rows()[row_index]; + row.setChanged(false); row.pos(first); row.endpos(end); row.setDimension(dim); @@ -271,6 +272,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) if (row_index == pm.rows().size()) pm.rows().push_back(Row()); Row & row = pm.rows()[row_index]; + row.setChanged(false); row.pos(first); row.endpos(first); row.setDimension(dim); @@ -1021,7 +1023,8 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y, // 12 lines lower): if (lyxerr.debugging(Debug::PAINTING)) { if (text_->isMainText(bv_->buffer())) - LYXERR(Debug::PAINTING) << "#"; + LYXERR(Debug::PAINTING) << "#" << + repaintAll << row_has_changed; else LYXERR(Debug::PAINTING) << "[" << repaintAll << row_has_changed << "]"; -- 2.39.5