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

Add Window.raiseMainWindow()

Browse source
This commit is contained in:
Ryan Huffman 2015-03-13 14:10:46 -07:00
parent 7ef1964a52
commit dc3453a878
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/edit.js
View file

@ -865,6 +865,8 @@ function importSVO(importURL) {
if (isActive) { if (isActive) {
selectionManager.setSelections(pastedEntityIDs); selectionManager.setSelections(pastedEntityIDs);
} }
Window.raiseMainWindow();
} else { } else {
Window.alert("There was an error importing the entity file."); Window.alert("There was an error importing the entity file.");
} }

9
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -44,8 +44,13 @@ QScriptValue WindowScriptingInterface::hasFocus() {
} }
void WindowScriptingInterface::setFocus() { void WindowScriptingInterface::setFocus() {
Application::getInstance()->getWindow()->activateWindow(); auto window = Application::getInstance()->getWindow();
Application::getInstance()->getWindow()->setFocus(); window->activateWindow();
window->setFocus();
}
void WindowScriptingInterface::raiseMainWindow() {
Application::getInstance()->getWindow()->raise();
} }
void WindowScriptingInterface::setCursorVisible(bool visible) { void WindowScriptingInterface::setCursorVisible(bool visible) {

1
interface/src/scripting/WindowScriptingInterface.h
View file

@ -43,6 +43,7 @@ public slots:
void setCursorVisible(bool visible); void setCursorVisible(bool visible);
QScriptValue hasFocus(); QScriptValue hasFocus();
void setFocus(); void setFocus();
void raiseMainWindow();
QScriptValue alert(const QString& message = ""); QScriptValue alert(const QString& message = "");
QScriptValue confirm(const QString& message = ""); QScriptValue confirm(const QString& message = "");
QScriptValue form(const QString& title, QScriptValue array); QScriptValue form(const QString& title, QScriptValue array);