Get rid of Inset::setDimCache

This helper method is used to set the inset dimension cache at metrics
time. However this is already done by the metrics code itself
(MathRow::metrics, TextMetrics::redoParagraph), so that there is no
need to do this same work again in a different place.

Also, InsetPhantom::metrics is removed, since it does not do anything
interesting.

This commit comes with a mild risk attached (it might be that some of
these calls were useful after all!), but all of this is fixable.

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index c00f27e28de3f6250c38098a2b2a634af92f215d..21d54e0bc907a6b48d5de0450e96b252bf8c39ff 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -625,12 +625,6 @@ ColorCode Inset::labelColor() const
 }
 
 
-void Inset::setDimCache(MetricsInfo const & mi, Dimension const & dim) const
-{
-       mi.base.bv->coordCache().insets().add(this, dim);
-}
-
-
 Buffer const * Inset::updateFrontend() const
 {
        //FIXME (Abdel 03/12/10): see bugs #6814 and #6949

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 1b3f85ebc7ae08cb71a1f29f1db73c0a5cd39bf2..4f6db3af063f50c4bd6892340a0dd1bc5c96023c 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -216,8 +216,6 @@ public:
        int xo(BufferView const & bv) const;
        /// last drawn position for 'important' insets
        int yo(BufferView const & bv) const;
-       ///
-       void setDimCache(MetricsInfo const &, Dimension const &) const;
        /// do we cover screen position x/y?
        bool covers(BufferView const & bv, int x, int y) const;
        /// get the screen positions of the cursor (see note in Cursor.cpp)

diff --git a/src/insets/InsetIPA.cpp b/src/insets/InsetIPA.cpp
index a574da86c55601863c82f72fcdeb1e623e894185..29ed00037fa0e010577db6f3bcc2934b31c4d287 100644 (file)
--- a/src/insets/InsetIPA.cpp
+++ b/src/insets/InsetIPA.cpp
@@ -188,8 +188,6 @@ void InsetIPA::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.des += TEXT_TO_INSET_OFFSET;
                // insert a one pixel gap
                dim.wid += 1;
-               // Cache the inset dimension.
-               setDimCache(mi, dim);
                Dimension dim_dummy;
                MetricsInfo mi_dummy = mi;
                InsetText::metrics(mi_dummy, dim_dummy);

diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp
index bf3cab5c3b20cfb41cd829930644c36d2d9e405e..7852486b7d60ce7333f3a4c12a6d826706bdb3d0 100644 (file)
--- a/src/insets/InsetIPAMacro.cpp
+++ b/src/insets/InsetIPAMacro.cpp
@@ -173,9 +173,6 @@ void InsetIPADeco::metrics(MetricsInfo & mi, Dimension & dim) const
                theFontMetrics(font).rectText(label, w, a, d);
                dim.des += int(d * 1.5);
        }
-
-       // cache the inset dimension
-       setDimCache(mi, dim);
 }
 
 
@@ -413,7 +410,6 @@ void InsetIPAChar::metrics(MetricsInfo & mi, Dimension & dim) const
        }
        docstring ds(s.begin(), s.end());
        dim.wid = fm.width(ds);
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index 46e017f99bc0d8134a7f2eb938c34dbbcd19ee02..dc75aa42516a0e8b6597864d5d09e37f5a2cadd3 100644 (file)
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -132,9 +132,6 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 
        dim.asc = max(fm.maxAscent(), offset_ + height_);
        dim.des = max(fm.maxDescent(), - offset_);
-
-       // Cache the inset dimension
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index b369ce1b7e7d915f66aa675fd4f88e056219eac9..e83f56dc705348556b60b667c8aa954eb2debc1a 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -103,8 +103,6 @@ void InsetNewpage::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.asc = defaultRowHeight();
        dim.des = defaultRowHeight();
        dim.wid = mi.base.textwidth;
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index 78bc55ed82ab993d6b2557f80b8860ad7143f390..8a156ea2f1f9064fe248db00dedce608d39b5558 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -135,15 +135,6 @@ docstring InsetPhantom::layoutName() const
 }
 
 
-void InsetPhantom::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-       InsetCollapsable::metrics(mi, dim);
-
-       // cache the inset dimension
-       setDimCache(mi, dim);
-}
-
-
 void InsetPhantom::draw(PainterInfo & pi, int x, int y) const
 {
        // draw the text

diff --git a/src/insets/InsetPhantom.h b/src/insets/InsetPhantom.h
index fad50637b23f3206bfe6b277bb91b31df0aa15b8..42c3da1f26cebc94216ca86d857ceae44e9b4c7d 100644 (file)
--- a/src/insets/InsetPhantom.h
+++ b/src/insets/InsetPhantom.h
@@ -62,8 +62,6 @@ private:
        ///
        docstring layoutName() const;
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
-       ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
        void write(std::ostream &) const;

diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp
index 739322b9b05fffdac82870dea43e8b4a26712454..c306ae91d21ea3678bf31f7ec935e96073f74a5d 100644 (file)
--- a/src/insets/InsetPreview.cpp
+++ b/src/insets/InsetPreview.cpp
@@ -174,8 +174,6 @@ void InsetPreview::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.des += TEXT_TO_INSET_OFFSET;
                // insert a one pixel gap
                dim.wid += 1;
-               // Cache the inset dimension.
-               setDimCache(mi, dim);
                Dimension dim_dummy;
                MetricsInfo mi_dummy = mi;
                InsetText::metrics(mi_dummy, dim_dummy);

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 7d76f3f62ea0a4dfb2c0bb9fec2c4bbb667ff892..6593d045deee24cb593fcd2a01ac346fb9517844 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -260,8 +260,6 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
                        // shut up compiler
                        break;
        }
-       // Cache the inset dimension.
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index b6bcb479c886829ae8b8a7de5cd49118fd18b11d..462620532b463b800befefa39e466719f07c5466 100644 (file)
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -129,8 +129,6 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
        }
        if (dim.wid == 0)
                dim.wid = fm.width(s);
-
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 461933cb564ef785084ac55a7f3b78a1346557cd..d4e1aaf4a8f8d9773e3f0953593c6bfdd2c30e8d 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -150,8 +150,6 @@ void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.asc = height / 2 + (a - d) / 2; // align cursor with the
        dim.des = height - dim.asc;         // label text
        dim.wid = ADD_TO_VSPACE_WIDTH + 2 * vspace_arrow_size + 5 + w;
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/mathed/CommandInset.cpp b/src/mathed/CommandInset.cpp
index 6b9466481cd44c8a948130ee409208c164ccb1fb..0c9e585e1a7a976893db08d832889aba627b0c8b 100644 (file)
--- a/src/mathed/CommandInset.cpp
+++ b/src/mathed/CommandInset.cpp
@@ -43,8 +43,6 @@ void CommandInset::metrics(MetricsInfo & mi, Dimension & dim) const
                button_.update(screenLabel(), true);
        }
        button_.metrics(mi, dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index fca8f380d24ed759edf718555b31f9b519ee82c7..72adce74a2586fa2848631d5fd522d5b8c0eb611 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -589,8 +589,6 @@ void InsetMathGrid::metrics(MetricsInfo & mi, Dimension & dim) const
 */
        dim.wid += leftMargin() + rightMargin();
        metricsMarkers2(mi, dim);
-       // Cache the inset dimension.
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 402770738b84cdb1375b610ee6470eab1710fa5f..807475e63aa771ed8381db02f0bc10d6424ed2f0 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -515,8 +515,6 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
                        if (display())
                                dim.des += displayMargin();
                }
-               // Cache the inset dimension.
-               setDimCache(mi, dim);
                return;
        }
 
@@ -550,9 +548,6 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
        math_font_max_dim(mi.base.font, asc, des);
        dim.asc = max(dim.asc, asc);
        dim.des = max(dim.des, des);
-       // Cache the inset dimension.
-       // FIXME: This will overwrite InsetMathGrid dimension, is that OK?
-       setDimCache(mi, dim);
 }
 
 

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 2a7dc774d6e86b0f5c1b353eb73d3bcbf0c3f2ee..2ac8703cb0cfa6fc4c8ebe470b7a61a266dcd165 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -578,8 +578,6 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.wid += 6;
        dim.des += 2;
        dim.asc += 2;
-
-       setDimCache(mi, dim);
 }