Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 01:04:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode

Browse source
This commit is contained in:
vladest 2017-07-28 18:04:29 +02:00
parent 3e1174a4ca
commit 45934cb53e
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Web3DOverlay.cpp
View file

@ -205,6 +205,8 @@ void Web3DOverlay::loadSourceURL() {
_webSurface->getSurfaceContext()->setContextProperty("SoundCache", DependencyManager::get<SoundCache>().data());
_webSurface->getSurfaceContext()->setContextProperty("pathToFonts", "../../");
_webSurface->getSurfaceContext()->setContextProperty("Paths", DependencyManager::get<PathUtils>().data());
tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", _webSurface.data());
// mark the TabletProxy object as cpp ownership.

5
libraries/ui/src/ui/TabletScriptingInterface.cpp
View file

@ -483,6 +483,11 @@ bool TabletProxy::pushOntoStack(const QVariant& path) {
return result;
}
//set landscape off when pushing menu items while in Create mode
if (_landscape) {
setLandscape(false);
}
QObject* root = nullptr;
if (!_toolbarMode && _qmlTabletRoot) {
root = _qmlTabletRoot;