History

Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial

Dante Ruiz committed 8 years ago

Commit fa5dfb62 parents 57ae8ff c5ff72b43 files · +727 −271Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.h (1 of 43 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+4−0
@@ -49,6 +49,7 @@ class WindowScriptingInterface : public QObject, public Dependency { · 48 unmodified lines
4949 Q_PROPERTY(int innerHeight READ getInnerHeight)
5050 Q_PROPERTY(int x READ getX)
5151 Q_PROPERTY(int y READ getY)
52+ Q_PROPERTY(bool interstitialModeEnabled READ getInterstitialModeEnabled WRITE setInterstitialModeEnabled)
5253
5354 public:
5455 WindowScriptingInterface();
@@ -760,6 +761,9 @@ private: · 705 unmodified lines
760761 QString getPreviousBrowseAssetLocation() const;
761762 void setPreviousBrowseAssetLocation(const QString& location);
762763
764+ bool getInterstitialModeEnabled() const;
765+ void setInterstitialModeEnabled(bool enableInterstitialMode);
766+
763767 void ensureReticleVisible() const;
764768
765769 int createMessageBox(QString title, QString text, int buttons, int defaultButton);