bug 2298: cursorTop/Bottom/Home/End does not redraw after dEPM

[lyx.git] / src / dociterator.C

diff --git a/src/dociterator.C b/src/dociterator.C
index 51ecd6406738bf716523a8a58eeff748f832bf4e..565a43f8945f26ca1f81e5ed50c36953cf378433 100644 (file)
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -20,6 +20,7 @@
 
 #include "mathed/math_data.h"
 #include "mathed/math_inset.h"
+#include "insets/insettabular.h"
 
 #include <boost/assert.hpp>
 #include <boost/current_function.hpp>
@@ -90,6 +91,18 @@ InsetBase const * DocIterator::prevInset() const
 }
 
 
+InsetBase * DocIterator::realInset() const
+{
+       BOOST_ASSERT(inTexted());
+       // if we are in a tabular, we need the cell
+       if (inset().lyxCode() == InsetBase::TABULAR_CODE) {
+               InsetTabular & tabular = static_cast<InsetTabular&>(inset());
+               return tabular.cell(idx()).get();
+       }
+       return &inset();
+}
+
+
 MathAtom const & DocIterator::prevAtom() const
 {
        BOOST_ASSERT(!empty());
@@ -276,7 +289,7 @@ InsetBase * DocIterator::innerInsetOfType(int code) const
 }
 
 
-void DocIterator::forwardPos()
+void DocIterator::forwardPos(bool ignorecollapsed)
 {
        //this dog bites his tail
        if (empty()) {
@@ -284,6 +297,15 @@ void DocIterator::forwardPos()
                return;
        }
 
+       // jump over collapsables if they are collapsed
+       // FIXME: the check for asMathInset() shouldn't be necessary
+       // but math insets do not return a sensible editable() state yet.
+       if (ignorecollapsed && nextInset() && (!nextInset()->asMathInset() 
+           && nextInset()->editable() != InsetBase::HIGHLY_EDITABLE)) {
+               ++top().pos();
+               return;
+       }
+
        CursorSlice & tip = top();
        //lyxerr << "XXX\n" << *this << endl;