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

Help/litehtml: Keep top position also when zooming

Browse Source 
Change-Id: I65e12d4fca33719bc1a3ae08f7871d08d8d9c449
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2019-09-24 13:51:41 +02:00
parent 1e9b1dcaec
commit 88d759d50f
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,7 +439,7 @@ void QLiteHtmlWidget::setZoomFactor(qreal scale)
{ {
Q_ASSERT(scale != 0); Q_ASSERT(scale != 0);
d->zoomFactor = scale; d->zoomFactor = scale;
render(); withFixedTextPosition([this] { render(); });
} }
qreal QLiteHtmlWidget::zoomFactor() const qreal QLiteHtmlWidget::zoomFactor() const
@@ -559,17 +559,10 @@ static litehtml::element::ptr elementForY(int y, const litehtml::document::ptr &
void QLiteHtmlWidget::resizeEvent(QResizeEvent *event) void QLiteHtmlWidget::resizeEvent(QResizeEvent *event)
{ {
// remember element to which to scroll after re-rendering withFixedTextPosition([this, event] {
QPoint viewportPos; QAbstractScrollArea::resizeEvent(event);
QPoint pos; render();
htmlPos({}, &viewportPos, &pos); // top-left });
const litehtml::element::ptr element = elementForY(pos.y(), d->documentContainer.document());
QAbstractScrollArea::resizeEvent(event);
render();
if (element) {
verticalScrollBar()->setValue(
std::min(element->get_placement().y, verticalScrollBar()->maximum()));
}
} }
void QLiteHtmlWidget::mouseMoveEvent(QMouseEvent *event) void QLiteHtmlWidget::mouseMoveEvent(QMouseEvent *event)
@@ -625,6 +618,20 @@ void QLiteHtmlWidget::contextMenuEvent(QContextMenuEvent *event)
emit contextMenuRequested(event->pos(), d->documentContainer.linkAt(pos, viewportPos)); emit contextMenuRequested(event->pos(), d->documentContainer.linkAt(pos, viewportPos));
} }
void QLiteHtmlWidget::withFixedTextPosition(const std::function<void()> &action)
{
// remember element to which to scroll after re-rendering
QPoint viewportPos;
QPoint pos;
htmlPos({}, &viewportPos, &pos); // top-left
const litehtml::element::ptr element = elementForY(pos.y(), d->documentContainer.document());
action();
if (element) {
verticalScrollBar()->setValue(
std::min(element->get_placement().y, verticalScrollBar()->maximum()));
}
}
void QLiteHtmlWidget::render() void QLiteHtmlWidget::render()
{ {
if (!d->documentContainer.document()) if (!d->documentContainer.document())

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

@@ -77,6 +77,7 @@ protected:
void contextMenuEvent(QContextMenuEvent *event) override; void contextMenuEvent(QContextMenuEvent *event) override;
private: private:
void withFixedTextPosition(const std::function<void()> &action);
void render(); void render();
QPoint scrollPosition() const; QPoint scrollPosition() const;
void htmlPos(const QPoint &pos, QPoint *viewportPos, QPoint *htmlPos) const; void htmlPos(const QPoint &pos, QPoint *viewportPos, QPoint *htmlPos) const;