Merge pull request #582 from GriffinRichards/tileset-zoom

Add zoom sliders to the Tileset Editor

include/config.h

@@ -58,6 +58,8 @@ public:
         this->collisionOpacity = 50;
         this->collisionZoom = 30;
         this->metatilesZoom = 30;
+        this->tilesetEditorMetatilesZoom = 30;
+        this->tilesetEditorTilesZoom = 30;
         this->showPlayerView = false;
         this->showCursorTile = true;
         this->showBorder = true;
@@ -87,6 +89,8 @@ public:
     void setCollisionOpacity(int opacity);
     void setCollisionZoom(int zoom);
     void setMetatilesZoom(int zoom);
+    void setTilesetEditorMetatilesZoom(int zoom);
+    void setTilesetEditorTilesZoom(int zoom);
     void setShowPlayerView(bool enabled);
     void setShowCursorTile(bool enabled);
     void setShowBorder(bool enabled);
@@ -115,6 +119,8 @@ public:
     int getCollisionOpacity();
     int getCollisionZoom();
     int getMetatilesZoom();
+    int getTilesetEditorMetatilesZoom();
+    int getTilesetEditorTilesZoom();
     bool getShowPlayerView();
     bool getShowCursorTile();
     bool getShowBorder();
@@ -160,6 +166,8 @@ private:
     int collisionOpacity;
     int collisionZoom;
     int metatilesZoom;
+    int tilesetEditorMetatilesZoom;
+    int tilesetEditorTilesZoom;
     bool showPlayerView;
     bool showCursorTile;
     bool showBorder;

include/ui/tileseteditor.h

@@ -115,6 +115,8 @@ private slots:
     void on_actionCut_triggered();
     void on_actionCopy_triggered();
     void on_actionPaste_triggered();
+    void on_horizontalSlider_MetatilesZoom_valueChanged(int value);
+    void on_horizontalSlider_TilesZoom_valueChanged(int value);
 
 private:
     void initUi();

src/config.cpp

@@ -368,6 +368,10 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) {
         this->metatilesZoom = getConfigInteger(key, value, 10, 100, 30);
     } else if (key == "collision_zoom") {
         this->collisionZoom = getConfigInteger(key, value, 10, 100, 30);
+    } else if (key == "tileset_editor_metatiles_zoom") {
+        this->tilesetEditorMetatilesZoom = getConfigInteger(key, value, 10, 100, 30);
+    } else if (key == "tileset_editor_tiles_zoom") {
+        this->tilesetEditorTilesZoom = getConfigInteger(key, value, 10, 100, 30);
     } else if (key == "show_player_view") {
         this->showPlayerView = getConfigBool(key, value);
     } else if (key == "show_cursor_tile") {
@@ -427,6 +431,8 @@ QMap<QString, QString> PorymapConfig::getKeyValueMap() {
     map.insert("collision_opacity", QString::number(this->collisionOpacity));
     map.insert("collision_zoom", QString::number(this->collisionZoom));
     map.insert("metatiles_zoom", QString::number(this->metatilesZoom));
+    map.insert("tileset_editor_metatiles_zoom", QString::number(this->tilesetEditorMetatilesZoom));
+    map.insert("tileset_editor_tiles_zoom", QString::number(this->tilesetEditorTilesZoom));
     map.insert("show_player_view", this->showPlayerView ? "1" : "0");
     map.insert("show_cursor_tile", this->showCursorTile ? "1" : "0");
     map.insert("show_border", this->showBorder ? "1" : "0");
@@ -552,6 +558,16 @@ void PorymapConfig::setMetatilesZoom(int zoom) {
     // don't auto-save here because this can be called very frequently.
 }
 
+void PorymapConfig::setTilesetEditorMetatilesZoom(int zoom) {
+    this->tilesetEditorMetatilesZoom = zoom;
+    // don't auto-save here because this can be called very frequently.
+}
+
+void PorymapConfig::setTilesetEditorTilesZoom(int zoom) {
+    this->tilesetEditorTilesZoom = zoom;
+    // don't auto-save here because this can be called very frequently.
+}
+
 void PorymapConfig::setShowPlayerView(bool enabled) {
     this->showPlayerView = enabled;
     this->save();
@@ -694,6 +710,14 @@ int PorymapConfig::getMetatilesZoom() {
     return this->metatilesZoom;
 }
 
+int PorymapConfig::getTilesetEditorMetatilesZoom() {
+    return this->tilesetEditorMetatilesZoom;
+}
+
+int PorymapConfig::getTilesetEditorTilesZoom() {
+    return this->tilesetEditorTilesZoom;
+}
+
 bool PorymapConfig::getShowPlayerView() {
     return this->showPlayerView;
 }

src/ui/tileseteditor.cpp

@@ -196,7 +196,7 @@ void TilesetEditor::initMetatileSelector()
     this->metatileSelector->draw();
 
     this->ui->graphicsView_Metatiles->setScene(this->metatilesScene);
-    this->ui->graphicsView_Metatiles->setFixedSize(this->metatileSelector->pixmap().width() + 2, this->metatileSelector->pixmap().height() + 2);
+    this->ui->horizontalSlider_MetatilesZoom->setValue(porymapConfig.getTilesetEditorMetatilesZoom());
 }
 
 void TilesetEditor::initMetatileLayersItem() {
@@ -236,7 +236,7 @@ void TilesetEditor::initTileSelector()
     this->tileSelector->draw();
 
     this->ui->graphicsView_Tiles->setScene(this->tilesScene);
-    this->ui->graphicsView_Tiles->setFixedSize(this->tileSelector->pixmap().width() + 2, this->tileSelector->pixmap().height() + 2);
+    this->ui->horizontalSlider_TilesZoom->setValue(porymapConfig.getTilesetEditorTilesZoom());
 }
 
 void TilesetEditor::initSelectedTileItem() {
@@ -1182,3 +1182,31 @@ void TilesetEditor::on_copyButton_metatileLabel_clicked() {
     QGuiApplication::clipboard()->setText(label);
     QToolTip::showText(this->ui->copyButton_metatileLabel->mapToGlobal(QPoint(0, 0)), "Copied!");
 }
+
+void TilesetEditor::on_horizontalSlider_MetatilesZoom_valueChanged(int value) {
+    porymapConfig.setTilesetEditorMetatilesZoom(value);
+    double scale = pow(3.0, static_cast<double>(value - 30) / 30.0);
+
+    QTransform transform;
+    transform.scale(scale, scale);
+    QSize size(this->metatileSelector->pixmap().width(), this->metatileSelector->pixmap().height());
+    size *= scale;
+
+    this->ui->graphicsView_Metatiles->setResizeAnchor(QGraphicsView::NoAnchor);
+    this->ui->graphicsView_Metatiles->setTransform(transform);
+    this->ui->graphicsView_Metatiles->setFixedSize(size.width() + 2, size.height() + 2);
+}
+
+void TilesetEditor::on_horizontalSlider_TilesZoom_valueChanged(int value) {
+    porymapConfig.setTilesetEditorTilesZoom(value);
+    double scale = pow(3.0, static_cast<double>(value - 30) / 30.0);
+
+    QTransform transform;
+    transform.scale(scale, scale);
+    QSize size(this->tileSelector->pixmap().width(), this->tileSelector->pixmap().height());
+    size *= scale;
+
+    this->ui->graphicsView_Tiles->setResizeAnchor(QGraphicsView::NoAnchor);
+    this->ui->graphicsView_Tiles->setTransform(transform);
+    this->ui->graphicsView_Tiles->setFixedSize(size.width() + 2, size.height() + 2);
+}