From 0b8a4897109c571d35ac372dd1377f0a6891ec26 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 2 Jun 2003 17:58:19 +0000 Subject: [PATCH] remove double call to metrics() git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7087 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 7 +++++++ src/insets/inseterror.C | 15 ++++----------- src/insets/insetgraphics.C | 9 +-------- src/insets/insetlatexaccent.C | 7 ------- src/mathed/formula.C | 12 +++--------- src/mathed/formulamacro.C | 15 ++++----------- 6 files changed, 19 insertions(+), 46 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index b8c2c8f693..b10aa5479f 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ + +2003-06-02 André Pönitz + + * inseterror.C: + * insetgraphics.C: + * insetlatexaccent.C: remove duplicated call to metrics() + 2003-06-02 John Levon * insettabular.C: fix resize of column width diff --git a/src/insets/inseterror.C b/src/insets/inseterror.C index ae0d0b125c..d4dc0ab2f8 100644 --- a/src/insets/inseterror.C +++ b/src/insets/inseterror.C @@ -13,7 +13,6 @@ #include "inseterror.h" #include "BufferView.h" -#include "dimension.h" #include "funcrequest.h" #include "gettext.h" #include "lyxfont.h" @@ -83,16 +82,10 @@ void InsetError::draw(PainterInfo & pi, int x, int y) const // Draw as "Error" in a framed box x += 1; - Dimension dim; - MetricsInfo mi; - mi.base.bv = pi.base.bv; - mi.base.font = pi.base.font; - metrics(mi, dim); - dim_ = dim; - pi.pain.fillRectangle(x, y - dim.asc + 1, - dim.wid - 2, dim.asc + dim.des - 2, LColor::insetbg); - pi.pain.rectangle(x, y - dim.asc + 1, - dim.wid - 2, dim.asc + dim.des - 2, LColor::error); + pi.pain.fillRectangle(x, y - dim_.asc + 1, + dim_.wid - 2, dim_.asc + dim_.des - 2, LColor::insetbg); + pi.pain.rectangle(x, y - dim_.asc + 1, + dim_.wid - 2, dim_.asc + dim_.des - 2, LColor::error); pi.pain.text(x + 2, y, _("Error"), efont); } diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 86df4442a0..9ef8a9d0dc 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -342,19 +342,12 @@ void InsetGraphics::draw(PainterInfo & pi, int x, int y) const cache_->view = bv->owner()->view(); int oasc = cache_->old_ascent; - Dimension dim; - MetricsInfo mi; - mi.base.bv = pi.base.bv; - mi.base.font = pi.base.font; - metrics(mi, dim); - dim_ = dim; - // we may have changed while someone other was drawing us so better // to not draw anything as we surely call to redraw ourself soon. // This is not a nice thing to do and should be fixed properly somehow. // But I still don't know the best way to go. So let's do this like this // for now (Jug 20020311) - if (dim.asc != oasc) + if (dim_.asc != oasc) return; // Make sure now that x is updated upon exit from this routine diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C index 3fd62aa645..7ff01fe7fc 100644 --- a/src/insets/insetlatexaccent.C +++ b/src/insets/insetlatexaccent.C @@ -362,13 +362,6 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) font.setLanguage(english_language); - Dimension dim; - MetricsInfo mi; - mi.base.bv = pi.base.bv; - mi.base.font = pi.base.font; - metrics(mi, dim); - dim_ = dim; - if (candisp) { float x2 = x + (rbearing(font) - lbearing(font)) / 2.0; float hg; diff --git a/src/mathed/formula.C b/src/mathed/formula.C index b388923e7c..de1f5640d8 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -219,15 +219,9 @@ void InsetFormula::draw(PainterInfo & pi, int x, int y) const // before the metrics are computed. bool const use_preview = preview_->previewReady(); - Dimension dim; - MetricsInfo mi; - mi.base.bv = pi.base.bv; - mi.base.font = pi.base.font; - metrics(mi, dim); - dim_ = dim; - int const w = dim.wid; - int const d = dim.des; - int const a = dim.asc; + int const w = dim_.wid; + int const d = dim_.des; + int const a = dim_.asc; int const h = a + d; if (use_preview) { diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 42f8f19755..a04e1b0948 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -132,9 +132,8 @@ string InsetFormulaMacro::prefix() const } -void InsetFormulaMacro::metrics(MetricsInfo & m, Dimension & dim) const +void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const { - MetricsInfo mi = m; par()->metrics(mi, dim_); dim_.asc += 5; dim_.des += 5; @@ -171,15 +170,9 @@ void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const pi.base.style = LM_ST_TEXT; pi.base.font = font; - Dimension dim; - MetricsInfo mi; - mi.base.bv = pi.base.bv; - mi.base.font = pi.base.font; - metrics(mi, dim); - dim_ = dim; - int const a = y - dim.asc + 1; - int const w = dim.wid - 2; - int const h = dim.height() - 2; + int const a = y - dim_.asc + 1; + int const w = dim_.wid - 2; + int const h = dim_.height() - 2; // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg); -- 2.39.2