From 29b99d383d9b16d1af86339883e13b200376f088 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Vigna?= Date: Fri, 23 Mar 2001 10:39:16 +0000 Subject: [PATCH] Fixed cursor position in minipages and small draw-fix in insettext. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1812 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/POTFILES.in | 5 +++++ src/insets/ChangeLog | 9 +++++++++ src/insets/insetcollapsable.C | 14 ++------------ src/insets/insettext.C | 2 ++ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index d6b8043520..b864e7206a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -69,10 +69,15 @@ src/frontends/qt2/FileDialog.C src/frontends/qt2/FormCharacter.C src/frontends/qt2/FormCitation.C src/frontends/qt2/FormCopyright.C +src/frontends/qt2/FormDocument.C +src/frontends/qt2/FormIndex.C src/frontends/qt2/FormParagraph.C src/frontends/qt2/FormPrint.C +src/frontends/qt2/FormRef.C src/frontends/qt2/FormSearch.C src/frontends/qt2/FormTabularCreate.C +src/frontends/qt2/FormToc.C +src/frontends/qt2/FormUrl.C src/frontends/qt2/paragraphdlgimpl.C src/frontends/qt2/tabularcreatedlgimpl.C src/frontends/xforms/combox.C diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 8e232300f4..cd96552f52 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,12 @@ +2001-03-23 Juergen Vigna + + * insettext.C (draw): force a FULL update if cleared == true. + + * insetcollapsable.C (draw): Lars forgotten entry for changing this + routine to draw the minipages on its position-flag. + (InsetInInsetY): give back the right y position, because of minipage + position-flag. + 2001-03-23 José Abílio Matos * insetfloat.h diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index a359a94972..2802e0507d 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -199,25 +199,15 @@ void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, cleared = true; } - // not needed if collapsed top_x = int(x); top_baseline = baseline; -#if 0 - draw_collapsed(pain, f, baseline, x); - inset->draw(bv, f, baseline, x, cleared); -#else -#warning Jürgen, can you have a look at this? (Lgb) - // the intention is quite clear if you set the positon in a minipage you - // want the minipage drawn according to that. but as you can see the - // cursor is wrongly placed. draw_collapsed(pain, f, baseline - ascent(bv, f) + ascent_collapsed(pain, f), x); - inset->draw(bv, f, + inset->draw(bv, f, baseline - ascent(bv, f) + ascent_collapsed(pain, f), x, cleared); -#endif need_update = NONE; } @@ -402,7 +392,7 @@ bool InsetCollapsable::UpdateInsetInInset(BufferView * bv, Inset *in) unsigned int InsetCollapsable::InsetInInsetY() { - return inset->InsetInInsetY(); + return inset->InsetInInsetY() - (top_baseline - inset->y()); } diff --git a/src/insets/insettext.C b/src/insets/insettext.C index c887bc7399..6c2c89ec3f 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -352,6 +352,8 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, bv->text->status = LyXText::CHANGED_IN_DRAW; return; } + if (cleared) + need_update = FULL; top_baseline = baseline; top_y = baseline - ascent(bv, f); -- 2.39.5