From b6a7dd3aa713639d53b4f29d13d7c9240355843c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Thu, 26 Oct 2006 11:01:34 +0000 Subject: [PATCH] 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 --- src/bufferview_funcs.C | 6 +++--- src/frontends/qt4/GuiWorkArea.C | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index 40210a018b..474f4301a2 100644 --- 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 d8d0c10965..9aa1ba5630 100644 --- 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();