feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help/litehtml: Fix selection drawing for CMake documentation

Browse Source 
Don't rely on litehtml calling draw_background for the root element.
Manually draw selections first, then let litehtml draw as before.

Change-Id: Ic9efd11b564dec1742aa6b6ffcb58133504681ff
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2019-09-24 15:35:54 +02:00
parent b4928395d7
commit 2152d4750c
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/help/qlitehtml/container_qpainter.cpp
View File

@@ -652,11 +652,9 @@ void DocumentContainer::buildIndex()
void DocumentContainer::draw_background(litehtml::uint_ptr hdc, const litehtml::background_paint &bg)
{
// TODO
auto painter = toQPainter(hdc);
if (bg.is_root) {
// TODO ?
drawSelection(painter, toQRect(bg.border_box));
return;
}
painter->save();
@@ -935,6 +933,14 @@ void DocumentContainer::render(int width, int height)
m_selection.update();
}
void DocumentContainer::draw(QPainter *painter, const QRect &clip)
{
drawSelection(painter, clip);
const QPoint pos = -m_scrollPosition;
const litehtml::position clipRect = {clip.x(), clip.y(), clip.width(), clip.height()};
document()->draw(reinterpret_cast<litehtml::uint_ptr>(painter), pos.x(), pos.y(), &clipRect);
}
QVector<QRect> DocumentContainer::mousePressEvent(const QPoint &documentPos,
const QPoint &viewportPos,
Qt::MouseButton button)

1
src/plugins/help/qlitehtml/container_qpainter.h
View File

@@ -143,6 +143,7 @@ public: // outside API
litehtml::document::ptr document() const;
void setScrollPosition(const QPoint &pos);
void render(int width, int height);
void draw(QPainter *painter, const QRect &clip);
// these return areas to redraw in document space
QVector<QRect> mousePressEvent(const QPoint &documentPos,

8
src/plugins/help/qlitehtml/qlitehtmlwidget.cpp
View File

@@ -523,17 +523,11 @@ void QLiteHtmlWidget::paintEvent(QPaintEvent *event)
if (!d->documentContainer.document())
return;
d->documentContainer.setScrollPosition(scrollPosition());
const QPoint pos = -scrollPosition();
const QRect r = toVirtual(event->rect());
const litehtml::position clip = {r.x(), r.y(), r.width(), r.height()};
QPainter p(viewport());
p.setWorldTransform(QTransform().scale(d->zoomFactor, d->zoomFactor));
p.setRenderHint(QPainter::SmoothPixmapTransform, true);
p.setRenderHint(QPainter::Antialiasing, true);
d->documentContainer.document()->draw(reinterpret_cast<litehtml::uint_ptr>(&p),
pos.x(),
pos.y(),
&clip);
d->documentContainer.draw(&p, toVirtual(event->rect()));
}
static litehtml::element::ptr elementForY(int y, const litehtml::document::ptr &document)