Create new method GuiWorkArea::Private:::updateCaretGeometry

This replaces a showCaret/hideCaret pair and avoids an update.

Also remove an update() call in resizeBufferView: is is not necessary
since we are already in a pintEvent handler.

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 36dd253f4e45e99e65cd38cf737cd33de354d72e..a24e8da71151bd1c800ff33a6c6a02422e86f0d9 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -467,14 +467,12 @@ void GuiWorkArea::scheduleRedraw(bool update_metrics)
 
        // update caret position, because otherwise it has to wait until
        // the blinking interval is over
-       if (d->caret_visible_) {
-               d->hideCaret();
-               d->showCaret();
-       }
+       d->updateCaretGeometry();
 
        LYXERR(Debug::WORKAREA, "WorkArea::redraw screen");
        viewport()->update();
 
+       /// FIXME: is this still true now that paintEvent does the actual painting?
        /// \warning: scrollbar updating *must* be done after the BufferView is drawn
        /// because \c BufferView::updateScrollbar() is called in \c BufferView::draw().
        d->updateScrollbar();
@@ -572,7 +570,7 @@ void GuiWorkArea::Private::resizeBufferView()
        buffer_view_->resize(p->viewport()->width(), p->viewport()->height());
        if (caret_in_view)
                buffer_view_->scrollToCursor();
-       p->viewport()->update();
+       updateCaretGeometry();
 
        // Update scrollbars which might have changed due different
        // BufferView dimension. This is especially important when the
@@ -590,11 +588,8 @@ void GuiWorkArea::Private::resizeBufferView()
 }
 
 
-void GuiWorkArea::Private::showCaret()
+void GuiWorkArea::Private::updateCaretGeometry()
 {
-       if (caret_visible_)
-               return;
-
        Point point;
        int h = 0;
        buffer_view_->caretPosAndHeight(point, h);
@@ -629,7 +624,15 @@ void GuiWorkArea::Private::showCaret()
        point.x_ -= buffer_view_->horizScrollOffset();
 
        caret_->update(point.x_, point.y_, h, l_shape, isrtl, completable);
+}
 
+
+void GuiWorkArea::Private::showCaret()
+{
+       if (caret_visible_)
+               return;
+
+       updateCaretGeometry();
        p->viewport()->update(caret_->rect());
 }
 
@@ -1225,13 +1228,8 @@ void GuiWorkArea::paintEvent(QPaintEvent * ev)
        // LYXERR(Debug::PAINTING, "paintEvent begin: x: " << rc.x()
        //      << " y: " << rc.y() << " w: " << rc.width() << " h: " << rc.height());
 
-       if (d->need_resize_ || pixelRatio() != d->last_pixel_ratio_) {
+       if (d->need_resize_ || pixelRatio() != d->last_pixel_ratio_)
                d->resizeBufferView();
-               if (d->caret_visible_) {
-                       d->hideCaret();
-                       d->showCaret();
-               }
-       }
 
        d->last_pixel_ratio_ = pixelRatio();
 

diff --git a/src/frontends/qt4/GuiWorkArea_Private.h b/src/frontends/qt4/GuiWorkArea_Private.h
index ef2bb7e1df40c8c72d4cb73ce8e55aeecfaeaaaf..de20397c71e7edc2f17da80a8c10b106e9cb0431 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea_Private.h
+++ b/src/frontends/qt4/GuiWorkArea_Private.h
@@ -85,10 +85,12 @@ struct GuiWorkArea::Private
 
        ///
        void dispatch(FuncRequest const & cmd0);
-       /// hide the visible caret, if it is visible
-       void hideCaret();
+       /// recompute the shape and position of the caret
+       void updateCaretGeometry();
        /// show the caret if it is not visible
        void showCaret();
+       /// hide the caret if it is visible
+       void hideCaret();
        /// Set the range and value of the scrollbar and connect to its valueChanged
        /// signal.
        void updateScrollbar();