From: Jürgen Vigna Date: Mon, 23 Jul 2001 13:44:23 +0000 (+0000) Subject: Removed widthCollapsed variable, and LyXFont param from x_collapsed functions. X-Git-Tag: 1.6.10~21032 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=37274eb840a7af8ef0acaf12649f31a8d229b110;p=features.git Removed widthCollapsed variable, and LyXFont param from x_collapsed functions. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2306 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index bee44e9cd4..451e07d328 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,5 +1,9 @@ 2001-07-23 Juergen Vigna + * insetcollapsable.h: removed widthCollapsed variable, LyXFont + parameter on the _collapsed function (was not needed) and call + always width_collapsed(). + * insetert.C (InsetERT): use setLabel with "true" flag. * insetcollapsable.C: modified various functions to set the draw_label diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index 9e573c273a..596a8cb39f 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -36,7 +36,7 @@ InsetCollapsable::InsetCollapsable(bool collapsed) : UpdatableInset(), collapsed_(collapsed), button_length(0), button_top_y(0), button_bottom_y(0), label("Label"), draw_label(label), autocollapse(true), - widthCollapsed(0), oldWidth(0), need_update(FULL), + oldWidth(0), need_update(FULL), inlined(false), change_label_with_text(false) @@ -90,7 +90,7 @@ void InsetCollapsable::read(Buffer const * buf, LyXLex & lex) } -int InsetCollapsable::ascent_collapsed(Painter & pain, LyXFont const &) const +int InsetCollapsable::ascent_collapsed(Painter & pain) const { int width = 0; int ascent = 0; @@ -101,7 +101,7 @@ int InsetCollapsable::ascent_collapsed(Painter & pain, LyXFont const &) const } -int InsetCollapsable::descent_collapsed(Painter & pain, LyXFont const &) const +int InsetCollapsable::descent_collapsed(Painter & pain) const { int width = 0; int ascent = 0; @@ -112,7 +112,7 @@ int InsetCollapsable::descent_collapsed(Painter & pain, LyXFont const &) const } -int InsetCollapsable::width_collapsed(Painter & pain, LyXFont const &) const +int InsetCollapsable::width_collapsed(Painter & pain) const { int width; int ascent; @@ -123,18 +123,18 @@ int InsetCollapsable::width_collapsed(Painter & pain, LyXFont const &) const } -int InsetCollapsable::ascent(BufferView * bv, LyXFont const & font) const +int InsetCollapsable::ascent(BufferView * bv, LyXFont const &) const { - return ascent_collapsed(bv->painter(), font); + return ascent_collapsed(bv->painter()); } int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const { if (collapsed_) - return descent_collapsed(bv->painter(), font); + return descent_collapsed(bv->painter()); - return descent_collapsed(bv->painter(), font) + return descent_collapsed(bv->painter()) + inset.descent(bv, font) + inset.ascent(bv, font) + TEXT_TO_BOTTOM_OFFSET; @@ -143,18 +143,17 @@ int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const { - widthCollapsed = width_collapsed(bv->painter(), font); - if (collapsed_) - return widthCollapsed; + return width_collapsed(bv->painter()); + + int widthCollapsed = width_collapsed(bv->painter()); return (inset.width(bv, font) > widthCollapsed) ? inset.width(bv, font) : widthCollapsed; } -void InsetCollapsable::draw_collapsed(Painter & pain, LyXFont const &, - int baseline, float & x) const +void InsetCollapsable::draw_collapsed(Painter & pain, int baseline, float & x) const { int width = 0; pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET, @@ -171,16 +170,13 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, Painter & pain = bv->painter(); - if (!widthCollapsed) - widthCollapsed = width_collapsed(pain, f); - - button_length = widthCollapsed; + button_length = width_collapsed(pain); button_top_y = -ascent(bv, f); - button_bottom_y = -ascent(bv, f) + ascent_collapsed(pain,f) + - descent_collapsed(pain, f); + button_bottom_y = -ascent(bv, f) + ascent_collapsed(pain) + + descent_collapsed(pain); if (collapsed_) { - draw_collapsed(pain, f, baseline, x); + draw_collapsed(pain, baseline, x); x += TEXT_TO_INSET_OFFSET; return; } @@ -224,11 +220,11 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, top_x = int(x); top_baseline = baseline; - int const bl = baseline - ascent(bv, f) + ascent_collapsed(pain, f); + int const bl = baseline - ascent(bv, f) + ascent_collapsed(pain); - draw_collapsed(pain, f, bl, old_x); + draw_collapsed(pain, bl, old_x); inset.draw(bv, f, - bl + descent_collapsed(pain, f) + inset.ascent(bv, f), + bl + descent_collapsed(pain) + inset.ascent(bv, f), x, cleared); need_update = NONE; } @@ -251,8 +247,8 @@ void InsetCollapsable::edit(BufferView * bv, int xp, int yp, return; LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + yp - - (ascent_collapsed(bv->painter(), font) + - descent_collapsed(bv->painter(), font) + + (ascent_collapsed(bv->painter()) + + descent_collapsed(bv->painter()) + inset.ascent(bv, font)); inset.edit(bv, xp, yy, button); } @@ -309,8 +305,8 @@ void InsetCollapsable::insetButtonPress(BufferView * bv, int x, int y, if (!collapsed_ && (y > button_bottom_y)) { LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + y - - (ascent_collapsed(bv->painter(), font) + - descent_collapsed(bv->painter(), font) + + (ascent_collapsed(bv->painter()) + + descent_collapsed(bv->painter()) + inset.ascent(bv, font)); inset.insetButtonPress(bv, x, yy, button); } @@ -340,8 +336,8 @@ void InsetCollapsable::insetButtonRelease(BufferView * bv, } else if (!collapsed_ && (y > button_top_y)) { LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + y - - (ascent_collapsed(bv->painter(), font) + - descent_collapsed(bv->painter(), font) + + (ascent_collapsed(bv->painter()) + + descent_collapsed(bv->painter()) + inset.ascent(bv, font)); inset.insetButtonRelease(bv, x, yy, button); } @@ -354,8 +350,8 @@ void InsetCollapsable::insetMotionNotify(BufferView * bv, if (x > button_bottom_y) { LyXFont font(LyXFont::ALL_SANE); int yy = ascent(bv, font) + y - - (ascent_collapsed(bv->painter(), font) + - descent_collapsed(bv->painter(), font) + + (ascent_collapsed(bv->painter()) + + descent_collapsed(bv->painter()) + inset.ascent(bv, font)); inset.insetMotionNotify(bv, x, yy, state); } @@ -386,43 +382,14 @@ int InsetCollapsable::getMaxWidth(BufferView * bv, return w; } // should be at least 30 pixels !!! - return max(30, w - widthCollapsed); + return max(30, w - width_collapsed(bv->painter())); } void InsetCollapsable::update(BufferView * bv, LyXFont const & font, bool reinit) { -#if 0 - if (reinit) { - need_update = FULL; - if (owner()) - owner()->update(bv, font, true); - return; - } - if (!widthCollapsed) { - widthCollapsed = width_collapsed(bv->painter(), font); - inset.resizeLyXText(bv); - need_update = FULL; - if (owner()) { - owner()->update(bv, font); - return; - } - } - if (oldWidth != width(bv, font)) { - oldWidth = width(bv, font); - inset.resizeLyXText(bv); - need_update = FULL; - if (owner()) { - owner()->update(bv, font); - return; - } - } -#else - if (!widthCollapsed) - widthCollapsed = width_collapsed(bv->painter(), font); inset.update(bv, font, reinit); -#endif } diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 66db8f4a84..8d6f61a8c8 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -187,13 +187,13 @@ public: protected: /// - int ascent_collapsed(Painter &, LyXFont const &) const; + int ascent_collapsed(Painter &) const; /// - int descent_collapsed(Painter &, LyXFont const &) const; + int descent_collapsed(Painter &) const; /// - int width_collapsed(Painter &, LyXFont const & f) const; + int width_collapsed(Painter &) const; /// - void draw_collapsed(Painter & pain, const LyXFont &, int , float &) const; + void draw_collapsed(Painter & pain, int , float &) const; /// int getMaxTextWidth(Painter & pain, UpdatableInset const *) const; @@ -224,8 +224,6 @@ private: /// bool autocollapse; /// - mutable int widthCollapsed; - /// mutable int oldWidth; /// mutable int topx; diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C index c827af9d8c..1f3ee2e054 100644 --- a/src/insets/insetminipage.C +++ b/src/insets/insetminipage.C @@ -193,7 +193,7 @@ Inset * InsetMinipage::clone(Buffer const &, bool same_id) const int InsetMinipage::ascent(BufferView * bv, LyXFont const & font) const { if (collapsed_) - return ascent_collapsed(bv->painter(), font); + return ascent_collapsed(bv->painter()); else { // Take placement into account. int i = 0; @@ -217,7 +217,7 @@ int InsetMinipage::ascent(BufferView * bv, LyXFont const & font) const int InsetMinipage::descent(BufferView * bv, LyXFont const & font) const { if (collapsed_) - return descent_collapsed(bv->painter(), font); + return descent_collapsed(bv->painter()); else { // Take placement into account. int i = 0;