Martin's changes to the Note inset.

[lyx.git] / src / frontends / screen.C

diff --git a/src/frontends/screen.C b/src/frontends/screen.C
index 4dfc611bde4305e299e7c69fb568b41415600970..48060a82dad6b5d33eeb59d8ff43176fe4d058c7 100644 (file)
--- a/src/frontends/screen.C
+++ b/src/frontends/screen.C
@@ -10,10 +10,10 @@
  * Splash screen code added by Angus Leeming
  */
 
-
 #include <config.h>
 
 #include "screen.h"
+
 #include "lyxtext.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
@@ -228,20 +228,17 @@ bool LyXScreen::fitManualCursor(BufferView * bv, LyXText * text,
 
        if (y + desc - text->top_y() >= vheight)
                newtop = y - 3 * vheight / 4;  // the scroll region must be so big!!
-       else if (y - asc < text->top_y()
-               && text->top_y() > 0) {
+       else if (y - asc < text->top_y() && text->top_y() > 0)
                newtop = y - vheight / 4;
-       }
 
        newtop = max(newtop, 0); // can newtop ever be < 0? (Lgb)
 
-       if (newtop != text->top_y()) {
-               draw(text, bv, newtop);
-               text->top_y(newtop);
-               return true;
-       }
+       if (newtop == text->top_y())
+               return false;
 
-       return false;
+       draw(text, bv, newtop);
+       text->top_y(newtop);
+       return true;
 }
 
 
@@ -271,10 +268,8 @@ unsigned int LyXScreen::topCursorVisible(LyXText * text)
                        newtop = cursor.y() - vheight / 2;
                }
 
-       } else if (static_cast<int>((cursor.y()) - row->baseline()) <
-                  top_y && top_y > 0) {
-               if (row->height() < vheight
-                   && row->height() > vheight / 4) {
+       } else if (int(cursor.y() - row->baseline()) < top_y && top_y > 0) {
+               if (row->height() < vheight && row->height() > vheight / 4) {
                        newtop = cursor.y() - row->baseline();
                } else {
                        // scroll up
@@ -326,65 +321,34 @@ void LyXScreen::toggleSelection(LyXText * text, BufferView * bv,
                                int yo, int xo)
 {
        // only if there is a selection
-       if (!text->selection.set()) return;
+       if (!text->selection.set())
+               return;
 
        int const bottom = min(
-               max(static_cast<int>(text->selection.end.y()
+               max(int(text->selection.end.y()
                                     - text->getRow(text->selection.end)->baseline()
                                     + text->getRow(text->selection.end)->height()),
                    text->top_y()),
-               static_cast<int>(text->top_y() + workarea().workHeight()));
+               int(text->top_y() + workarea().workHeight()));
        int const top = min(
-               max(static_cast<int>(text->selection.start.y() -
+               max(int(text->selection.start.y() -
                                     text->getRow(text->selection.start)->baseline()),
                    text->top_y()),
-               static_cast<int>(text->top_y() + workarea().workHeight()));
+               int(text->top_y() + workarea().workHeight()));
 
        if (kill_selection)
                text->selection.set(false);
 
        workarea().getPainter().start();
 
-       drawFromTo(text, bv, top - text->top_y(), bottom - text->top_y(),
-                  yo, xo);
-       expose(0, top - text->top_y(),
-              workarea().workWidth(),
-              bottom - text->top_y() - (top - text->top_y()));
-
-       workarea().getPainter().end();
-}
-
-
-void LyXScreen::toggleToggle(LyXText * text, BufferView * bv,
-                            int yo, int xo)
-{
-       if (text->toggle_cursor.par() == text->toggle_end_cursor.par()
-           && text->toggle_cursor.pos() == text->toggle_end_cursor.pos())
-               return;
-
-       int const top_tmp = text->toggle_cursor.y()
-               - text->getRow(text->toggle_cursor)->baseline();
-       int const bottom_tmp = text->toggle_end_cursor.y()
-               - text->getRow(text->toggle_end_cursor)->baseline()
-               + text->getRow(text->toggle_end_cursor)->height();
-
-       int const offset = yo < 0 ? yo : 0;
-       int const bottom = min(max(bottom_tmp, text->top_y()),
-               static_cast<int>(text->top_y() + workarea().workHeight())) - offset;
-       int const top = min(max(top_tmp, text->top_y()),
-               static_cast<int>(text->top_y() + workarea().workHeight())) - offset;
-
-       workarea().getPainter().start();
-
        drawFromTo(text, bv, top - text->top_y(), bottom - text->top_y(), yo, xo);
-       expose(0, top - text->top_y(), workarea().workWidth(),
-              bottom - text->top_y() - (top - text->top_y()));
+       expose(0, top - text->top_y(), workarea().workWidth(), bottom - top);
 
        workarea().getPainter().end();
 }
 
 
-void LyXScreen::redraw(LyXText * text, BufferView * bv)
+void LyXScreen::redraw(BufferView * bv, LyXText * text)
 {
        greyed_out_ = !text;
 
@@ -444,37 +408,19 @@ void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
        int y1, int y2, int yo, int xo)
 {
        lyxerr[Debug::GUI] << "screen: drawFromTo " << y1 << '-' << y2 << endl;
+       hideCursor();
 
        int const topy = text->top_y();
        int y_text = topy + y1;
        RowList::iterator rit = text->getRowNearY(y_text);
        int y = y_text - topy;
-       // y1 is now the real beginning of row on the screen
 
-       hideCursor();
-
-#if 0
-       // some day it should look like that:
-       // redo metrics
-       Dimension dim;
-       LyXFont font;
-       MetricsInfo mi(bv, font, workarea().workWidth());
-       text->metrics(mi, dim);
-#endif
-
-       // draw it
-       RowList::iterator const rend = text->rows().end();
-       while (rit != rend && y < y2) {
-               paintRows(*bv, *text, rit, y + yo, xo, y + topy);
-               y += rit->height();
-               ++rit;
-       }
+       y = paintRows(*bv, *text, rit, xo, y, y, y2, yo);
 
        // maybe we have to clear the screen at the bottom
-       if ((y < y2) && !text->isInInset()) {
+       if (y < y2 && !text->isInInset()) {
                workarea().getPainter().fillRectangle(0, y,
                        workarea().workWidth(), y2 - y,
                        LColor::bottomarea);
        }
 }
-