Small bugfix for cursor-misplacement and insert of BREAKLINES

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@644 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 1b2a1993d3918d39b9fabc29bd1872e3c21d52f2..9ee7fe29a1adcf6863f234bdfa3b35fbd9f03221 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-04-10  Juergen Vigna  <jug@sad.it>
 
+       * src/BufferView2.C (showLockedInsetCursor): small bugfix for
+       misplaced cursor when inset in inset is locked.
+
+       * src/insets/insettext.C (LocalDispatch): small fix so that a
+       BREAKLINE is not inserted if we don't permit it with autBreakRows.
+
        * src/insets/insetfoot.C (GetDrawFont): implemented this as the
        footnote font should be decreased in size twice when displaying.
 

diff --git a/src/BufferView2.C b/src/BufferView2.C
index b4b46aa6536c40e4f07cb7884ac300e32cebf13e..267d88a0aa9018291bb5526a3b5929654a21b4df 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -739,7 +739,8 @@ int BufferView::lockInset(UpdatableInset * inset)
 void BufferView::showLockedInsetCursor(long x, long y, int asc, int desc)
 {
        if (the_locking_inset && available()) {
-               y += text->cursor.y;
+               y += text->cursor.y +
+                   the_locking_inset->InsetInInsetY();
                pimpl_->screen->ShowManualCursor(x, y, asc, desc,
                                         LyXScreen::BAR_SHAPE);
        }

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 08da8ce5abe0cb01713e6150efe8637abbbcc37c..4ec94b672158065a474490472a79278b82eff34c 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -693,6 +693,8 @@ InsetText::LocalDispatch(BufferView * bv,
        return DISPATCHED;
     case LFUN_BREAKPARAGRAPH:
     case LFUN_BREAKLINE:
+       if (!autoBreakRows)
+           return DISPATCHED;
        bv->text->SetUndo(Undo::INSERT, 
            bv->text->cursor.par->ParFromPos(bv->text->cursor.pos)->previous,
            bv->text->cursor.par->ParFromPos(bv->text->cursor.pos)->next);