Scripting: Added a few new ways to interact with the UI

    MapEditor.currentMapView
    MapView.scale
    MapView.centerOn(x, y)
    TileCollisionEditor.view

docs/reference/scripting.rst

@@ -1183,8 +1183,30 @@ Properties
 .. csv-table::
     :widths: 1, 2
 
-    **tilesetsView** : :ref:`script-tilesetsview` |ro|, "Access the Tilesets view."
     **currentBrush** : :ref:`script-map`, "Get or set the currently used tile brush."
+    **currentMapView** : :ref:`script-mapview` |ro|, "Access the current map view."
+    **tilesetsView** : :ref:`script-tilesetsview` |ro|, "Access the Tilesets view."
+
+.. _script-mapview:
+
+Map View
+^^^^^^^^
+
+The view displaying the map.
+
+Properties
+~~~~~~~~~~
+
+.. csv-table::
+    :widths: 1, 2
+
+    **scale** : number, "Get or set the scale of the view."
+
+Functions
+~~~~~~~~~
+
+MapView.centerOn(x : number, y : number) : void
+    Centers the view at the given location in screen coordinates.
 
 .. _script-tilesetsview:
 
@@ -1224,6 +1246,7 @@ Properties
     :widths: 1, 2
 
     **selectedObjects** : [:ref:`script-mapobject`], Selected objects.
+    **view** : [:ref:`script-mapview`], The map view used by the Collision Editor.
 
 Functions
 ~~~~~~~~~

src/tiled/mapeditor.h

@@ -76,6 +76,7 @@ class MapEditor : public Editor
 
     Q_PROPERTY(Tiled::TilesetDock *tilesetsView READ tilesetDock)
     Q_PROPERTY(Tiled::EditableMap *currentBrush READ currentBrush WRITE setCurrentBrush)
+    Q_PROPERTY(Tiled::MapView *currentMapView READ currentMapView)
 
 public:
     explicit MapEditor(QObject *parent = nullptr);

src/tiled/mapview.cpp

@@ -111,6 +111,16 @@ MapScene *MapView::mapScene() const
     return static_cast<MapScene*>(scene());
 }
 
+qreal MapView::scale() const
+{
+    return mZoomable->scale();
+}
+
+void MapView::setScale(qreal scale)
+{
+    mZoomable->setScale(scale);
+}
+
 void MapView::adjustScale(qreal scale)
 {
     const QTransform newTransform = QTransform::fromScale(scale, scale);
@@ -232,7 +242,7 @@ void MapView::forceCenterOn(const QPointF &pos)
 {
     // This is only to make it update QGraphicsViewPrivate::lastCenterPoint,
     // just in case this is important.
-    centerOn(pos);
+    QGraphicsView::centerOn(pos);
 
     auto hBar = static_cast<FlexibleScrollBar*>(horizontalScrollBar());
     auto vBar = static_cast<FlexibleScrollBar*>(verticalScrollBar());
@@ -447,5 +457,5 @@ void MapView::adjustCenterFromMousePosition(QPoint mousePos)
     QPointF viewCenterScenePos = mapToScene(view->rect().center());
     QPointF mouseScenePos = mapToScene(view->mapFromGlobal(mousePos));
     QPointF diff = viewCenterScenePos - mouseScenePos;
-    centerOn(mLastMouseScenePos + diff);
+    QGraphicsView::centerOn(mLastMouseScenePos + diff);
 }

src/tiled/mapview.h

@@ -42,6 +42,8 @@ class MapView : public QGraphicsView
 {
     Q_OBJECT
 
+    Q_PROPERTY(qreal scale READ scale WRITE setScale)
+
 public:
     /**
      * Using Qt::WA_StaticContents gives a performance boost in certain
@@ -64,9 +66,15 @@ class MapView : public QGraphicsView
 
     Zoomable *zoomable() const { return mZoomable; }
 
+    qreal scale() const;
+    void setScale(qreal scale);
+
     bool handScrolling() const { return mHandScrolling; }
     void setHandScrolling(bool handScrolling);
 
+    using QGraphicsView::centerOn;
+    Q_INVOKABLE void centerOn(qreal x, qreal y) { forceCenterOn(QPointF(x, y)); };
+
     void forceCenterOn(const QPointF &pos);
 
 protected:
@@ -110,3 +118,5 @@ class MapView : public QGraphicsView
 };
 
 } // namespace Tiled
+
+Q_DECLARE_METATYPE(Tiled::MapView*)

src/tiled/scriptmanager.cpp

@@ -31,6 +31,7 @@
 #include "editabletileset.h"
 #include "logginginterface.h"
 #include "mapeditor.h"
+#include "mapview.h"
 #include "regionvaluetype.h"
 #include "scriptedaction.h"
 #include "scriptedtool.h"
@@ -91,13 +92,14 @@ ScriptManager::ScriptManager(QObject *parent)
     qRegisterMetaType<EditableTileset*>();
     qRegisterMetaType<Font>();
     qRegisterMetaType<MapEditor*>();
+    qRegisterMetaType<MapView*>();
     qRegisterMetaType<RegionValueType>();
     qRegisterMetaType<ScriptedAction*>();
     qRegisterMetaType<ScriptedTool*>();
     qRegisterMetaType<TileCollisionDock*>();
     qRegisterMetaType<TileLayerEdit*>();
-    qRegisterMetaType<TilesetEditor*>();
     qRegisterMetaType<TilesetDock*>();
+    qRegisterMetaType<TilesetEditor*>();
 
     connect(&mWatcher, &FileSystemWatcher::filesChanged,
             this, &ScriptManager::scriptFilesChanged);

src/tiled/tilecollisiondock.h

@@ -46,6 +46,7 @@ class TileCollisionDock : public QDockWidget
     Q_OBJECT
 
     Q_PROPERTY(QList<QObject*> selectedObjects READ selectedObjectsForScript WRITE setSelectedObjectsFromScript)
+    Q_PROPERTY(Tiled::MapView *view READ mapView)
 
 public:
     enum Operation {
@@ -69,6 +70,7 @@ class TileCollisionDock : public QDockWidget
     void setTilesetDocument(TilesetDocument *tilesetDocument);
 
     MapDocument *dummyMapDocument() const;
+    MapView *mapView() const;
 
     ToolManager *toolManager() const;
 
@@ -148,6 +150,11 @@ inline MapDocument *TileCollisionDock::dummyMapDocument() const
     return mDummyMapDocument.data();
 }
 
+inline MapView *TileCollisionDock::mapView() const
+{
+    return mMapView;
+}
+
 inline ToolManager *TileCollisionDock::toolManager() const
 {
     return mToolManager;