some visual feedback for extra vertical space

[lyx.git] / src / text.C

diff --git a/src/text.C b/src/text.C
index cd1390753a3dc03c555de02f68ee71004a1fc175..6a80460c7afbf422c5bd3c9c2a251e4770cc7aa2 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -2264,7 +2264,7 @@ bool LyXText::selectWordWhenUnderCursor(BufferView * bview,
 // This function is only used by the spellchecker for NextWord().
 // It doesn't handle LYX_ACCENTs and probably never will.
 string const LyXText::selectNextWord(BufferView * bview,
-                                    float & value) const
+                                     float & value) const
 {
        if (the_locking_inset) {
                string str = the_locking_inset->selectNextWord(bview, value);
@@ -2400,10 +2400,10 @@ void LyXText::deleteWordForward(BufferView * bview)
                setCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
                selection.cursor = cursor;
                cursor = tmpcursor;
-               setSelection(bview); 
+               setSelection(bview);
                
                /* -----> Great, CutSelection() gets rid of multiple spaces. */
-               cutSelection(bview);
+               cutSelection(bview, true, false);
        }
 }
 
@@ -2422,7 +2422,7 @@ void LyXText::deleteWordBackward(BufferView * bview)
               selection.cursor = cursor;
               cursor = tmpcursor;
               setSelection(bview);
-              cutSelection(bview);
+              cutSelection(bview, true, false);
        }
 }
 
@@ -2448,7 +2448,7 @@ void LyXText::deleteLineForward(BufferView * bview)
                if (!selection.set()) {
                        deleteWordForward(bview);
                } else {
-                       cutSelection(bview);
+                       cutSelection(bview, true, false);
                }
        }
 }
@@ -2576,7 +2576,9 @@ void LyXText::Delete(BufferView * bview)
        if ((cursor.par()->previous() ? cursor.par()->previous()->id() : 0)
            == old_cur_par_prev_id
            && cursor.par()->id() != old_cur_par_id)
+       {
                return; // delete-empty-paragraph-mechanism has done it
+       }
 
        // if you had success make a backspace
        if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) {
@@ -2639,8 +2641,7 @@ void LyXText::backspace(BufferView * bview)
 
                if (cursor.par()->previous()) {
                        setUndo(bview, Undo::DELETE,
-                               cursor.par()->previous(),
-                               cursor.par()->next());
+                               cursor.par()->previous(), cursor.par()->next());
                }
                
                Paragraph * tmppar = cursor.par();
@@ -2653,8 +2654,8 @@ void LyXText::backspace(BufferView * bview)
                if (cursor.par()->previous()) { 
                        // steps into the above paragraph.
                        setCursorIntern(bview, cursor.par()->previous(),
-                                       cursor.par()->previous()->size(),
-                                       false);
+                                       cursor.par()->previous()->size(),
+                                       false);
                }
 
                /* Pasting is not allowed, if the paragraphs have different
@@ -2670,8 +2671,8 @@ void LyXText::backspace(BufferView * bview)
                if (cursor.par() != tmppar
                    && (cursor.par()->getLayout() == tmppar->getLayout()
                        || tmppar->getLayout() == 0 /*standard*/)
-                   && cursor.par()->getAlign() == tmppar->getAlign()) {
-
+                   && cursor.par()->getAlign() == tmppar->getAlign())
+               {
                        removeParagraph(tmprow);
                        removeRow(tmprow);
                        cursor.par()->pasteParagraph(bview->buffer()->params);
@@ -2708,13 +2709,13 @@ void LyXText::backspace(BufferView * bview)
                /* this is the code for a normal backspace, not pasting
                 * any paragraphs */ 
                setUndo(bview, Undo::DELETE,
-                       cursor.par(), cursor.par()->next()); 
+                       cursor.par(), cursor.par()->next()); 
                // We used to do cursorLeftIntern() here, but it is
                // not a good idea since it triggers the auto-delete
                // mechanism. So we do a cursorLeftIntern()-lite,
                // without the dreaded mechanism. (JMarc)
                setCursorIntern(bview, cursor.par(), cursor.pos()- 1,
-                               false, cursor.boundary());
+                               false, cursor.boundary());
                
                // some insets are undeletable here
                if (cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET) {
@@ -2738,8 +2739,8 @@ void LyXText::backspace(BufferView * bview)
                if (cursor.pos() < rowLast(row) ||
                    !cursor.par()->isLineSeparator(cursor.pos())) {
                        row->fill(row->fill() + singleWidth(bview,
-                                                           cursor.par(),
-                                                           cursor.pos()));
+                                                           cursor.par(),
+                                                           cursor.pos()));
                }
                
                /* some special code when deleting a newline. This is similar
@@ -2959,52 +2960,47 @@ void LyXText::getVisibleRow(BufferView * bview, int y_offset, int x_offset,
        if (cleared) {
                clear_area = true;
        } else if (clear_area) {
-#ifdef WITH_WARNINGS
-#warning Should be fixed with a lyxinset::clear_width(bv, font) function! (Jug)
-#warning Should we not fix this in the Painter, please have a look Lars! (Jug)
-#endif
                int const y = y_offset < 0 ? 0 : y_offset;
                int const h = y_offset < 0 ?
                        row_ptr->height() + y_offset : row_ptr->height();
                int const w = inset_owner ?
-                       inset_owner->width(bview, font) - 2 : ww;
+                       inset_owner->textWidth(bview, true) : ww;
                int const x = x_offset;
                pain.fillRectangle(x, y, w, h, backgroundColor());
        } else if (inset != 0) {
                int h = row_ptr->baseline() - inset->ascent(bview, font);
                // first clear the whole row above the inset!
                if (h > 0) {
-#if 0
                        int const w = (inset_owner ?
-                                inset_owner->width(bview, font) : ww);
-#endif
-                       pain.fillRectangle(x_offset, y_offset, ww, h,
+                                inset_owner->textWidth(bview, true) : ww);
+                       pain.fillRectangle(x_offset, y_offset, w, h,
                                           backgroundColor());
                }
                h += inset->ascent(bview, font) + inset->descent(bview, font);
                // clear the space below the inset!
                if ((row_ptr->height() - h) > 0) {
-#if 0
                        int const w = (inset_owner ?
-                                inset_owner->width(bview, font) : ww);
-#endif
+                                      inset_owner->textWidth(bview, true) : ww);
                        pain.fillRectangle(x_offset, y_offset + h,
-                                          ww, row_ptr->height() - h,
+                                          w, row_ptr->height() - h,
                                           backgroundColor());
                }
                // clear the space behind the inset, if needed
-               if (!inset_owner && !inset->display() && !inset->needFullRow())
-               {
-                       int const w = inset->width(bview, font) + int(x);
-                       pain.fillRectangle(w, y_offset, 
-                                          ww - w, row_ptr->height(),
-                                          backgroundColor());
+               if (!inset->display() && !inset->needFullRow()) {
+                       int const w = (inset_owner ?
+                                      inset_owner->textWidth(bview, true) : ww);
+                       int const xp = int(x) + inset->width(bview, font);
+                       if (w-xp > 0) {
+                               pain.fillRectangle(xp, y_offset,
+                                                  w-xp, row_ptr->height(),
+                                                  backgroundColor());
+                       }
                }
        }
 
        if (selection.set()) {
                int const w = (inset_owner ?
-                              inset_owner->width(bview, font) : ww);
+                              inset_owner->textWidth(bview, true) : ww);
                // selection code
                if (bidi_same_direction) {
                        if (selection.start.row() == row_ptr &&