Made the zoom actions also functional in the tileset editor

src/tiled/editor.h

@@ -30,6 +30,7 @@ namespace Tiled {
 namespace Internal {
 
 class Document;
+class Zoomable;
 
 class Editor : public QObject
 {
@@ -48,6 +49,7 @@ class Editor : public QObject
     virtual Document *currentDocument() const = 0;
 
     virtual QWidget *editorWidget() const = 0;
+    virtual Zoomable *zoomable() const = 0;
 
     virtual QList<QToolBar*> toolBars() const = 0;
     virtual QList<QDockWidget*> dockWidgets() const = 0;

src/tiled/mainwindow.cpp

@@ -99,7 +99,6 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags)
     : QMainWindow(parent, flags)
     , mActionManager(new ActionManager)
     , mUi(new Ui::MainWindow)
-    , mDocument(nullptr)
     , mActionHandler(new MapDocumentActionHandler(this))
     , mConsoleDock(new ConsoleDock(this))
     , mObjectTypesEditor(new ObjectTypesEditor(this))
@@ -441,6 +440,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags)
             mActionHandler, SLOT(copyPosition()));
 
     updateActions();
+    updateZoomActions();
     readSettings();
 
     connect(mAutomappingManager, SIGNAL(warningsOccurred(bool)),
@@ -1120,20 +1120,20 @@ void MainWindow::labelVisibilityActionTriggered(QAction *action)
 
 void MainWindow::zoomIn()
 {
-    if (MapView *mapView = mDocumentManager->currentMapView())
-        mapView->zoomable()->zoomIn();
+    if (mZoomable)
+        mZoomable->zoomIn();
 }
 
 void MainWindow::zoomOut()
 {
-    if (MapView *mapView = mDocumentManager->currentMapView())
-        mapView->zoomable()->zoomOut();
+    if (mZoomable)
+        mZoomable->zoomOut();
 }
 
 void MainWindow::zoomNormal()
 {
-    if (MapView *mapView = mDocumentManager->currentMapView())
-        mapView->zoomable()->resetZoom();
+    if (mZoomable)
+        mZoomable->resetZoom();
 }
 
 void MainWindow::setFullScreen(bool fullScreen)
@@ -1501,19 +1501,38 @@ void MainWindow::updateActions()
     mLayerMenu->menuAction()->setVisible(mapDocument);
 
 //    mCommandButton->setEnabled(mapDocument);
+}
 
-    updateZoomActions();
+void MainWindow::updateZoomable()
+{
+    Zoomable *zoomable = nullptr;
+    if (auto editor = mDocumentManager->currentEditor())
+        zoomable = editor->zoomable();
+
+    if (zoomable != mZoomable) {
+        if (mZoomable)
+            mZoomable->disconnect(this);
+
+        mZoomable = zoomable;
+
+        if (zoomable) {
+            connect(zoomable, &Zoomable::scaleChanged, this, &MainWindow::updateZoomActions);
+            connect(zoomable, &Zoomable::destroyed, this, [=] {
+                if (mZoomable == zoomable)
+                    mZoomable = nullptr;
+            });
+        }
+
+        updateZoomActions();
+    }
 }
 
 void MainWindow::updateZoomActions()
 {
-    MapView *mapView = mDocumentManager->currentMapView();
-
-    Zoomable *zoomable = mapView ? mapView->zoomable() : nullptr;
-    const qreal scale = zoomable ? zoomable->scale() : 1;
+    const qreal scale = mZoomable ? mZoomable->scale() : 1;
 
-    mUi->actionZoomIn->setEnabled(zoomable && zoomable->canZoomIn());
-    mUi->actionZoomOut->setEnabled(zoomable && zoomable->canZoomOut());
+    mUi->actionZoomIn->setEnabled(mZoomable && mZoomable->canZoomIn());
+    mUi->actionZoomOut->setEnabled(mZoomable && mZoomable->canZoomOut());
     mUi->actionZoomNormal->setEnabled(scale != 1);
 }
 
@@ -1595,7 +1614,6 @@ void MainWindow::retranslateUi()
 {
     updateWindowTitle();
 
-//    mRandomButton->setToolTip(tr("Random Mode"));
     mLayerMenu->setTitle(tr("&Layer"));
     mNewLayerMenu->setTitle(tr("&New"));
     mViewsAndToolbarsAction->setText(tr("Views and Toolbars"));
@@ -1632,6 +1650,7 @@ void MainWindow::documentChanged(Document *document)
 
     updateWindowTitle();
     updateActions();
+    updateZoomable();
 }
 
 void MainWindow::closeDocument(int index)

src/tiled/mainwindow.h

@@ -59,6 +59,7 @@ class MapView;
 class ObjectTypesEditor;
 class TmxMapFormat;
 class TsxTilesetFormat;
+class Zoomable;
 
 /**
  * The main editor window.
@@ -141,6 +142,7 @@ private slots:
 
     void updateWindowTitle();
     void updateActions();
+    void updateZoomable();
     void updateZoomActions();
     void openDocumentation();
     void becomePatron();
@@ -198,7 +200,8 @@ private slots:
 
     ActionManager *mActionManager;
     Ui::MainWindow *mUi;
-    Document *mDocument;
+    Document *mDocument = nullptr;
+    Zoomable *mZoomable = nullptr;
     MapDocumentActionHandler *mActionHandler;
     ConsoleDock *mConsoleDock;
     QDockWidget *mUndoDock;

src/tiled/mapeditor.cpp

@@ -533,6 +533,13 @@ MapView *MapEditor::currentMapView() const
     return viewForDocument(mCurrentMapDocument);
 }
 
+Zoomable *MapEditor::zoomable() const
+{
+    if (auto view = currentMapView())
+        return view->zoomable();
+    return nullptr;
+}
+
 void MapEditor::showMessage(const QString &text, int timeout)
 {
     mMainWindow->statusBar()->showMessage(text, timeout);

src/tiled/mapeditor.h

@@ -85,6 +85,7 @@ class MapEditor : public Editor
 
     MapView *viewForDocument(MapDocument *mapDocument) const;
     MapView *currentMapView() const;
+    Zoomable *zoomable() const override;
 
     void showMessage(const QString &text, int timeout = 0);
 

src/tiled/tileseteditor.cpp

@@ -302,6 +302,13 @@ Tileset *TilesetEditor::currentTileset() const
     return nullptr;
 }
 
+Zoomable *TilesetEditor::zoomable() const
+{
+    if (auto view = currentTilesetView())
+        return view->zoomable();
+    return nullptr;
+}
+
 void TilesetEditor::currentWidgetChanged()
 {
     auto view = static_cast<TilesetView*>(mWidgetStack->currentWidget());

src/tiled/tileseteditor.h

@@ -70,6 +70,7 @@ class TilesetEditor : public Editor
 
     TilesetView *currentTilesetView() const;
     Tileset *currentTileset() const;
+    Zoomable *zoomable() const override;
 
     TileAnimationEditor *tileAnimationEditor() const;
     TileCollisionEditor *tileCollisionEditor() const;