some remnaming

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

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index bcacd16dd94c2ca4c94fbd578d799ff84373e741..a61d31309a7026098bb4bbae0aeb23c74d7d74f1 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -14,8 +14,8 @@
 #include "GuiWorkArea.h"
 
 #include "GuiApplication.h"
-#include "QLPainter.h"
-#include "QKeySymbol.h"
+#include "GuiPainter.h"
+#include "GuiKeySymbol.h"
 #include "qt_helpers.h"
 
 #include "frontends/LyXView.h"
@@ -28,7 +28,6 @@
 #include "version.h"
 
 #include "support/filetools.h" // LibFileSearch
-#include "support/convert.h"
 
 #include "graphics/GraphicsImage.h"
 #include "graphics/GraphicsLoader.h"
@@ -242,9 +241,22 @@ void GuiWorkArea::setScrollbarParams(int h, int scroll_pos, int scroll_line_step
 }
 
 
-void GuiWorkArea::adjustViewWithScrollBar(int)
+void GuiWorkArea::adjustViewWithScrollBar(int action)
 {
-       scrollBufferView(verticalScrollBar()->sliderPosition());
+       stopBlinkingCursor();
+       if (action == QAbstractSlider::SliderPageStepAdd)
+               buffer_view_->scrollDown(viewport()->height());
+       else if (action == QAbstractSlider::SliderPageStepSub)
+               buffer_view_->scrollUp(viewport()->height());
+       else
+               buffer_view_->scrollDocView(verticalScrollBar()->sliderPosition());
+
+       if (lyxrc.cursor_follows_scrollbar) {
+               buffer_view_->setCursorFromScrollbar();
+               lyx_view_->updateLayoutChoice();
+       }
+       // Show the cursor immediately after any operation.
+       startBlinkingCursor();
        QApplication::syncX();
 }
 
@@ -418,15 +430,18 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * e)
                << " key=" << e->key()
                << endl;
 
-       boost::shared_ptr<QKeySymbol> sym(new QKeySymbol);
+       boost::shared_ptr<GuiKeySymbol> sym(new GuiKeySymbol);
        sym->set(e);
        processKeySym(sym, q_key_state(e->modifiers()));
 }
 
-void GuiWorkArea::doubleClickTimeout() {
+
+void GuiWorkArea::doubleClickTimeout()
+{
        dc_event_.active = false;
 }
 
+
 void GuiWorkArea::mouseDoubleClickEvent(QMouseEvent * e)
 {
        dc_event_ = double_click(e);
@@ -487,7 +502,7 @@ void GuiWorkArea::expose(int x, int y, int w, int h)
 
 void GuiWorkArea::updateScreen()
 {
-       QLPainter pain(&screen_);
+       GuiPainter pain(&screen_);
        verticalScrollBar()->show();
        buffer_view_->draw(pain);
 }
@@ -556,7 +571,7 @@ void GuiWorkArea::inputMethodEvent(QInputMethodEvent * e)
                return;
        }
 
-       QLPainter pain(&screen_);
+       GuiPainter pain(&screen_);
        buffer_view_->updateMetrics(false);
        buffer_view_->draw(pain);
        Font font = buffer_view_->cursor().getFont();