From 45cfb3aabd65a27d4a05805f50e71af80a1f69b1 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Tue, 14 Jul 2020 17:54:56 -0500
Subject: [PATCH] Allow 6-wide selections in tileset editor when triple layer
 is enabled

---
 include/ui/metatilelayersitem.h        | 2 +-
 include/ui/tileseteditortileselector.h | 3 ++-
 src/ui/tileseteditor.cpp               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/ui/metatilelayersitem.h b/include/ui/metatilelayersitem.h
index 58d264ad..87c6f066 100644
--- a/include/ui/metatilelayersitem.h
+++ b/include/ui/metatilelayersitem.h
@@ -9,7 +9,7 @@
 class MetatileLayersItem: public SelectablePixmapItem {
     Q_OBJECT
 public:
-    MetatileLayersItem(Metatile *metatile, Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 4, 2) {
+    MetatileLayersItem(Metatile *metatile, Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 6, 2) {
         this->metatile = metatile;
         this->primaryTileset = primaryTileset;
         this->secondaryTileset = secondaryTileset;
diff --git a/include/ui/tileseteditortileselector.h b/include/ui/tileseteditortileselector.h
index eb4fc7d6..9c8808c1 100644
--- a/include/ui/tileseteditortileselector.h
+++ b/include/ui/tileseteditortileselector.h
@@ -7,7 +7,8 @@
 class TilesetEditorTileSelector: public SelectablePixmapItem {
     Q_OBJECT
 public:
-    TilesetEditorTileSelector(Tileset *primaryTileset, Tileset *secondaryTileset): SelectablePixmapItem(16, 16, 4, 2) {
+    TilesetEditorTileSelector(Tileset *primaryTileset, Tileset *secondaryTileset, bool isTripleLayer)
+        : SelectablePixmapItem(16, 16, isTripleLayer ? 6 : 4, 2) {
         this->primaryTileset = primaryTileset;
         this->secondaryTileset = secondaryTileset;
         this->numTilesWide = 16;
diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp
index b11cfa9e..aa5fbd56 100644
--- a/src/ui/tileseteditor.cpp
+++ b/src/ui/tileseteditor.cpp
@@ -172,7 +172,7 @@ void TilesetEditor::initMetatileSelector(Map *map)
 
 void TilesetEditor::initTileSelector()
 {
-    this->tileSelector = new TilesetEditorTileSelector(this->primaryTileset, this->secondaryTileset);
+    this->tileSelector = new TilesetEditorTileSelector(this->primaryTileset, this->secondaryTileset, projectConfig.getTripleLayerMetatilesEnabled());
     connect(this->tileSelector, SIGNAL(hoveredTileChanged(uint16_t)),
             this, SLOT(onHoveredTileChanged(uint16_t)));
     connect(this->tileSelector, SIGNAL(hoveredTileCleared()),