Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Merge branch 'v2.1'

Browse Source
This commit is contained in:
David Rosca 2017-02-21 10:29:15 +01:00
commit e832a3418c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/webengine/webscrollbarmanager.cpp
View File

@ -143,10 +143,10 @@ void WebScrollBarManager::addWebView(WebView *view)
data->corner->updateVisibility(data->vscrollbarVisible && data->hscrollbarVisible, thickness);
};
connect(view, &WebView::viewportResized, this, updateValues);
connect(view->page(), &WebPage::scrollPositionChanged, this, updateValues);
connect(view, &WebView::viewportResized, data->vscrollbar, updateValues);
connect(view->page(), &WebPage::scrollPositionChanged, data->vscrollbar, updateValues);
connect(view->page(), &WebPage::contentsSizeChanged, this, [=]() {
connect(view->page(), &WebPage::contentsSizeChanged, data->vscrollbar, [=]() {
const QString source = QL1S("var out = {"
"vertical: document.documentElement && window.innerWidth > document.documentElement.clientWidth,"
"horizontal: document.documentElement && window.innerHeight > document.documentElement.clientHeight"
@ -164,7 +164,7 @@ void WebScrollBarManager::addWebView(WebView *view)
});
});
connect(view, &WebView::zoomLevelChanged, this, [=]() {
connect(view, &WebView::zoomLevelChanged, data->vscrollbar, [=]() {
view->page()->runJavaScript(m_scrollbarJs.arg(thickness));
});
@ -175,13 +175,14 @@ void WebScrollBarManager::addWebView(WebView *view)
void WebScrollBarManager::removeWebView(WebView *view)
{
if (!m_scrollbars.contains(view)) {
return;
}
if (m_scrollbars.size() == 1) {
removeUserScript();
}
disconnect(view, 0, this, 0);
disconnect(view->page(), 0, this, 0);
delete m_scrollbars.take(view);
}