* qfont_loader.h: enable the font caching
* QWorkArea: disable intermediate QImage caching, use QPixmap directly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13893
a592a061-630c-0410-9148-
cb99ea01b6c8
verticalScrollBar()->setPageStep(viewport()->height());
verticalScrollBar()->setPageStep(viewport()->height());
- screen_device_ = QPixmap(viewport()->width(), viewport()->height());
- paint_device_ = QImage(viewport()->width(), viewport()->height(), QImage::Format_RGB32);
+// screen_device_ = QPixmap(viewport()->width(), viewport()->height());
+// paint_device_ = QImage(viewport()->width(), viewport()->height(), QImage::Format_RGB32);
+ paint_device_ = QPixmap(viewport()->width(), viewport()->height());
view_.view()->workAreaResize();
view_.view()->workAreaResize();
void QWorkArea::update(int x, int y, int w, int h)
{
//screen_device_.fromImage(paint_device_);
void QWorkArea::update(int x, int y, int w, int h)
{
//screen_device_.fromImage(paint_device_);
- QPainter q(&screen_device_);
- q.drawImage(x, y, paint_device_.copy(x, y, w, h));
+ //QPainter q(&screen_device_);
+ //q.drawImage(x, y, paint_device_.copy(x, y, w, h));
viewport()->update(x, y, w, h);
}
viewport()->update(x, y, w, h);
}
<< endl;
*/
QPainter q(viewport());
<< endl;
*/
QPainter q(viewport());
- q.drawPixmap(e->rect(), screen_device_, e->rect());
+ q.drawPixmap(e->rect(), paint_device_, e->rect());
}
QPixmap QWorkArea::copyScreen(int x, int y, int w, int h) const
{
}
QPixmap QWorkArea::copyScreen(int x, int y, int w, int h) const
{
- return screen_device_.copy(x, y, w, h);
+ return paint_device_.copy(x, y, w, h);
}
void QWorkArea::drawScreen(int x, int y, QPixmap pixmap)
{
}
void QWorkArea::drawScreen(int x, int y, QPixmap pixmap)
{
- QPainter q(&screen_device_);
+ QPainter q(&paint_device_);
q.drawPixmap(x, y, pixmap);
viewport()->update(x, y, pixmap.width(), pixmap.height());
}
q.drawPixmap(x, y, pixmap);
viewport()->update(x, y, pixmap.width(), pixmap.height());
}
SyntheticMouseEvent synthetic_mouse_event_;
/// Our client side painting device.
SyntheticMouseEvent synthetic_mouse_event_;
/// Our client side painting device.
+ //QImage paint_device_;
+ QPixmap paint_device_;
/// Our server side painting device.
/// Our server side painting device.
- QPixmap screen_device_;
+ //QPixmap screen_device_;
/// \todo remove
QTimer step_timer_;
/// \todo remove
QTimer step_timer_;
/// Get font info (font + metrics) for the given LyX font.
QLFontInfo & fontinfo(LyXFont const & f) {
/// Get font info (font + metrics) for the given LyX font.
QLFontInfo & fontinfo(LyXFont const & f) {
fontinfo_[f.family()][f.series()][f.realShape()][f.size()];
fontinfo_[f.family()][f.series()][f.realShape()][f.size()];
+ fontinfo_[f.family()][f.series()][f.realShape()][f.size()]
+ = fi;
+ }