Replace Setting HideScrollbars by ShowScrollBars

Positive options are more intuitive and make for a better API.

Task-number: QTBUG-63179
Change-Id: I632ee768dba52554e7d37d9da84661a1d01f1f37
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

8 files changed, 22 insertions, 22 deletions

diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index 4c944892a..498c4e799 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -231,7 +231,7 @@ void WebEngineSettings::initDefaults()
         s_defaultAttributes.insert(PluginsEnabled, false);
         s_defaultAttributes.insert(FullScreenSupportEnabled, false);
         s_defaultAttributes.insert(ScreenCaptureEnabled, false);
-        s_defaultAttributes.insert(HideScrollbars, false);
+        s_defaultAttributes.insert(ShowScrollBars, true);
         // The following defaults matches logic in render_view_host_impl.cc
         // But first we must ensure the WebContext has been initialized
         QtWebEngineCore::WebEngineContext::current();
@@ -334,7 +334,7 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
     prefs->should_print_backgrounds = testAttribute(PrintElementBackgrounds);
     prefs->allow_running_insecure_content = testAttribute(AllowRunningInsecureContent);
     prefs->allow_geolocation_on_insecure_origins = testAttribute(AllowGeolocationOnInsecureOrigins);
-    prefs->hide_scrollbars = testAttribute(HideScrollbars);
+    prefs->hide_scrollbars = !testAttribute(ShowScrollBars);
 
     // Fonts settings.
     prefs->standard_font_family_map[content::kCommonScript] = toString16(fontFamily(StandardFont));
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 639d314f3..18963344a 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -85,7 +85,7 @@ public:
         AllowRunningInsecureContent,
         AllowGeolocationOnInsecureOrigins,
         AllowWindowActivationFromJavaScript,
-        HideScrollbars
+        ShowScrollBars
     };
 
     // Must match the values from the public API in qwebenginesettings.h.
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 12d313783..3ce53337c 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -372,13 +372,13 @@ bool QQuickWebEngineSettings::allowWindowActivationFromJavaScript() const
 }
 
 /*!
-  \qmlproperty bool WebEngineSettings::hideScrollbars
+  \qmlproperty bool WebEngineSettings::showScrollBars
   \since QtWebEngine 1.6
-  Hides scrollbars. Disabled by default.
+  Shows scroll bars. Enabled by default.
 */
-bool QQuickWebEngineSettings::hideScrollbars() const
+bool QQuickWebEngineSettings::showScrollBars() const
 {
-    return d_ptr->testAttribute(WebEngineSettings::HideScrollbars);
+    return d_ptr->testAttribute(WebEngineSettings::ShowScrollBars);
 }
 
 /*!
@@ -591,12 +591,12 @@ void QQuickWebEngineSettings::setAllowWindowActivationFromJavaScript(bool on)
         Q_EMIT allowWindowActivationFromJavaScriptChanged();
 }
 
-void QQuickWebEngineSettings::setHideScrollbars(bool on)
+void QQuickWebEngineSettings::setShowScrollBars(bool on)
 {
-    bool wasOn = d_ptr->testAttribute(WebEngineSettings::HideScrollbars);
-    d_ptr->setAttribute(WebEngineSettings::HideScrollbars, on);
+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::ShowScrollBars);
+    d_ptr->setAttribute(WebEngineSettings::ShowScrollBars, on);
     if (wasOn != on)
-        Q_EMIT hideScrollbarsChanged();
+        Q_EMIT showScrollBarsChanged();
 }
 
 void QQuickWebEngineSettings::setParentSettings(QQuickWebEngineSettings *parentSettings)
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
index da838f52f..a8b11c769 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webengine/api/qquickwebenginesettings_p.h
@@ -87,7 +87,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
     Q_PROPERTY(bool allowRunningInsecureContent READ allowRunningInsecureContent WRITE setAllowRunningInsecureContent NOTIFY allowRunningInsecureContentChanged REVISION 3 FINAL)
     Q_PROPERTY(bool allowGeolocationOnInsecureOrigins READ allowGeolocationOnInsecureOrigins WRITE setAllowGeolocationOnInsecureOrigins NOTIFY allowGeolocationOnInsecureOriginsChanged REVISION 4 FINAL)
     Q_PROPERTY(bool allowWindowActivationFromJavaScript READ allowWindowActivationFromJavaScript WRITE setAllowWindowActivationFromJavaScript NOTIFY allowWindowActivationFromJavaScriptChanged REVISION 5 FINAL)
-    Q_PROPERTY(bool hideScrollbars READ hideScrollbars WRITE setHideScrollbars NOTIFY hideScrollbarsChanged REVISION 5 FINAL)
+    Q_PROPERTY(bool showScrollBars READ showScrollBars WRITE setShowScrollBars NOTIFY showScrollBarsChanged REVISION 5 FINAL)
 
 public:
     ~QQuickWebEngineSettings();
@@ -116,7 +116,7 @@ public:
     bool allowRunningInsecureContent() const;
     bool allowGeolocationOnInsecureOrigins() const;
     bool allowWindowActivationFromJavaScript() const;
-    bool hideScrollbars() const;
+    bool showScrollBars() const;
 
     void setAutoLoadImages(bool on);
     void setJavascriptEnabled(bool on);
@@ -142,7 +142,7 @@ public:
     void setAllowRunningInsecureContent(bool on);
     void setAllowGeolocationOnInsecureOrigins(bool on);
     void setAllowWindowActivationFromJavaScript(bool on);
-    void setHideScrollbars(bool on);
+    void setShowScrollBars(bool on);
 
 signals:
     void autoLoadImagesChanged();
@@ -169,7 +169,7 @@ signals:
     Q_REVISION(3) void allowRunningInsecureContentChanged();
     Q_REVISION(4) void allowGeolocationOnInsecureOriginsChanged();
     Q_REVISION(5) void allowWindowActivationFromJavaScriptChanged();
-    Q_REVISION(5) void hideScrollbarsChanged();
+    Q_REVISION(5) void showScrollBarsChanged();
 
 private:
     explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0);
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp
index 439e00590..1def61cb6 100644
--- a/src/webenginewidgets/api/qwebenginesettings.cpp
+++ b/src/webenginewidgets/api/qwebenginesettings.cpp
@@ -99,8 +99,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web
         return WebEngineSettings::AllowGeolocationOnInsecureOrigins;
     case QWebEngineSettings::AllowWindowActivationFromJavaScript:
         return WebEngineSettings::AllowWindowActivationFromJavaScript;
-    case QWebEngineSettings::HideScrollbars:
-        return WebEngineSettings::HideScrollbars;
+    case QWebEngineSettings::ShowScrollBars:
+        return WebEngineSettings::ShowScrollBars;
 
     default:
         return WebEngineSettings::UnsupportedInCoreSettings;
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index 1857e5228..470609227 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -91,7 +91,7 @@ public:
         AllowRunningInsecureContent,
         AllowGeolocationOnInsecureOrigins,
         AllowWindowActivationFromJavaScript,
-        HideScrollbars
+        ShowScrollBars
     };
 
     enum FontSize {
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index e6a94281e..d3b16a935 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -165,9 +165,9 @@
     \value  AllowWindowActivationFromJavaScript
             Allows the window.focus() method in JavaScript. Disallowed by default.
             (Added in Qt 5.10)
-    \value  HideScrollbars
-            Hides scrollbars.
-            Disabled by default. (Added in Qt 5.10)
+    \value  ShowScrollBars
+            Shows scroll bars.
+            Enabled by default. (Added in Qt 5.10)
 
 */
 
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 09d4f0f51..837481fad 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -3538,7 +3538,7 @@ void tst_QWebEnginePage::scrollPosition()
 void tst_QWebEnginePage::scrollbarsOff()
 {
     QWebEngineView view;
-    view.page()->settings()->setAttribute(QWebEngineSettings::HideScrollbars, true);
+    view.page()->settings()->setAttribute(QWebEngineSettings::ShowScrollBars, false);
 
     QString html("<html><body>"
                  "   <div style='margin-top:1000px ; margin-left:1000px'>"