Code cleanup

[lyx.git] / src / frontends / qt4 / GuiWorkArea.cpp

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index e567b9e2ccc6417de613c51ac814de8c61471dfb..410f5e97dd6642e18e331ca08999ac6f2119f5c8 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -239,7 +239,7 @@ GuiWorkArea::GuiWorkArea(QWidget *)
        : buffer_view_(0), lyx_view_(0),
        cursor_visible_(false),
        need_resize_(false), schedule_redraw_(false),
-       preedit_lines_(1), completer_(new GuiCompleter(this)),
+       preedit_lines_(1), completer_(new GuiCompleter(this, this)),
        context_target_pos_()
 {
 }
@@ -249,7 +249,7 @@ GuiWorkArea::GuiWorkArea(Buffer & buffer, GuiView & gv)
        : buffer_view_(0), lyx_view_(0),
        cursor_visible_(false),
        need_resize_(false), schedule_redraw_(false),
-       preedit_lines_(1), completer_(new GuiCompleter(this)),
+       preedit_lines_(1), completer_(new GuiCompleter(this, this)),
        context_target_pos_()
 {
        setGuiView(gv);
@@ -321,6 +321,7 @@ GuiWorkArea::~GuiWorkArea()
        delete buffer_view_;
        delete cursor_;
        // Completer has a QObject parent and is thus automatically destroyed.
+       // See #4758.
        // delete completer_;
 }
 
@@ -334,7 +335,7 @@ void GuiWorkArea::setGuiView(GuiView & gv)
 void GuiWorkArea::setBuffer(Buffer & buffer)
 {
        delete buffer_view_;
-       buffer_view_ = new BufferView(buffer),
+       buffer_view_ = new BufferView(buffer);
        buffer.workAreaManager().add(this);
 
        // HACK: Prevents an additional redraw when the scrollbar pops up
@@ -406,7 +407,7 @@ void GuiWorkArea::startBlinkingCursor()
 }
 
 
-void GuiWorkArea::redraw()
+void GuiWorkArea::redraw(bool update_metrics)
 {
        if (!isVisible())
                // No need to redraw in this case.
@@ -414,7 +415,7 @@ void GuiWorkArea::redraw()
 
        // No need to do anything if this is the current view. The BufferView
        // metrics are already up to date.
-       if (lyx_view_ != guiApp->currentView()
+       if (update_metrics || lyx_view_ != guiApp->currentView()
                || lyx_view_->currentWorkArea() != this) {
                // FIXME: it would be nice to optimize for the off-screen case.
                buffer_view_->updateMetrics();
@@ -697,14 +698,7 @@ void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
 
 void GuiWorkArea::focusInEvent(QFocusEvent * e)
 {
-       /*
-       LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << std::endl);
-       GuiWorkArea * old_gwa = theGuiApp()->currentView()->currentWorkArea();
-       if (old_gwa)
-               old_gwa->stopBlinkingCursor();
-       lyx_view_->setCurrentWorkArea(this);
-       */
-
+       LYXERR(Debug::DEBUG, "GuiWorkArea::focusInEvent(): " << this << endl);
        if (lyx_view_->currentWorkArea() != this)
                lyx_view_->setCurrentWorkArea(this);
 
@@ -715,7 +709,7 @@ void GuiWorkArea::focusInEvent(QFocusEvent * e)
 
 void GuiWorkArea::focusOutEvent(QFocusEvent * e)
 {
-       LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << std::endl);
+       LYXERR(Debug::DEBUG, "GuiWorkArea::focusOutEvent(): " << this << endl);
        stopBlinkingCursor();
        QAbstractScrollArea::focusOutEvent(e);
 }
@@ -972,8 +966,10 @@ void GuiWorkArea::paintEvent(QPaintEvent * ev)
        if (need_resize_) {
                screen_ = QPixmap(viewport()->width(), viewport()->height());
                resizeBufferView();
-               hideCursor();
-               showCursor();
+               if (cursor_visible_) {
+                       hideCursor();
+                       showCursor();
+               }
        }
 
        QPainter pain(viewport());
@@ -1275,7 +1271,9 @@ void EmbeddedWorkArea::disable()
        stopBlinkingCursor();
        if (view().currentWorkArea() != this)
                return;
-       LASSERT(view().currentMainWorkArea(), /* */);
+       // No problem if currentMainWorkArea() is 0 (setCurrentWorkArea()
+       // tolerates it and shows the background logo), what happens if
+       // an EmbeddedWorkArea is closed after closing all document WAs
        view().setCurrentWorkArea(view().currentMainWorkArea());
 }
 
@@ -1501,17 +1499,14 @@ void TabWorkArea::on_currentTabChanged(int i)
                return;
        GuiWorkArea * wa = dynamic_cast<GuiWorkArea *>(widget(i));
        LASSERT(wa, return);
-       BufferView & bv = wa->bufferView();
-       bv.cursor().fixIfBroken();
-       bv.updateMetrics();
        wa->setUpdatesEnabled(true);
-       wa->redraw();
+       wa->redraw(true);
        wa->setFocus();
        ///
        currentWorkAreaChanged(wa);
 
        LYXERR(Debug::GUI, "currentTabChanged " << i
-               << "File" << bv.buffer().absFileName());
+               << " File: " << wa->bufferView().buffer().absFileName());
 }