diff -r 786160610b4d -r afcd8e6d025b ginebra2/ContentViews/GWebContentViewWidget.cpp --- a/ginebra2/ContentViews/GWebContentViewWidget.cpp Wed Sep 01 13:56:21 2010 -0400 +++ b/ginebra2/ContentViews/GWebContentViewWidget.cpp Fri Sep 17 12:11:40 2010 -0400 @@ -59,6 +59,7 @@ const int KMaxPageZoom = 10; const qreal KDefaultMinScale = 0.25; const qreal KDefaultMaxScale = 10.00; +const qreal KInitialZoomFactorValue = 0.653061; const QPoint KFocussPoint(5, 50); const int checkerSize = 16; const unsigned checkerColor1 = 0xff555555; @@ -340,7 +341,8 @@ #if QT_VERSION < 0x040600 page()->setFixedContentsSize(QSize(m_viewportWidth, m_viewportHeight/zoom)); #else - page()->setPreferredContentsSize(QSize((int)m_viewportWidth, (int)m_viewportHeight/zoom)); + if(!m_webContentView->currentPageIsSuperPage()) + page()->setPreferredContentsSize(QSize((int)m_viewportWidth, (int)m_viewportHeight/zoom)); #endif } @@ -654,6 +656,7 @@ data.maxScale = KDefaultMaxScale; data.minScale = KDefaultMinScale; data.userScalable = false; + data.zoomValue = KInitialZoomFactorValue; return data; } @@ -705,6 +708,9 @@ page()->setPreferredContentsSize(QSize((int)m_viewportWidth, (int)m_viewportHeight)); #endif #endif //NO_RESIZE_ON_LOAD + if((m_webContentView->currentPageIsSuperPage())){ + page()->setPreferredContentsSize(QSize((int)m_viewportWidth, (int)m_viewportHeight)); + } #ifndef NO_RESIZE_ON_LOAD qreal zoomF = 0.0; QString str; @@ -842,6 +848,7 @@ data.minScale = m_minimumScale; data.maxScale = m_maximumScale; data.userScalable = m_userScalable; + data.zoomValue = view()->getSavedZoomValueInView(); return data; } @@ -851,6 +858,7 @@ m_minimumScale = data.minScale ; m_maximumScale = data.maxScale ; m_userScalable = data.userScalable; + view()->setSavedZoomValueInView(data.zoomValue); } QWebPage* GWebContentViewWidget::page() const