From 0b4e24b29de1217c88b176983d13e4b862091f5d Mon Sep 17 00:00:00 2001
From: David Capello <david@igarastudio.com>
Date: Fri, 23 Oct 2020 17:19:56 -0300
Subject: [PATCH] Draw icon for tilemap layers in the tilemap

---
 data/extensions/aseprite-theme/dark/theme.xml |  5 ++++
 data/extensions/aseprite-theme/theme.xml      |  5 ++++
 src/app/ui/timeline/timeline.cpp              | 30 ++++++++++++-------
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/data/extensions/aseprite-theme/dark/theme.xml b/data/extensions/aseprite-theme/dark/theme.xml
index 53896f8e3..4dc335de1 100644
--- a/data/extensions/aseprite-theme/dark/theme.xml
+++ b/data/extensions/aseprite-theme/dark/theme.xml
@@ -861,6 +861,11 @@
             <background-border part="timeline_none" state="focus mouse" />
             <background-border part="timeline_none" state="selected" />
         </style>
+        <style id="timeline_tilemap_layer">
+            <icon part="tiles" color="timeline_normal_text" align="left middle" x="4" />
+            <icon part="tiles" color="timeline_active_text" align="left middle" x="4" state="focus" />
+            <icon part="tiles" color="timeline_clicked_text" align="left middle" x="4" state="selected" />
+        </style>
         <style id="timeline_header_frame" extends="timeline_box" font="mini">
             <text color="timeline_normal_text" />
             <text color="timeline_hover_text" state="mouse" />
diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 7651c8b11..ca6bc6525 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -854,6 +854,11 @@
             <background-border part="timeline_none" state="focus mouse" />
             <background-border part="timeline_none" state="selected" />
         </style>
+        <style id="timeline_tilemap_layer">
+            <icon part="tiles" color="timeline_normal_text" align="left middle" x="4" />
+            <icon part="tiles" color="timeline_active_text" align="left middle" x="4" state="focus" />
+            <icon part="tiles" color="timeline_clicked_text" align="left middle" x="4" state="selected" />
+        </style>
         <style id="timeline_header_frame" extends="timeline_box" font="mini">
             <text color="timeline_normal_text" />
             <text color="timeline_hover_text" state="mouse" />
diff --git a/src/app/ui/timeline/timeline.cpp b/src/app/ui/timeline/timeline.cpp
index 34121c7fa..466e04ab7 100644
--- a/src/app/ui/timeline/timeline.cpp
+++ b/src/app/ui/timeline/timeline.cpp
@@ -2108,18 +2108,12 @@ void Timeline::drawLayer(ui::Graphics* g, int layerIdx)
     textBounds.w -= w;
   }
 
+  // Layer name background
   drawPart(g, bounds, nullptr, styles.timelineLayer(),
            is_active || (clklayer && m_clk.part == PART_ROW_TEXT),
            (hotlayer && m_hot.part == PART_ROW_TEXT),
            (clklayer && m_clk.part == PART_ROW_TEXT));
 
-  drawPart(g, textBounds,
-           &layer->name(),
-           styles.timelineLayer(),
-           is_active,
-           (hotlayer && m_hot.part == PART_ROW_TEXT),
-           (clklayer && m_clk.part == PART_ROW_TEXT));
-
   if (doc::rgba_geta(layerColor) > 0) {
     // Fill with an user-defined custom color.
     auto b2 = textBounds;
@@ -2129,15 +2123,29 @@ void Timeline::drawLayer(ui::Graphics* g, int layerIdx)
                           doc::rgba_getb(layerColor),
                           doc::rgba_geta(layerColor)),
                 b2);
+  }
 
-    drawPart(g, textBounds,
-             &layer->name(),
-             styles.timelineLayerTextOnly(),
-             is_active,
+  // Tilemap icon
+  if (layer->isTilemap()) {
+    drawPart(g, textBounds, nullptr, styles.timelineTilemapLayer(),
+             is_active || (clklayer && m_clk.part == PART_ROW_TEXT),
              (hotlayer && m_hot.part == PART_ROW_TEXT),
              (clklayer && m_clk.part == PART_ROW_TEXT));
+
+    gfx::Size sz = skinTheme()->calcSizeHint(
+      this, skinTheme()->styles.timelineTilemapLayer());
+    textBounds.x += sz.w;
+    textBounds.w -= sz.w;
   }
 
+  // Layer text
+  drawPart(g, textBounds,
+           &layer->name(),
+           styles.timelineLayerTextOnly(),
+           is_active,
+           (hotlayer && m_hot.part == PART_ROW_TEXT),
+           (clklayer && m_clk.part == PART_ROW_TEXT));
+
   if (layer->isBackground()) {
     int s = ui::guiscale();
     g->fillRect(