From d3d107b0acd0a32cd73fdd8ac857d8e348b7f47d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 29 Nov 2017 16:12:00 -0300
Subject: [PATCH] Add Trim option in Export Sprite Sheet

---
 data/pref.xml                                |  1 +
 data/strings/en.ini                          |  1 +
 data/widgets/export_sprite_sheet.xml         |  1 +
 src/app/commands/cmd_export_sprite_sheet.cpp | 14 +++++++++++---
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index eb6c2f9b8..8d5ea2159 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -342,6 +342,7 @@
       <option id="border_padding" type="int" default="0" />
       <option id="shape_padding" type="int" default="0" />
       <option id="inner_padding" type="int" default="0" />
+      <option id="trim" type="bool" default="false" />
       <option id="open_generated" type="bool" default="false" />
       <option id="layer" type="std::string" />
       <option id="frame_tag" type="std::string" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index 16ba185be..ca086a4eb 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -234,6 +234,7 @@ padding = Padding
 border = Border:
 shape = Shape:
 inner = Inner:
+trim = Trim
 width = Width:
 height = Height:
 best_fit = Best fit for texture
diff --git a/data/widgets/export_sprite_sheet.xml b/data/widgets/export_sprite_sheet.xml
index e053a1144..21a08bfa1 100644
--- a/data/widgets/export_sprite_sheet.xml
+++ b/data/widgets/export_sprite_sheet.xml
@@ -17,6 +17,7 @@
     <hbox />
     <vbox>
       <check id="padding_enabled" text="@.padding" />
+      <check id="trim_enabled" text="@.trim" />
     </vbox>
     <grid columns="2" id="padding_container" cell_hspan="2">
       <label text="@.border" />
diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp
index dfc36214b..584d9ee71 100644
--- a/src/app/commands/cmd_export_sprite_sheet.cpp
+++ b/src/app/commands/cmd_export_sprite_sheet.cpp
@@ -188,6 +188,7 @@ public:
       m_sprite, frames(), m_docPref.spriteSheet.frameTag());
 
     openGenerated()->setSelected(m_docPref.spriteSheet.openGenerated());
+    trimEnabled()->setSelected(m_docPref.spriteSheet.trim());
 
     borderPadding()->setTextf("%d", m_docPref.spriteSheet.borderPadding());
     shapePadding()->setTextf("%d", m_docPref.spriteSheet.shapePadding());
@@ -356,6 +357,10 @@ public:
       return 0;
   }
 
+  bool trimValue() const {
+    return trimEnabled()->isSelected();
+  }
+
   bool openGeneratedValue() const {
     return openGenerated()->isSelected();
   }
@@ -641,6 +646,7 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
     docPref.spriteSheet.borderPadding(window.borderPaddingValue());
     docPref.spriteSheet.shapePadding(window.shapePaddingValue());
     docPref.spriteSheet.innerPadding(window.innerPaddingValue());
+    docPref.spriteSheet.trim(window.trimValue());
     docPref.spriteSheet.openGenerated(window.openGeneratedValue());
     docPref.spriteSheet.layer(window.layerValue());
     docPref.spriteSheet.frameTag(window.frameTagValue());
@@ -678,9 +684,10 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
   borderPadding = MID(0, borderPadding, 100);
   shapePadding = MID(0, shapePadding, 100);
   innerPadding = MID(0, innerPadding, 100);
-  bool listLayers = docPref.spriteSheet.listLayers();
-  bool listFrameTags = docPref.spriteSheet.listFrameTags();
-  bool listSlices = docPref.spriteSheet.listSlices();
+  const bool trimCels = docPref.spriteSheet.trim();
+  const bool listLayers = docPref.spriteSheet.listLayers();
+  const bool listFrameTags = docPref.spriteSheet.listFrameTags();
+  const bool listSlices = docPref.spriteSheet.listSlices();
 
   if (context->isUIAvailable() && askOverwrite) {
     if (!ask_overwrite(true, filename,
@@ -758,6 +765,7 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
   exporter.setBorderPadding(borderPadding);
   exporter.setShapePadding(shapePadding);
   exporter.setInnerPadding(innerPadding);
+  exporter.setTrimCels(trimCels);
   if (listLayers) exporter.setListLayers(true);
   if (listFrameTags) exporter.setListFrameTags(true);
   if (listSlices) exporter.setListSlices(true);