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.cpp (1 of 43 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+8−0
@@ -180,6 +180,14 @@ void WindowScriptingInterface::setPreviousBrowseAssetLocation(const QString& loc · 179 unmodified lines
180 Setting::Handle<QVariant>(LAST_BROWSE_ASSETS_LOCATION_SETTING).set(location);180 Setting::Handle<QVariant>(LAST_BROWSE_ASSETS_LOCATION_SETTING).set(location);
181}181}
182 182
183bool WindowScriptingInterface::getInterstitialModeEnabled() const {
184 return DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
185}
186
187void WindowScriptingInterface::setInterstitialModeEnabled(bool enableInterstitialMode) {
188 DependencyManager::get<NodeList>()->getDomainHandler().setInterstitialModeEnabled(enableInterstitialMode);
189}
190
183bool WindowScriptingInterface::isPointOnDesktopWindow(QVariant point) {191bool WindowScriptingInterface::isPointOnDesktopWindow(QVariant point) {
184 auto offscreenUi = DependencyManager::get<OffscreenUi>();192 auto offscreenUi = DependencyManager::get<OffscreenUi>();
185 return offscreenUi->isPointOnDesktopWindow(point);193 return offscreenUi->isPointOnDesktopWindow(point);