Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 20:37:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

load webpage if tablet root is not initialized

Browse source
This commit is contained in:
Dante Ruiz 2017-11-17 16:02:53 -08:00
parent 4cc8db8aff
commit ab9432c1cd
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -282,6 +282,7 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
_desktopWindow = nullptr; _desktopWindow = nullptr;
} }
} }
qDebug() << "-------> current path " << _currentPathLoaded;
} }
static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* buttonProxy) { static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* buttonProxy) {
@ -328,7 +329,8 @@ void TabletProxy::initialScreen(const QVariant& url) {
pushOntoStack(url); pushOntoStack(url);
} else { } else {
_initialScreen = true; _initialScreen = true;
_initialPath = url; _initialPath.first = url;
_initialPath.second = State::QML;
} }
} }
@ -416,10 +418,18 @@ void TabletProxy::setQmlTabletRoot(OffscreenQmlSurface* qmlOffscreenSurface) {
}); });
if (_initialScreen) { if (_initialScreen) {
if (!_showRunningScripts) { if (!_showRunningScripts && _initialPath.second == State::QML) {
pushOntoStack(_initialPath); pushOntoStack(_initialPath.first);
} else if (_initialPath.second == State::Web) {
QVariant webUrl = _initialPath.first;
QVariant scriptUrl = _initialWebPathParams.first;
gotoWebScreen(webUrl.toString(), scriptUrl.toString(), _initialWebPathParams.second);
} }
_initialScreen = false; _initialScreen = false;
_initialPath.first = "";
_initialPath.second = State::Uninitialized;
_initialWebPathParams.first = "";
_initialWebPathParams.second = false;
} }
if (_showRunningScripts) { if (_showRunningScripts) {
@ -685,6 +695,14 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS
QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(false))); QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(false)));
} }
QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl))); QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));
} else {
// tablet is not initialized yet, save information and load when
// the tablet root is set
_initialPath.first = url;
_initialPath.second = State::Web;
_initialWebPathParams.first = injectedJavaScriptUrl;
_initialWebPathParams.second = loadOtherBase;
_initialScreen = true;
} }
_state = State::Web; _state = State::Web;
emit screenChanged(QVariant("Web"), QVariant(url)); emit screenChanged(QVariant("Web"), QVariant(url));

3
libraries/ui/src/ui/TabletScriptingInterface.h
View file

@ -248,7 +248,6 @@ protected:
void removeButtonsFromToolbar(); void removeButtonsFromToolbar();
bool _initialScreen { false }; bool _initialScreen { false };
QVariant _initialPath { "" };
QVariant _currentPathLoaded { "" }; QVariant _currentPathLoaded { "" };
QString _name; QString _name;
std::vector<QSharedPointer<TabletButtonProxy>> _tabletButtonProxies; std::vector<QSharedPointer<TabletButtonProxy>> _tabletButtonProxies;
@ -260,6 +259,8 @@ protected:
enum class State { Uninitialized, Home, Web, Menu, QML }; enum class State { Uninitialized, Home, Web, Menu, QML };
State _state { State::Uninitialized }; State _state { State::Uninitialized };
std::pair<QVariant, State> _initialPath { "", State::Uninitialized };
std::pair<QVariant, bool> _initialWebPathParams;
bool _landscape { false }; bool _landscape { false };
bool _showRunningScripts { false }; bool _showRunningScripts { false };
}; };