Merge branch 'master' of https://github.com/highfidelity/hifi into discovery

howard-stearns committed 10 years ago

Commit 2b752402 parents 2641c0f 2ec54c4189 files · +5993 −3338Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 189 files). Show all

Unified · Split

@@ -179,6 +179,10 @@ QScriptValue WindowScriptingInterface::save(const QString& title, const QString& · 178 unmodified lines
179	179	return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
180	180	}
181	181
	182	+void WindowScriptingInterface::showAssetServer(const QString& upload) {
	183	+ QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload));
	184	+}
	185	+
182	186	int WindowScriptingInterface::getInnerWidth() {
183	187	return qApp->getWindow()->geometry().width();
184	188	}