diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-01-29 11:18:47 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-01-29 11:18:47 +0100 |
| commit | ef3412789cee141bbd929e062959784332ba6434 (patch) | |
| tree | 3679851f8d859df8362b66903afba92597e94b91 | |
| parent | Faster way to access the "Add favorite" thing (diff) | |
| download | rekonq-ef3412789cee141bbd929e062959784332ba6434.tar.xz | |
Restore scrollbars when using websnap features
BUG:288957
| -rw-r--r-- | src/previewselectorbar.cpp | 3 | ||||
| -rw-r--r-- | src/previewselectorbar.h | 2 | ||||
| -rw-r--r-- | src/websnap.cpp | 9 | ||||
| -rw-r--r-- | src/websnap.h | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/previewselectorbar.cpp b/src/previewselectorbar.cpp index 8eecffb9..d72e9eb1 100644 --- a/src/previewselectorbar.cpp +++ b/src/previewselectorbar.cpp @@ -3,7 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com> -* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com> * * * This program is free software; you can redistribute it and/or @@ -114,7 +114,6 @@ void PreviewSelectorBar::clicked() //cleanup the previous image from the cache (useful to refresh the snapshot) QFile::remove(WebSnap::imagePathFromUrl(urls.at(m_previewIndex))); - page->mainFrame()->setScrollBarValue(Qt::Vertical, 0); QPixmap preview = WebSnap::renderPagePreview(*page); preview.save(WebSnap::imagePathFromUrl(url)); diff --git a/src/previewselectorbar.h b/src/previewselectorbar.h index 3be750b2..fa54303d 100644 --- a/src/previewselectorbar.h +++ b/src/previewselectorbar.h @@ -3,7 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com> -* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com> * * * This program is free software; you can redistribute it and/or diff --git a/src/websnap.cpp b/src/websnap.cpp index 3344ded8..6bbaa06a 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -3,7 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2009 Nokia Corporation <qt-info@nokia.com> -* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com> * Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com> * * @@ -117,8 +117,10 @@ QPixmap WebSnap::renderClosingPagePreview(const QWebPage &page, int w, int h) QPixmap WebSnap::renderPagePreview(const QWebPage &page, int w, int h) { - //prepare page + // remove temporarily scrollbars page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); + + // prepare page int width = page.mainFrame()->contentsSize().width(); page.setViewportSize(QSize(width, width * ((0.0 + h) / w))); @@ -128,6 +130,9 @@ QPixmap WebSnap::renderPagePreview(const QWebPage &page, int w, int h) // resize image pageImage = pageImage.scaled(w, h, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + // restore scrollbars + page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded); + return pageImage; } diff --git a/src/websnap.h b/src/websnap.h index 37cdc618..f227f083 100644 --- a/src/websnap.h +++ b/src/websnap.h @@ -3,7 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2009 Nokia Corporation <qt-info@nokia.com> -* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com> * Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com> * * |