src/frontends/qt4/GuiWorkArea.C:

    use position returned by BufferView
src/bufferview_funcs.C:
    adjust cursor x-position by hand

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15555 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 40210a018b59cb80eda917f74af0b0b9318b4400..474f4301a2d7eb9534dd0fc7d5f4bc409fa239f6 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -195,9 +195,9 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
                y += par.rows()[rit].height();
        y += par.rows()[rend].ascent();
        x += dit.bottom().text()->cursorX(dit.bottom(), boundary && dit.depth() == 1);
-       // The following correction should not be there at all.
-       // The cursor looks much better with the -1, though.
-       --x;
+       // FIXME: The following correction should not be there at all.
+       // The cursor looks much better with the +1, though.
+       ++x;
        return Point(x, y);
 }
 

diff --git a/src/frontends/qt4/GuiWorkArea.C b/src/frontends/qt4/GuiWorkArea.C
index d8d0c1096502882610617f947626120d22b195c2..9aa1ba5630dcb5566490e016fd4829be7f92b338 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.C
+++ b/src/frontends/qt4/GuiWorkArea.C
@@ -599,10 +599,7 @@ void GuiWorkArea::expose(int x, int y, int w, int h)
 
 void GuiWorkArea::showCursor(int x, int y, int h, CursorShape shape)
 {
-       // FIXME: the BufferView (via Cursor) should provide the correct positioning
-       // for the moment we put the cursor 2 pixels to the right
-       //cursor_->setGeometry(x, y, 2, h);
-       cursor_->setGeometry(x + 2, y, 2, h);
+       cursor_->setGeometry(x, y, 2, h);
        cursor_->shape_ = shape;
        cursor_->on_ = true;
        cursor_->show();