diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-07-20 14:45:11 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2017-08-02 13:32:19 +0000 |
| commit | 6aef365a55bb4fed0c156ebc852e90ca1086c091 (patch) | |
| tree | 249a98973bf27495dafccbc23f93507c63c988ca /src/webengine/api | |
| parent | 3fdcc80a11bb5320e85cf37e0bfd89cce01e296b (diff) | |
Add HideScrollbars setting
[ChangeLog][Settings] Added setting to hide scrollbars.
Change-Id: I17695bb54a460621358345d303302b93eb342696
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 18 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings_p.h | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index cdbb25e4c..98a3eef39 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -373,6 +373,16 @@ bool QQuickWebEngineSettings::allowWindowActivationFromJavaScript() const } /*! + \qmlproperty bool WebEngineSettings::hideScrollbars + \since QtWebEngine 1.6 + Hides scrollbars. Disabled by default. +*/ +bool QQuickWebEngineSettings::hideScrollbars() const +{ + return d_ptr->testAttribute(WebEngineSettings::HideScrollbars); +} + +/*! \qmlproperty string WebEngineSettings::defaultTextEncoding \since QtWebEngine 1.2 @@ -582,6 +592,14 @@ void QQuickWebEngineSettings::setAllowWindowActivationFromJavaScript(bool on) Q_EMIT allowWindowActivationFromJavaScriptChanged(); } +void QQuickWebEngineSettings::setHideScrollbars(bool on) +{ + bool wasOn = d_ptr->testAttribute(WebEngineSettings::HideScrollbars); + d_ptr->setAttribute(WebEngineSettings::HideScrollbars, on); + if (wasOn != on) + Q_EMIT hideScrollbarsChanged(); +} + void QQuickWebEngineSettings::setParentSettings(QQuickWebEngineSettings *parentSettings) { d_ptr->setParentSettings(parentSettings->d_ptr.data()); diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h index 1b9988bce..da838f52f 100644 --- a/src/webengine/api/qquickwebenginesettings_p.h +++ b/src/webengine/api/qquickwebenginesettings_p.h @@ -87,6 +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) public: ~QQuickWebEngineSettings(); @@ -115,6 +116,7 @@ public: bool allowRunningInsecureContent() const; bool allowGeolocationOnInsecureOrigins() const; bool allowWindowActivationFromJavaScript() const; + bool hideScrollbars() const; void setAutoLoadImages(bool on); void setJavascriptEnabled(bool on); @@ -140,6 +142,7 @@ public: void setAllowRunningInsecureContent(bool on); void setAllowGeolocationOnInsecureOrigins(bool on); void setAllowWindowActivationFromJavaScript(bool on); + void setHideScrollbars(bool on); signals: void autoLoadImagesChanged(); @@ -166,6 +169,7 @@ signals: Q_REVISION(3) void allowRunningInsecureContentChanged(); Q_REVISION(4) void allowGeolocationOnInsecureOriginsChanged(); Q_REVISION(5) void allowWindowActivationFromJavaScriptChanged(); + Q_REVISION(5) void hideScrollbarsChanged(); private: explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0); |