Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 440 files). Show all
Unified · Split
| @@ -105,14 +105,14 @@ void WindowScriptingInterface::raiseMainWindow() { · 104 unmodified lines | |||
| 105 | /// \param const QString& message message to display | 105 | /// \param const QString& message message to display |
| 106 | /// \return QScriptValue::UndefinedValue | 106 | /// \return QScriptValue::UndefinedValue |
| 107 | void WindowScriptingInterface::alert(const QString& message) { | 107 | void WindowScriptingInterface::alert(const QString& message) { |
| 108 | OffscreenUi::asyncWarning("", message); | 108 | OffscreenUi::asyncWarning("", message, QMessageBox::Ok, QMessageBox::Ok); |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | /// Display a confirmation box with the options 'Yes' and 'No' | 111 | /// Display a confirmation box with the options 'Yes' and 'No' |
| 112 | /// \param const QString& message message to display | 112 | /// \param const QString& message message to display |
| 113 | /// \return QScriptValue `true` if 'Yes' was clicked, `false` otherwise | 113 | /// \return QScriptValue `true` if 'Yes' was clicked, `false` otherwise |
| 114 | QScriptValue WindowScriptingInterface::confirm(const QString& message) { | 114 | QScriptValue WindowScriptingInterface::confirm(const QString& message) { |
| 115 | return QScriptValue((QMessageBox::Yes == OffscreenUi::question("", message, QMessageBox::Yes | QMessageBox::No))); | 115 | return QScriptValue((QMessageBox::Yes == OffscreenUi::question("", message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes))); |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | /// Display a prompt with a text box | 118 | /// Display a prompt with a text box |
| @@ -357,7 +357,7 @@ QScriptValue WindowScriptingInterface::browseAssets(const QString& title, const · 238 unmodified lines | |||
| 357 | return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result); | 357 | return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result); |
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | /// Display a select asset dialog that lets the user select an asset from the Asset Server. If `directory` is an invalid | 360 | /// Display a select asset dialog that lets the user select an asset from the Asset Server. If `directory` is an invalid |
| 361 | /// directory the browser will start at the root directory. | 361 | /// directory the browser will start at the root directory. |
| 362 | /// \param const QString& title title of the window | 362 | /// \param const QString& title title of the window |
| 363 | /// \param const QString& directory directory to start the asset browser at | 363 | /// \param const QString& directory directory to start the asset browser at |
| @@ -399,11 +399,11 @@ QString WindowScriptingInterface::protocolSignature() { · 35 unmodified lines | |||
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | int WindowScriptingInterface::getInnerWidth() { | 401 | int WindowScriptingInterface::getInnerWidth() { |
| 402 | return qApp->getDeviceSize().x; | 402 | return qApp->getWindow()->geometry().width(); |
| 403 | } | 403 | } |
| 404 | 404 | ||
| 405 | int WindowScriptingInterface::getInnerHeight() { | 405 | int WindowScriptingInterface::getInnerHeight() { |
| 406 | return qApp->getDeviceSize().y; | 406 | return qApp->getWindow()->geometry().height() - qApp->getPrimaryMenu()->geometry().height(); |
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | glm::vec2 WindowScriptingInterface::getDeviceSize() const { | 409 | glm::vec2 WindowScriptingInterface::getDeviceSize() const { |