QmlDesigner: Preview size is now changeable

You can now change the preview size with
rootModelNode.setAuxiliaryData("previewSize@Internal", size);
If size is null it will use the bounding box size.

Change-Id: Icbe747ccc5a2e26e79783825d2ed94ecc640012b
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.h

@@ -32,9 +32,6 @@ namespace QmlDesigner {
 
 class ChangeLanguageCommand
 {
-public:
-    friend QDataStream &operator>>(QDataStream &in, ChangeLanguageCommand &command);
-
 public:
     ChangeLanguageCommand() = default;
     ChangeLanguageCommand(const QString &language)

share/qtcreator/qml/qmlpuppet/commands/changepreviewimagesizecommand.cpp

@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+#include "changepreviewimagesizecommand.h"
+
+namespace QmlDesigner {
+
+QDataStream &operator<<(QDataStream &out, const ChangePreviewImageSizeCommand &command)
+{
+    return out << command.size;
+}
+
+QDataStream &operator>>(QDataStream &in, ChangePreviewImageSizeCommand &command)
+{
+    return in >> command.size;
+}
+
+QDebug operator<<(QDebug debug, const ChangePreviewImageSizeCommand &command)
+{
+    return debug.nospace() << "ChangePreviewImageSizeCommand(" << command.size << ")";
+}
+
+} // namespace QmlDesigner

share/qtcreator/qml/qmlpuppet/commands/changepreviewimagesizecommand.h

@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+#pragma once
+
+#include <QMetaType>
+#include <QSize>
+
+namespace QmlDesigner {
+
+class ChangePreviewImageSizeCommand
+{
+public:
+    ChangePreviewImageSizeCommand() = default;
+    ChangePreviewImageSizeCommand(const QSize &size)
+        : size(size)
+    {}
+
+    friend QDataStream &operator<<(QDataStream &out, const ChangePreviewImageSizeCommand &command);
+    friend QDataStream &operator>>(QDataStream &in, ChangePreviewImageSizeCommand &command);
+    friend QDebug operator<<(QDebug debug, const ChangePreviewImageSizeCommand &command);
+
+public:
+    QSize size;
+};
+
+} // namespace QmlDesigner
+
+Q_DECLARE_METATYPE(QmlDesigner::ChangePreviewImageSizeCommand)

share/qtcreator/qml/qmlpuppet/commands/commands.pri

@@ -1,6 +1,7 @@
 INCLUDEPATH += $$PWD/
 
-HEADERS += $$PWD/synchronizecommand.h
+HEADERS += $$PWD/synchronizecommand.h \
+HEADERS += $$PWD/changepreviewimagesizecommand.h
 HEADERS += $$PWD/changelanguagecommand.h
 HEADERS += $$PWD//debugoutputcommand.h
 HEADERS += $$PWD/endpuppetcommand.h
@@ -34,6 +35,7 @@ HEADERS += $$PWD/inputeventcommand.h
 HEADERS += $$PWD/view3dactioncommand.h
 
 SOURCES += $$PWD/synchronizecommand.cpp
+SOURCES += $$PWD/changepreviewimagesizecommand.cpp
 SOURCES += $$PWD/changelanguagecommand.cpp
 SOURCES += $$PWD/debugoutputcommand.cpp
 SOURCES += $$PWD/endpuppetcommand.cpp

share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp

@@ -40,39 +40,39 @@
 #include "changefileurlcommand.h"
 #include "changeidscommand.h"
 #include "changelanguagecommand.h"
+#include "changenodesourcecommand.h"
+#include "changepreviewimagesizecommand.h"
+#include "changeselectioncommand.h"
 #include "changestatecommand.h"
 #include "changevaluescommand.h"
+#include "childrenchangedcommand.h"
 #include "clearscenecommand.h"
 #include "completecomponentcommand.h"
+#include "componentcompletedcommand.h"
 #include "createinstancescommand.h"
 #include "createscenecommand.h"
+#include "debugoutputcommand.h"
+#include "endpuppetcommand.h"
+#include "imagecontainer.h"
+#include "informationchangedcommand.h"
 #include "inputeventcommand.h"
 #include "instancecontainer.h"
+#include "pixmapchangedcommand.h"
 #include "propertyabstractcontainer.h"
 #include "propertybindingcontainer.h"
 #include "propertyvaluecontainer.h"
+#include "puppetalivecommand.h"
+#include "puppettocreatorcommand.h"
 #include "removeinstancescommand.h"
 #include "removepropertiescommand.h"
 #include "removesharedmemorycommand.h"
 #include "reparentinstancescommand.h"
+#include "statepreviewimagechangedcommand.h"
 #include "synchronizecommand.h"
 #include "tokencommand.h"
 #include "update3dviewstatecommand.h"
-#include "view3dactioncommand.h"
-
-#include "informationchangedcommand.h"
-#include "pixmapchangedcommand.h"
 #include "valueschangedcommand.h"
-#include "childrenchangedcommand.h"
-#include "imagecontainer.h"
-#include "statepreviewimagechangedcommand.h"
-#include "componentcompletedcommand.h"
-#include "changenodesourcecommand.h"
-#include "endpuppetcommand.h"
-#include "debugoutputcommand.h"
-#include "puppetalivecommand.h"
-#include "changeselectioncommand.h"
-#include "puppettocreatorcommand.h"
+#include "view3dactioncommand.h"
 
 namespace QmlDesigner {
 
@@ -330,6 +330,11 @@ void NodeInstanceClientProxy::changeLanguage(const ChangeLanguageCommand &comman
     nodeInstanceServer()->changeLanguage(command);
 }
 
+void NodeInstanceClientProxy::changePreviewImageSize(const ChangePreviewImageSizeCommand &command)
+{
+    nodeInstanceServer()->changePreviewImageSize(command);
+}
+
 void NodeInstanceClientProxy::readDataStream()
 {
     QList<QVariant> commandList;
@@ -497,6 +502,8 @@ void NodeInstanceClientProxy::dispatchCommand(const QVariant &command)
     static const int inputEventCommandType = QMetaType::type("InputEventCommand");
     static const int view3DActionCommandType = QMetaType::type("View3DActionCommand");
     static const int changeLanguageCommand = QMetaType::type("ChangeLanguageCommand");
+    static const int changePreviewImageSizeCommand = QMetaType::type(
+        "ChangePreviewImageSizeCommand");
 
     const int commandType = command.userType();
 
@@ -548,6 +555,8 @@ void NodeInstanceClientProxy::dispatchCommand(const QVariant &command)
         changeSelection(changeSelectionCommand);
     } else if (command.userType() == changeLanguageCommand) {
         changeLanguage(command.value<ChangeLanguageCommand>());
+    } else if (command.userType() == changePreviewImageSizeCommand) {
+        changePreviewImageSize(command.value<ChangePreviewImageSizeCommand>());
     } else {
         Q_ASSERT(false);
     }

share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h

@@ -62,6 +62,7 @@ class PuppetToCreatorCommand;
 class InputEventCommand;
 class View3DActionCommand;
 class ChangeLanguageCommand;
+class ChangePreviewImageSizeCommand;
 
 class NodeInstanceClientProxy : public QObject, public NodeInstanceClientInterface
 {
@@ -118,6 +119,7 @@ protected:
     void inputEvent(const InputEventCommand &command);
     void view3DAction(const View3DActionCommand &command);
     void changeLanguage(const ChangeLanguageCommand &command);
+    void changePreviewImageSize(const ChangePreviewImageSizeCommand &command);
 
 protected slots:
     void readDataStream();

share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h

@@ -54,6 +54,7 @@ class ChangeSelectionCommand;
 class InputEventCommand;
 class View3DActionCommand;
 class ChangeLanguageCommand;
+class ChangePreviewImageSizeCommand;
 
 class NodeInstanceServerInterface : public QObject
 {
@@ -87,6 +88,7 @@ public:
     virtual void inputEvent(const InputEventCommand &command) = 0;
     virtual void view3DAction(const View3DActionCommand &command) = 0;
     virtual void changeLanguage(const ChangeLanguageCommand &command) = 0;
+    virtual void changePreviewImageSize(const ChangePreviewImageSizeCommand &command) = 0;
 
     virtual void benchmark(const QString &) {}
 

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp

@@ -1397,8 +1397,7 @@ void NodeInstanceServer::view3DAction(const View3DActionCommand &command)
     Q_UNUSED(command)
 }
 
-void NodeInstanceServer::changeLanguage(const ChangeLanguageCommand &command) {}
-}
-
-
+void NodeInstanceServer::changeLanguage(const ChangeLanguageCommand &) {}
 
+void NodeInstanceServer::changePreviewImageSize(const ChangePreviewImageSizeCommand &command) {}
+} // namespace QmlDesigner

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h

@@ -113,6 +113,7 @@ public:
     void inputEvent(const InputEventCommand &command) override;
     void view3DAction(const View3DActionCommand &command) override;
     void changeLanguage(const ChangeLanguageCommand &command) override;
+    void changePreviewImageSize(const ChangePreviewImageSizeCommand &command) override;
 
     ServerNodeInstance instanceForId(qint32 id) const;
     bool hasInstanceForId(qint32 id) const;

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp

@@ -25,10 +25,12 @@
 
 #include "qt5previewnodeinstanceserver.h"
 
-#include "nodeinstanceclientinterface.h"
-#include "statepreviewimagechangedcommand.h"
+#include "changepreviewimagesizecommand.h"
 #include "createscenecommand.h"
+#include "nodeinstanceclientinterface.h"
 #include "removesharedmemorycommand.h"
+#include "statepreviewimagechangedcommand.h"
+
 #include <QQuickView>
 #include <QQuickItem>
 #include <designersupportdelegate.h>
@@ -100,7 +102,9 @@ QImage Qt5PreviewNodeInstanceServer::renderPreviewImage()
     QRectF boundingRect = rootNodeInstance().boundingRect();
 
     QSize previewImageSize = boundingRect.size().toSize();
-    previewImageSize.scale(QSize(160, 160), Qt::KeepAspectRatio);
+
+    if (!m_previewSize.isNull())
+        previewImageSize.scale(m_previewSize, Qt::KeepAspectRatio);
 
     QImage previewImage = rootNodeInstance().renderPreviewImage(previewImageSize);
 
@@ -113,4 +117,12 @@ void QmlDesigner::Qt5PreviewNodeInstanceServer::removeSharedMemory(const QmlDesi
         ImageContainer::removeSharedMemorys(command.keyNumbers());
 }
 
+void Qt5PreviewNodeInstanceServer::changePreviewImageSize(
+    const ChangePreviewImageSizeCommand &command)
+{
+    m_previewSize = command.size;
+
+    collectItemChangesAndSendChangeCommands();
+}
+
 } // namespace QmlDesigner

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h

@@ -38,6 +38,7 @@ public:
     void createScene(const CreateSceneCommand &command) override;
     void changeState(const ChangeStateCommand &command) override;
     void removeSharedMemory(const RemoveSharedMemoryCommand &command) override;
+    void changePreviewImageSize(const ChangePreviewImageSizeCommand &command) override;
 
     QImage renderPreviewImage();
 
@@ -47,6 +48,7 @@ protected:
 
 private:
     ServerNodeInstance m_currentState;
+    QSize m_previewSize{160, 160};
 };
 
 } // namespace QmlDesigner