History

Display avatar settings dialog in tablet

David Rowe committed 9 years ago

Commit b9869261 parent 9f56d2f4 files · +55 −1Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+10−0
@@ -5853,6 +5853,16 @@ void Application::addAssetToWorldFromURL(QString url) { · 5852 unmodified lines
5853 request->send();5853 request->send();
5854}5854}
5855 5855
5856void Application::showDialog(const QString& desktopURL, const QString& tabletURL, const QString& name) const {
5857 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
5858 auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
5859 if (tablet->getToolbarMode() && tablet->getTabletRoot() && !isHMDMode()) {
5860 DependencyManager::get<OffscreenUi>()->show(desktopURL, name);
5861 } else {
5862 tablet->loadQMLSource(tabletURL);
5863 }
5864}
5865
5856void Application::addAssetToWorldFromURLRequestFinished() {5866void Application::addAssetToWorldFromURLRequestFinished() {
5857 auto request = qobject_cast<ResourceRequest*>(sender());5867 auto request = qobject_cast<ResourceRequest*>(sender());
5858 auto url = request->getUrl().toString();5868 auto url = request->getUrl().toString();