Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

close tablet anytime AddressManager::hostChanged fires

Browse source
This commit is contained in:
Seth Alves 2017-01-23 16:49:05 -08:00
parent 69252deb2e
commit 281b7a6eca
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/AddressBarDialog.cpp
View file

@ -40,6 +40,10 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
_backEnabled = !(DependencyManager::get<AddressManager>()->getBackStack().isEmpty()); _backEnabled = !(DependencyManager::get<AddressManager>()->getBackStack().isEmpty());
_forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty()); _forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::metaverseServerUrlChanged); connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::metaverseServerUrlChanged);
connect(addressManager.data(), &AddressManager::hostChanged, [](){
auto HMD = DependencyManager::get<HMDScriptingInterface>();
HMD->setShouldShowTablet(false);
});
connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::setUseFeed, this, &AddressBarDialog::setUseFeed); connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::setUseFeed, this, &AddressBarDialog::setUseFeed);
connect(qApp, &Application::receivedHifiSchemeURL, this, &AddressBarDialog::receivedHifiSchemeURL); connect(qApp, &Application::receivedHifiSchemeURL, this, &AddressBarDialog::receivedHifiSchemeURL);
} }
@ -47,8 +51,6 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
void AddressBarDialog::loadAddress(const QString& address, bool fromSuggestions) { void AddressBarDialog::loadAddress(const QString& address, bool fromSuggestions) {
qDebug() << "Called LoadAddress with address " << address; qDebug() << "Called LoadAddress with address " << address;
if (!address.isEmpty()) { if (!address.isEmpty()) {
auto HMD = DependencyManager::get<HMDScriptingInterface>();
HMD->setShouldShowTablet(false);
DependencyManager::get<AddressManager>()->handleLookupString(address, fromSuggestions); DependencyManager::get<AddressManager>()->handleLookupString(address, fromSuggestions);
} }
} }
@ -60,8 +62,6 @@ void AddressBarDialog::loadHome() {
if (homeLocation == "") { if (homeLocation == "") {
homeLocation = DEFAULT_HOME_LOCATION; homeLocation = DEFAULT_HOME_LOCATION;
} }
auto HMD = DependencyManager::get<HMDScriptingInterface>();
HMD->setShouldShowTablet(false);
DependencyManager::get<AddressManager>()->handleLookupString(homeLocation); DependencyManager::get<AddressManager>()->handleLookupString(homeLocation);
} }