some tabular fixes for the problems reported by Helge

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

diff --git a/src/frontends/screen.C b/src/frontends/screen.C
index 147d444d883e81c26d27e907ce67ceb50a00beea..6308730a2024b786afcee8824d1fa9721c2683fc 100644 (file)
--- a/src/frontends/screen.C
+++ b/src/frontends/screen.C
@@ -21,6 +21,7 @@
 #include "BufferView.h"
 #include "buffer.h"
 #include "bufferparams.h"
+#include "coordcache.h"
 #include "cursor.h"
 #include "debug.h"
 #include "language.h"
@@ -146,8 +147,14 @@ void LyXScreen::checkAndGreyOut()
 
 void LyXScreen::showCursor(BufferView & bv)
 {
-       // this is needed to make sure we copy back the right
-       // pixmap on the hide for the Qt frontend
+       // You are not expected to understand this. This forces Qt
+       // (the problem case) to deal with its event queue. This is
+       // necessary when holding down a key such as 'page down' or
+       // just typing: without this processing of the event queue,
+       // the cursor gets ahead of itself without a selection or
+       // workarea redraw having a chance to keep up. If you think
+       // you can remove this, try selecting text with the mouse
+       // in Qt, or holding Page Down on the User's Guide.
        lyx_gui::sync_events();
 
        if (cursor_visible_)
@@ -174,13 +181,14 @@ void LyXScreen::showCursor(BufferView & bv)
        if (realfont.language() == latex_language)
                shape = BAR_SHAPE;
 
-       int ascent, descent;
-       bv.cursor().getDim(ascent, descent);
-       int h = ascent + descent;
+       LyXFont const font = bv.cursor().getFont();
+       int const asc = font_metrics::maxAscent(font);
+       int const des = font_metrics::maxDescent(font);
+       int h = asc + des;
        int x = 0;
        int y = 0;
        bv.cursor().getPos(x, y);
-       y -= ascent;
+       y -= asc;
        //lyxerr << "LyXScreen::showCursor x: " << x << " y: " << y << endl;
 
        // if it doesn't touch the screen, don't try to show it
@@ -220,6 +228,7 @@ void LyXScreen::redraw(BufferView & bv, ViewMetricsInfo const & vi)
        lyxerr[Debug::DEBUG] << "Redraw screen" << endl;
        expose(0, 0, workarea().workWidth(), workarea().workHeight());
        workarea().getPainter().end();
+       theCoords.doneUpdating();
        showCursor(bv);
 }