Fix bug 1792

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

diff --git a/src/ChangeLog b/src/ChangeLog
index adc809859b4b11ce0a18cabd2d25124a292ae596..86821265b985342c76d6af28b4df1aeed30f477d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,6 @@
+2005-03-08  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * text2.C: fix for cursor up/down stuck in math [bug 1792]
 
 2005-03-07  Alfredo Braunstein  <abraunst@lyx.org>
 
@@ -13,6 +16,7 @@
        * dociterator.C: include <boost/current_function.hpp>, which is
        needed when assertions are disabled.
 
+>>>>>>> 1.2135
 2005-03-05  Johnathan Burchill  <jkerrb@users.sourceforge.net> 
 
        * 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 1f52b8a41f78fab985a390fc617d25562bfbd6f5..917808ec8395ef3fa0de90f9adcdbae024957eaf 100644 (file)
--- 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();
 }