* allow resizing of detached panel

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index e63050cf7db7fcf06d04a33111c200e32cb158c3..24befe6a994b459e7029ce94ce090fcf7f4869b3 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -747,10 +747,22 @@ bool LCursor::backspace()
        }
 
        if (pos() == 0) {
-               if (inset().nargs() == 1 && depth() == 1 && lastpos() == 0)
+               // If empty cell, and not part of a big cell
+               if (lastpos() == 0 && inset().nargs() == 1) {
+                       popLeft();
+                       // Directly delete empty cell: [|[]] => [|] 
+                       if (inMathed()) {
+                               plainErase();
+                               resetAnchor();
+                               return true;
+                       }
+                       // [|], can not delete from inside
                        return false;
-               pullArg();
-               return true;
+               } else {
+                       // move to left
+                       popLeft();
+                       return true;
+               }
        }
 
        if (inMacroMode()) {
@@ -793,12 +805,19 @@ bool LCursor::erase()
        // special behaviour when in last position of cell
        if (pos() == lastpos()) {
                bool one_cell = inset().nargs() == 1;
-               if (one_cell && depth() == 1 && lastpos() == 0)
+               if (one_cell && lastpos() == 0) {
+                       popLeft();
+                       // Directly delete empty cell: [|[]] => [|] 
+                       if (inMathed()) {
+                               plainErase();
+                               resetAnchor();
+                               return true;
+                       }
+                       // [|], can not delete from inside
                        return false;
+               }
                // remove markup
-               if (one_cell)
-                       pullArg();
-               else
+               if (!one_cell)
                        inset().idxGlue(idx());
                return true;
        }
@@ -900,9 +919,6 @@ int LCursor::targetX() const
 
 void LCursor::setTargetX()
 {
-       // For now this is good enough. A better solution would be to
-       // avoid this rebreak by setting cursorX only after drawing
-       bottom().text()->redoParagraph(bottom().pit());
        int x;
        int y;
        getPos(x, y);
@@ -1175,9 +1191,9 @@ string LCursor::currentState()
 }
 
 
-string LCursor::getPossibleLabel()
+docstring LCursor::getPossibleLabel()
 {
-       return inMathed() ? "eq:" : text()->getPossibleLabel(*this);
+       return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
 }