Add support for dynamic wrapping for atlas tileset

Signed-off-by: Tomas Slusny <[email protected]>

Author: deathbeam

src/tiled/tilesetmodel.cpp

@@ -49,7 +49,7 @@ int TilesetModel::rowCount(const QModelIndex &parent) const
     if (parent.isValid())
         return 0;
 
-    if (tileset()->isAtlas())
+    if (tileset()->isAtlas() && mColumnCountOverride <= 0)
         return 1;
 
     const int tileCount = mTileIds.size();
@@ -82,7 +82,7 @@ int TilesetModel::columnCount(const QModelIndex &parent) const
 
 QModelIndex TilesetModel::index(int row, int column, const QModelIndex &parent) const
 {
-    if (tileset()->isAtlas())
+    if (tileset()->isAtlas() && mColumnCountOverride <= 0)
         return createIndex(row, column);
 
     return QAbstractListModel::index(row, column, parent);
@@ -111,7 +111,7 @@ Qt::ItemFlags TilesetModel::flags(const QModelIndex &index) const
 {
     Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
 
-    if (tileset()->isAtlas() && index.column() == 0 && index.row() == 0)
+    if (tileset()->isAtlas() && mColumnCountOverride <= 0 && index.column() == 0 && index.row() == 0)
         return defaultFlags & ~Qt::ItemIsSelectable;
 
     defaultFlags |= Qt::ItemIsDropEnabled;
@@ -207,7 +207,7 @@ Tile *TilesetModel::tileAt(const QModelIndex &index) const
     if (!index.isValid())
         return nullptr;
 
-    if (tileset()->isAtlas()) {
+    if (tileset()->isAtlas() && mColumnCountOverride <= 0) {
         const QPoint gridPos(index.column() - 1, index.row());
         for (Tile *tile : tileset()->tiles()) {
             const QPoint snappedPos = snapToGrid(tile->imageRect().bottomLeft());
@@ -229,7 +229,7 @@ Tile *TilesetModel::tileAt(const QModelIndex &index) const
 QModelIndex TilesetModel::tileIndex(const Tile *tile) const
 {
     Q_ASSERT(tile->tileset() == tileset());
-    if (tileset()->isAtlas()) {
+    if (tileset()->isAtlas() && mColumnCountOverride <= 0) {
         const QPoint snappedPos = snapToGrid(tile->imageRect().bottomLeft());
         return index(snappedPos.y(), snappedPos.x() + 1);
     }

src/tiled/tilesetview.cpp

@@ -116,7 +116,7 @@ void TileDelegate::paint(QPainter *painter,
     const TilesetModel *model = static_cast<const TilesetModel*>(index.model());
     const Tileset *tileset = model->tileset();
 
-    if (tileset->isAtlas()) {
+    if (tileset->isAtlas() && !mTilesetView->dynamicWrapping()) {
         return;
     }
 
@@ -212,18 +212,26 @@ QSize TileDelegate::sizeHint(const QStyleOptionViewItem & /* option */,
     const TilesetModel *m = static_cast<const TilesetModel*>(index.model());
     const int extra = mTilesetView->drawGrid() ? 1 : 0;
     const qreal scale = mTilesetView->scale();
+    Tileset *tileset = m->tileset();
+
+    if (tileset->isAtlas() && !mTilesetView->dynamicWrapping()) {
+        return QSize(tileset->imageWidth() * scale + extra,
+                     tileset->imageHeight() * scale + extra);
+    }
 
     if (const Tile *tile = m->tileAt(index)) {
         if (mTilesetView->dynamicWrapping()) {
-            Tileset *tileset = tile->tileset();
+            if (tileset->isAtlas()) {
+                return QSize(tile->imageRect().width() * scale + extra,
+                             tile->imageRect().height() * scale + extra);
+            }
             return QSize(tileset->tileWidth() * scale + extra,
                          tileset->tileHeight() * scale + extra);
         }
 
         QSize tileSize = tile->size();
 
         if (tile->image().isNull()) {
-            Tileset *tileset = m->tileset();
             if (tileset->isCollection()) {
                 tileSize = QSize(32, 32);
             } else {
@@ -383,10 +391,8 @@ int TilesetView::sizeHintForColumn(int column) const
     const TilesetModel *model = tilesetModel();
     if (!model)
         return -1;
-    if (model->tileset()->isCollection())
+    if (model->tileset()->isCollection() || model->tileset()->isAtlas())
         return QTableView::sizeHintForColumn(column);
-    if (model->tileset()->isAtlas())
-        return model->tileset()->image().width() * scale();
 
     const int gridSpace = mDrawGrid ? 1 : 0;
     if (dynamicWrapping())
@@ -402,10 +408,8 @@ int TilesetView::sizeHintForRow(int row) const
     const TilesetModel *model = tilesetModel();
     if (!model)
         return -1;
-    if (model->tileset()->isCollection())
+    if (model->tileset()->isCollection() || model->tileset()->isAtlas())
         return QTableView::sizeHintForRow(row);
-    if (model->tileset()->isAtlas())
-        return model->tileset()->image().height() * scale();
 
     const int gridSpace = mDrawGrid ? 1 : 0;
     if (dynamicWrapping())
@@ -802,7 +806,7 @@ void TilesetView::paintEvent(QPaintEvent *event)
     QTableView::paintEvent(event);
 
     TilesetModel *model = tilesetModel();
-    if (!model || !model->tileset()->isAtlas())
+    if (!model || !model->tileset()->isAtlas() || dynamicWrapping())
         return;
 
     QPainter painter(viewport());
@@ -844,7 +848,7 @@ QModelIndex TilesetView::indexAt(const QPoint &pos) const
     if (!model())
         return QModelIndex();
 
-    if (tilesetModel() && tilesetModel()->tileset()->isAtlas()) {
+    if (tilesetModel() && tilesetModel()->tileset()->isAtlas() && !dynamicWrapping()) {
         const QPoint tilesetPos = viewToTile(pos);
 
         // Find tile that contains this position
@@ -876,7 +880,7 @@ QRect TilesetView::visualRect(const QModelIndex &index) const
         return QRect();
 
     const TilesetModel *m = tilesetModel();
-    if (m && m->tileset()->isAtlas()) {
+    if (m && m->tileset()->isAtlas() && !dynamicWrapping()) {
         if (Tile *tile = m->tileAt(index)) {
             return tileToView(tile->imageRect());
         }