Merge lp:~mardy/signon-ui/sizing into lp:signon-ui

[Alberto Mardegan]

Allow configuring scrollbar behaviour

Add configuration options to force the visibility of vertical and horizontal scrollbars.

Allow configuring scrollbar behaviour

Add configuration options to force the visibility of vertical and horizontal scrollbars.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://s-jenkins:8080/job/signon-ui-ci/19/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/signon-ui-ci/./build=pbuilder,distribution=raring,flavor=amd64/19
    SUCCESS: http://s-jenkins:8080/job/signon-ui-ci/./build=pbuilder,distribution=raring,flavor=i386/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ui-ci/19/rebuild

review: Approve (continuous-integration)

[David King (amigadave)]

review: Approve

=== modified file 'src/browser-request.cpp'
--- src/browser-request.cpp	2013-03-21 08:26:24 +0000
+++ src/browser-request.cpp	2013-03-21 08:26:24 +0000
@@ -48,6 +48,8 @@
 namespace SignOnUi {
 
 static const QString keyPreferredWidth = QString("PreferredWidth");
+static const QString keyHorizontalScrollBar = QString("HorizontalScrollBar");
+static const QString keyVerticalScrollBar = QString("VerticalScrollBar");
 static const QString keyTextSizeMultiplier = QString("TextSizeMultiplier");
 static const QString keyUserAgent = QString("UserAgent");
 static const QString keyViewportWidth = QString("ViewportWidth");
@@ -59,6 +61,8 @@
 static const QString keyInternalLinksPattern = QString("InternalLinksPattern");
 static const QString keyExternalLinksPattern = QString("ExternalLinksPattern");
 static const QString keyAllowedUrls = QString("AllowedUrls");
+static const QString valueAlwaysOn = QString("alwaysOn");
+static const QString valueAlwaysOff = QString("alwaysOff");
 
 /* Additional session-data keys we support. */
 static const QString keyCookies = QString("Cookies");
@@ -579,6 +583,18 @@
     q->setWidget(m_dialog);
 }
 
+static Qt::ScrollBarPolicy scrollPolicyFromValue(const QVariant &value)
+{
+    QString stringValue = value.toString();
+    if (stringValue == valueAlwaysOn) {
+        return Qt::ScrollBarAlwaysOn;
+    } else if (stringValue == valueAlwaysOff) {
+        return Qt::ScrollBarAlwaysOff;
+    } else {
+        return Qt::ScrollBarAsNeeded;
+    }
+}
+
 void BrowserRequestPrivate::setupViewForUrl(const QUrl &url)
 {
     QString host = url.host();
@@ -617,6 +633,18 @@
         m_webView->setZoomFactor(m_settings->value(keyZoomFactor).toReal());
     }
 
+    if (m_settings->contains(keyHorizontalScrollBar)) {
+        Qt::ScrollBarPolicy policy =
+            scrollPolicyFromValue(m_settings->value(keyHorizontalScrollBar));
+        page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, policy);
+    }
+
+    if (m_settings->contains(keyVerticalScrollBar)) {
+        Qt::ScrollBarPolicy policy =
+            scrollPolicyFromValue(m_settings->value(keyVerticalScrollBar));
+        page->mainFrame()->setScrollBarPolicy(Qt::Vertical, policy);
+    }
+
     page->setExternalLinksPattern(m_settings->value(keyExternalLinksPattern).
                                   toString());
     page->setInternalLinksPattern(m_settings->value(keyInternalLinksPattern).