From ee1163d8e8cbe814912f3498f42fa65a55f22bb7 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Tue, 8 Mar 2005 10:02:03 +0000 Subject: [PATCH] Fix bug 1792 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9704 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 +++++- src/text2.C | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index adc809859b..86821265b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,6 @@ +2005-03-08 Martin Vermeer + + * text2.C: fix for cursor up/down stuck in math [bug 1792] 2005-03-07 Alfredo Braunstein @@ -13,6 +16,7 @@ * dociterator.C: include , which is needed when assertions are disabled. +>>>>>>> 1.2135 2005-03-05 Johnathan Burchill * text2.C: fix for stuck cursor when traversing two @@ -28,7 +32,7 @@ * paragraph.C: fix for confused change tracker when pasting text that begins with a lineseparator. [bug 1827] (setChange(0, Change::INSERTED);) - + * paragraph_funcs.C: fix for lost changes on triple-paste in change tracking mode [bug 1827] (par.setChange()). diff --git a/src/text2.C b/src/text2.C index 1f52b8a41f..917808ec83 100644 --- a/src/text2.C +++ b/src/text2.C @@ -811,6 +811,11 @@ pos_type LyXText::getColumnNearX(pit_type const pit, c = end - 1; } + if (row.pos() < end && c >= end + && par.isInset(end) && par.getInset(end)->display()) { + c = end - 1; + } + x = int(tmpx) + xo; return c - row.pos(); }