#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"
#include "debug.h"
#include "FuncRequest.h"
#include "LyXRC.h"
-#include "rowpainter.h"
#include "version.h"
#include "support/filetools.h" // LibFileSearch
-#include "support/convert.h"
#include "graphics/GraphicsImage.h"
#include "graphics/GraphicsLoader.h"
}
-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();
}
<< " 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);
void GuiWorkArea::updateScreen()
{
- QLPainter pain(&screen_);
+ GuiPainter pain(&screen_);
verticalScrollBar()->show();
- paintText(*buffer_view_, pain);
+ buffer_view_->draw(pain);
}
return;
}
- QLPainter pain(&screen_);
+ GuiPainter pain(&screen_);
buffer_view_->updateMetrics(false);
- paintText(*buffer_view_, pain);
+ buffer_view_->draw(pain);
Font font = buffer_view_->cursor().getFont();
FontMetrics const & fm = theFontMetrics(font);
int height = fm.maxHeight();