mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +01:00
Merge branch 'v2.1'
This commit is contained in:
commit
071c4fbe52
@ -45,6 +45,8 @@ void WebScrollBar::updateValues(const QSize &viewport)
|
||||
|
||||
int newValue;
|
||||
|
||||
m_blockScrolling = true;
|
||||
|
||||
if (orientation() == Qt::Vertical) {
|
||||
setFixedHeight(m_view->height() - (m_view->height() - viewport.height()) * devicePixelRatioF());
|
||||
move(m_view->width() - width(), 0);
|
||||
@ -60,10 +62,10 @@ void WebScrollBar::updateValues(const QSize &viewport)
|
||||
}
|
||||
|
||||
if (!isSliderDown()) {
|
||||
m_blockScrolling = true;
|
||||
setValue(newValue);
|
||||
m_blockScrolling = false;
|
||||
}
|
||||
|
||||
m_blockScrolling = false;
|
||||
}
|
||||
|
||||
void WebScrollBar::performScroll()
|
||||
|
Loading…
Reference in New Issue
Block a user