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

PR feedback on 7480

Browse source
This commit is contained in:
Brad Davis 2016-03-28 10:19:38 -07:00
parent ae82298e1b
commit 5343dfef24
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/ui/src/QmlWindowClass.cpp
View file

@ -32,6 +32,8 @@ static const char* const WIDTH_PROPERTY = "width";
static const char* const HEIGHT_PROPERTY = "height";
static const char* const VISIBILE_PROPERTY = "visible";
static const char* const TOOLWINDOW_PROPERTY = "toolWindow";
static const uvec2 MAX_QML_WINDOW_SIZE { 1280, 720 };
static const uvec2 MIN_QML_WINDOW_SIZE { 120, 80 };
QVariantMap QmlWindowClass::parseArguments(QScriptContext* context) {
const auto argumentCount = context->argumentCount();
@ -110,13 +112,9 @@ void QmlWindowClass::initQml(QVariantMap properties) {
object->setProperty(TITLE_PROPERTY, properties[TITLE_PROPERTY].toString());
}
if (properties.contains(HEIGHT_PROPERTY) && properties.contains(WIDTH_PROPERTY)) {
auto height = properties[HEIGHT_PROPERTY].toInt();
auto width = properties[WIDTH_PROPERTY].toInt();
if (width != -1 && height != -1) {
width = std::max(100, std::min(1280, width));
height = std::max(100, std::min(720, height));
asQuickItem()->setSize(QSize(width, height));
}
uvec2 requestedSize { properties[WIDTH_PROPERTY].toUInt(), properties[HEIGHT_PROPERTY].toUInt() };
requestedSize = glm::clamp(requestedSize, MIN_QML_WINDOW_SIZE, MAX_QML_WINDOW_SIZE);
asQuickItem()->setSize(QSize(requestedSize.x, requestedSize.y));
}
bool visible = !properties.contains(VISIBILE_PROPERTY) || properties[VISIBILE_PROPERTY].toBool();

1
libraries/ui/src/QmlWindowClass.h
View file

@ -22,7 +22,6 @@ class QScriptContext;
// FIXME refactor this class to be a QQuickItem derived type and eliminate the needless wrapping
class QmlWindowClass : public QObject {
Q_OBJECT
// Q_PROPERTY(QObject* eventBridge READ getEventBridge CONSTANT)
Q_PROPERTY(glm::vec2 position READ getPosition WRITE setPosition NOTIFY positionChanged)
Q_PROPERTY(glm::vec2 size READ getSize WRITE setSize NOTIFY sizeChanged)
Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibilityChanged)