[LyX/master] Revert "Fix crash with info inset and dialogs"

Jean-Marc Lasgouttes lasgouttes at lyx.org
Wed Feb 8 15:10:38 UTC 2023


commit 2a626f76fd13bdbc5afb17a4bb4e4d9c2d94a75a
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Wed Feb 8 12:53:39 2023 +0100

    Revert "Fix crash with info inset and dialogs"
    
    This reverts commit 17e60e2e8559e5b702189c82a5a746b9f41cd219.
---
 src/insets/InsetInfo.cpp |    8 +-------
 src/insets/InsetInfo.h   |    2 --
 2 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index f2d3b93..46d656c 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -467,7 +467,7 @@ string InsetInfoParams::infoType() const
 
 
 InsetInfo::InsetInfo(Buffer * buf, string const & info)
-	: InsetCollapsible(buf), initialized_(false), dirty_(true)
+	: InsetCollapsible(buf), initialized_(false)
 {
 	params_.type = InsetInfoParams::UNKNOWN_INFO;
 	params_.force_ltr = false;
@@ -779,19 +779,15 @@ void InsetInfo::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	const_cast<InsetInfo *>(this)->build();
 	InsetCollapsible::metrics(mi, dim);
-	dirty_ = false;
 }
 
 
 void InsetInfo::draw(PainterInfo & pi, int x, int y) const
 {
-	if (dirty_)
-		return;
 	Changer chg = changeVar(lyxrc.mark_foreign_language, false);
 	InsetCollapsible::draw(pi, x, y);
 }
 
-
 void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 
 {
@@ -1239,8 +1235,6 @@ void InsetInfo::build()
 	}
 	}
 
-	// indicate that metrics are not usable anymore
-	dirty_ = true;
 	// Just to do something with that string
 	LYXERR(Debug::INFO, "info inset text: " << gui);
 }
diff --git a/src/insets/InsetInfo.h b/src/insets/InsetInfo.h
index 17d60e2..3531b41 100644
--- a/src/insets/InsetInfo.h
+++ b/src/insets/InsetInfo.h
@@ -236,8 +236,6 @@ private:
 	void build();
 	///
 	bool initialized_;
-	/// true when metrics Row object should not be used
-	mutable bool dirty_;
 	///
 	InsetInfoParams params_;
 	///


More information about the lyx-cvs mailing list