From 21afd4ecb50047007d8f24e31c743652bce5b4bc Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 7 Jun 2016 19:06:36 -0300
Subject: [PATCH 01/86] Add new menu option to create a layer group

---
 data/gui.xml                           |  1 +
 data/widgets/new_layer.xml             | 10 +++++-----
 src/app/commands/cmd_new_layer_set.cpp |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/gui.xml b/data/gui.xml
index 5d515dbc6..7ac8d0865 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -664,6 +664,7 @@
         <item command="LayerVisibility" text="&amp;Visible" />
         <separator />
         <item command="NewLayer" text="&amp;New Layer" />
+        <item command="NewLayerSet" text="New &amp;Group" />
         <item command="RemoveLayer" text="&amp;Remove Layer" />
         <item command="BackgroundFromLayer" text="&amp;Background from Layer" />
         <item command="LayerFromBackground" text="&amp;Layer from Background" />
diff --git a/data/widgets/new_layer.xml b/data/widgets/new_layer.xml
index a98813d0c..c6764ac89 100644
--- a/data/widgets/new_layer.xml
+++ b/data/widgets/new_layer.xml
@@ -1,7 +1,7 @@
 <!-- ASEPRITE -->
-<!-- Copyright (C) 2001-2013 by David Capello -->
+<!-- Copyright (C) 2001-2016 by David Capello -->
 <gui>
-<window text="New Image Layer" id="new_layer">
+<window text="New Layer" id="new_layer">
   <box vertical="true">
     <box horizontal="true">
       <box vertical="true" homogeneous="true">
@@ -17,14 +17,14 @@
     </box>
   </box>
 </window>
-<window text="New Layer Set" id="new_layer_set">
+<window text="New Group" id="new_layer_set">
   <box vertical="true">
     <box horizontal="true">
       <label text="Name:" />
-      <entry maxsize="256" text="New Set" id="name" />
+      <entry maxsize="256" text="New Group" id="name" expansive="true" />
     </box>
     <box horizontal="true" homogeneous="true">
-      <button text="&amp;OK" closewindow="true" id="ok" magnet="true" />
+      <button text="&amp;OK" closewindow="true" id="ok" magnet="true" width="60" />
       <button text="&amp;Cancel" closewindow="true" />
     </box>
   </box>
diff --git a/src/app/commands/cmd_new_layer_set.cpp b/src/app/commands/cmd_new_layer_set.cpp
index f7c257acb..e8f84153a 100644
--- a/src/app/commands/cmd_new_layer_set.cpp
+++ b/src/app/commands/cmd_new_layer_set.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -67,7 +67,7 @@ void NewLayerSetCommand::onExecute(Context* context)
   std::string name = window->findChild("name")->text();
   Layer* layer;
   {
-    Transaction transaction(writer.context(), "New Layer");
+    Transaction transaction(writer.context(), "New Group");
     layer = document->getApi(transaction).newLayerFolder(sprite);
     transaction.commit();
   }

From 2f91122c261c3735f0efd1683dc90e06267d8fad Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 7 Jun 2016 19:38:56 -0300
Subject: [PATCH 02/86] Rename layer folder/set -> layer group

---
 data/gui.xml                                  |  2 +-
 src/app/cmd/add_layer.cpp                     | 38 ++++++++--------
 src/app/cmd/add_layer.h                       |  8 ++--
 src/app/cmd/flatten_layers.cpp                |  6 +--
 src/app/commands/cmd_import_sprite_sheet.cpp  |  4 +-
 src/app/commands/cmd_new_file.cpp             |  2 +-
 src/app/commands/cmd_new_layer.cpp            |  8 ++--
 src/app/commands/cmd_new_layer_set.cpp        | 22 ++++-----
 .../cmd_new_sprite_from_selection.cpp         |  4 +-
 src/app/commands/commands_list.h              |  2 +-
 .../commands/filters/filter_manager_impl.cpp  |  2 +-
 src/app/crash/read_document.cpp               |  8 ++--
 src/app/document.cpp                          | 22 ++++-----
 src/app/document_api.cpp                      | 22 ++++-----
 src/app/document_api.h                        |  8 ++--
 src/app/document_api_tests.cpp                |  4 +-
 src/app/document_exporter.cpp                 |  2 +-
 src/app/document_range_tests.cpp              | 10 ++---
 src/app/file/ase_format.cpp                   | 28 ++++++------
 src/app/file/file.cpp                         |  4 +-
 src/app/file/file_tests.cpp                   |  4 +-
 src/app/file/fli_format.cpp                   |  2 +-
 src/app/file/gif_format.cpp                   |  2 +-
 src/app/file/ico_format.cpp                   |  4 +-
 src/app/file/palette_file.cpp                 |  4 +-
 src/app/flatten.cpp                           |  8 ++--
 src/app/ui/document_view.cpp                  |  4 +-
 src/app/ui/editor/editor.cpp                  |  2 +-
 src/app/ui/timeline.cpp                       |  4 +-
 src/app/util/clipboard.cpp                    |  4 +-
 src/doc/images_collector.cpp                  |  8 ++--
 src/doc/layer.cpp                             | 30 ++++++-------
 src/doc/layer.h                               | 26 +++++------
 src/doc/layer_io.cpp                          | 16 +++----
 src/doc/object_type.h                         |  4 +-
 src/doc/sprite.cpp                            | 45 +++++++++----------
 src/doc/sprite.h                              |  6 +--
 src/doc/sprite_tests.cpp                      |  6 +--
 src/doc/test_context.h                        |  4 +-
 src/render/render.cpp                         | 12 ++---
 40 files changed, 198 insertions(+), 203 deletions(-)

diff --git a/data/gui.xml b/data/gui.xml
index 7ac8d0865..841fc4e4d 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -664,7 +664,7 @@
         <item command="LayerVisibility" text="&amp;Visible" />
         <separator />
         <item command="NewLayer" text="&amp;New Layer" />
-        <item command="NewLayerSet" text="New &amp;Group" />
+        <item command="NewLayerGroup" text="New &amp;Group" />
         <item command="RemoveLayer" text="&amp;Remove Layer" />
         <item command="BackgroundFromLayer" text="&amp;Background from Layer" />
         <item command="LayerFromBackground" text="&amp;Layer from Background" />
diff --git a/src/app/cmd/add_layer.cpp b/src/app/cmd/add_layer.cpp
index 3d9241ff7..5b5fd51ba 100644
--- a/src/app/cmd/add_layer.cpp
+++ b/src/app/cmd/add_layer.cpp
@@ -22,8 +22,8 @@ namespace cmd {
 
 using namespace doc;
 
-AddLayer::AddLayer(Layer* folder, Layer* newLayer, Layer* afterThis)
-  : m_folder(folder)
+AddLayer::AddLayer(Layer* group, Layer* newLayer, Layer* afterThis)
+  : m_group(group)
   , m_newLayer(newLayer)
   , m_afterThis(afterThis)
   , m_size(0)
@@ -32,61 +32,61 @@ AddLayer::AddLayer(Layer* folder, Layer* newLayer, Layer* afterThis)
 
 void AddLayer::onExecute()
 {
-  Layer* folder = m_folder.layer();
+  Layer* group = m_group.layer();
   Layer* newLayer = m_newLayer.layer();
   Layer* afterThis = m_afterThis.layer();
 
-  addLayer(folder, newLayer, afterThis);
+  addLayer(group, newLayer, afterThis);
 }
 
 void AddLayer::onUndo()
 {
-  Layer* folder = m_folder.layer();
+  Layer* group = m_group.layer();
   Layer* layer = m_newLayer.layer();
 
   write_layer(m_stream, layer);
   m_size = size_t(m_stream.tellp());
 
-  removeLayer(folder, layer);
+  removeLayer(group, layer);
 }
 
 void AddLayer::onRedo()
 {
-  Layer* folder = m_folder.layer();
-  SubObjectsFromSprite io(folder->sprite());
+  Layer* group = m_group.layer();
+  SubObjectsFromSprite io(group->sprite());
   Layer* newLayer = read_layer(m_stream, &io);
   Layer* afterThis = m_afterThis.layer();
 
-  addLayer(folder, newLayer, afterThis);
+  addLayer(group, newLayer, afterThis);
 
   m_stream.str(std::string());
   m_stream.clear();
   m_size = 0;
 }
 
-void AddLayer::addLayer(Layer* folder, Layer* newLayer, Layer* afterThis)
+void AddLayer::addLayer(Layer* group, Layer* newLayer, Layer* afterThis)
 {
-  static_cast<LayerFolder*>(folder)->addLayer(newLayer);
-  static_cast<LayerFolder*>(folder)->stackLayer(newLayer, afterThis);
-  folder->incrementVersion();
+  static_cast<LayerGroup*>(group)->addLayer(newLayer);
+  static_cast<LayerGroup*>(group)->stackLayer(newLayer, afterThis);
+  group->incrementVersion();
 
-  Document* doc = folder->sprite()->document();
+  Document* doc = group->sprite()->document();
   DocumentEvent ev(doc);
-  ev.sprite(folder->sprite());
+  ev.sprite(group->sprite());
   ev.layer(newLayer);
   doc->notifyObservers<DocumentEvent&>(&DocumentObserver::onAddLayer, ev);
 }
 
-void AddLayer::removeLayer(Layer* folder, Layer* layer)
+void AddLayer::removeLayer(Layer* group, Layer* layer)
 {
-  Document* doc = folder->sprite()->document();
+  Document* doc = group->sprite()->document();
   DocumentEvent ev(doc);
   ev.sprite(layer->sprite());
   ev.layer(layer);
   doc->notifyObservers<DocumentEvent&>(&DocumentObserver::onBeforeRemoveLayer, ev);
 
-  static_cast<LayerFolder*>(folder)->removeLayer(layer);
-  folder->incrementVersion();
+  static_cast<LayerGroup*>(group)->removeLayer(layer);
+  group->incrementVersion();
 
   doc->notifyObservers<DocumentEvent&>(&DocumentObserver::onAfterRemoveLayer, ev);
 
diff --git a/src/app/cmd/add_layer.h b/src/app/cmd/add_layer.h
index d9f52f18d..76844cbf2 100644
--- a/src/app/cmd/add_layer.h
+++ b/src/app/cmd/add_layer.h
@@ -24,7 +24,7 @@ namespace cmd {
 
   class AddLayer : public Cmd {
   public:
-    AddLayer(Layer* folder, Layer* newLayer, Layer* afterThis);
+    AddLayer(Layer* group, Layer* newLayer, Layer* afterThis);
 
   protected:
     void onExecute() override;
@@ -35,10 +35,10 @@ namespace cmd {
     }
 
   private:
-    void addLayer(Layer* folder, Layer* newLayer, Layer* afterThis);
-    void removeLayer(Layer* folder, Layer* layer);
+    void addLayer(Layer* group, Layer* newLayer, Layer* afterThis);
+    void removeLayer(Layer* group, Layer* layer);
 
-    WithLayer m_folder;
+    WithLayer m_group;
     WithLayer m_newLayer;
     WithLayer m_afterThis;
     size_t m_size;
diff --git a/src/app/cmd/flatten_layers.cpp b/src/app/cmd/flatten_layers.cpp
index a588b68d7..4b6bea806 100644
--- a/src/app/cmd/flatten_layers.cpp
+++ b/src/app/cmd/flatten_layers.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -56,7 +56,7 @@ void FlattenLayers::onExecute()
     // Create a new transparent layer to flatten everything onto.
     flatLayer = new LayerImage(sprite);
     ASSERT(flatLayer->isVisible());
-    executeAndAdd(new cmd::AddLayer(sprite->folder(), flatLayer, nullptr));
+    executeAndAdd(new cmd::AddLayer(sprite->root(), flatLayer, nullptr));
     executeAndAdd(new cmd::SetLayerName(flatLayer, "Flattened"));
     bgcolor = sprite->transparentColor();
   }
@@ -92,7 +92,7 @@ void FlattenLayers::onExecute()
   }
 
   // Delete old layers.
-  LayerList layers = sprite->folder()->getLayersList();
+  LayerList layers = sprite->root()->getLayersList();
   for (Layer* layer : layers)
     if (layer != flatLayer)
       executeAndAdd(new cmd::RemoveLayer(layer));
diff --git a/src/app/commands/cmd_import_sprite_sheet.cpp b/src/app/commands/cmd_import_sprite_sheet.cpp
index 820b10bbb..cb0d02521 100644
--- a/src/app/commands/cmd_import_sprite_sheet.cpp
+++ b/src/app/commands/cmd_import_sprite_sheet.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -391,7 +391,7 @@ void ImportSpriteSheetCommand::onExecute(Context* context)
     }
 
     // Copy the list of layers (because we will modify it in the iteration).
-    LayerList layers = sprite->folder()->getLayersList();
+    LayerList layers = sprite->root()->getLayersList();
 
     // Remove all other layers
     for (LayerIterator it=layers.begin(), end=layers.end(); it!=end; ++it) {
diff --git a/src/app/commands/cmd_new_file.cpp b/src/app/commands/cmd_new_file.cpp
index 10ea44fa0..9de977695 100644
--- a/src/app/commands/cmd_new_file.cpp
+++ b/src/app/commands/cmd_new_file.cpp
@@ -178,7 +178,7 @@ void NewFileCommand::onExecute(Context* context)
       // If the background color isn't transparent, we have to
       // convert the `Layer 1' in a `Background'
       if (color.getType() != app::Color::MaskType) {
-        Layer* layer = sprite->folder()->getFirstLayer();
+        Layer* layer = sprite->root()->firstLayer();
 
         if (layer && layer->isImage()) {
           LayerImage* layerImage = static_cast<LayerImage*>(layer);
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 3350efbde..6218651f5 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -127,7 +127,7 @@ void NewLayerCommand::onExecute(Context* context)
 static std::string get_unique_layer_name(Sprite* sprite)
 {
   char buf[1024];
-  std::sprintf(buf, "Layer %d", get_max_layer_num(sprite->folder())+1);
+  std::sprintf(buf, "Layer %d", get_max_layer_num(sprite->root())+1);
   return buf;
 }
 
@@ -138,9 +138,9 @@ static int get_max_layer_num(Layer* layer)
   if (std::strncmp(layer->name().c_str(), "Layer ", 6) == 0)
     max = std::strtol(layer->name().c_str()+6, NULL, 10);
 
-  if (layer->isFolder()) {
-    LayerIterator it = static_cast<LayerFolder*>(layer)->getLayerBegin();
-    LayerIterator end = static_cast<LayerFolder*>(layer)->getLayerEnd();
+  if (layer->isGroup()) {
+    LayerIterator it = static_cast<LayerGroup*>(layer)->getLayerBegin();
+    LayerIterator end = static_cast<LayerGroup*>(layer)->getLayerEnd();
 
     for (; it != end; ++it) {
       int tmp = get_max_layer_num(*it);
diff --git a/src/app/commands/cmd_new_layer_set.cpp b/src/app/commands/cmd_new_layer_set.cpp
index e8f84153a..ae85fce87 100644
--- a/src/app/commands/cmd_new_layer_set.cpp
+++ b/src/app/commands/cmd_new_layer_set.cpp
@@ -27,30 +27,30 @@ namespace app {
 
 using namespace ui;
 
-class NewLayerSetCommand : public Command {
+class NewLayerGroupCommand : public Command {
 public:
-  NewLayerSetCommand();
-  Command* clone() const override { return new NewLayerSetCommand(*this); }
+  NewLayerGroupCommand();
+  Command* clone() const override { return new NewLayerGroupCommand(*this); }
 
 protected:
   bool onEnabled(Context* context) override;
   void onExecute(Context* context) override;
 };
 
-NewLayerSetCommand::NewLayerSetCommand()
-  : Command("NewLayerSet",
-            "New Layer Set",
+NewLayerGroupCommand::NewLayerGroupCommand()
+  : Command("NewLayerGroup",
+            "New Layer Group",
             CmdRecordableFlag)
 {
 }
 
-bool NewLayerSetCommand::onEnabled(Context* context)
+bool NewLayerGroupCommand::onEnabled(Context* context)
 {
   return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
                              ContextFlags::HasActiveSprite);
 }
 
-void NewLayerSetCommand::onExecute(Context* context)
+void NewLayerGroupCommand::onExecute(Context* context)
 {
   ContextWriter writer(context);
   Document* document(writer.document());
@@ -68,7 +68,7 @@ void NewLayerSetCommand::onExecute(Context* context)
   Layer* layer;
   {
     Transaction transaction(writer.context(), "New Group");
-    layer = document->getApi(transaction).newLayerFolder(sprite);
+    layer = document->getApi(transaction).newLayerGroup(sprite);
     transaction.commit();
   }
   layer->setName(name);
@@ -79,9 +79,9 @@ void NewLayerSetCommand::onExecute(Context* context)
   StatusBar::instance()->showTip(1000, "Layer `%s' created", name.c_str());
 }
 
-Command* CommandFactory::createNewLayerSetCommand()
+Command* CommandFactory::createNewLayerGroupCommand()
 {
-  return new NewLayerSetCommand;
+  return new NewLayerGroupCommand;
 }
 
 } // namespace app
diff --git a/src/app/commands/cmd_new_sprite_from_selection.cpp b/src/app/commands/cmd_new_sprite_from_selection.cpp
index 4f3ca31fd..43109fb30 100644
--- a/src/app/commands/cmd_new_sprite_from_selection.cpp
+++ b/src/app/commands/cmd_new_sprite_from_selection.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -72,7 +72,7 @@ void NewSpriteFromSelectionCommand::onExecute(Context* context)
 
   palette->copyColorsTo(dstSprite->palette(frame_t(0)));
 
-  LayerImage* dstLayer = static_cast<LayerImage*>(dstSprite->folder()->getFirstLayer());
+  LayerImage* dstLayer = static_cast<LayerImage*>(dstSprite->root()->firstLayer());
   if (site.layer()->isBackground())
     dstLayer->configureAsBackground(); // Configure layer name as background
   dstLayer->setFlags(site.layer()->flags()); // Copy all flags
diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h
index 3447df22b..a8c826e8e 100644
--- a/src/app/commands/commands_list.h
+++ b/src/app/commands/commands_list.h
@@ -79,7 +79,7 @@ FOR_EACH_COMMAND(NewFile)
 FOR_EACH_COMMAND(NewFrame)
 FOR_EACH_COMMAND(NewFrameTag)
 FOR_EACH_COMMAND(NewLayer)
-FOR_EACH_COMMAND(NewLayerSet)
+FOR_EACH_COMMAND(NewLayerGroup)
 FOR_EACH_COMMAND(NewSpriteFromSelection)
 FOR_EACH_COMMAND(OpenFile)
 FOR_EACH_COMMAND(OpenInFolder)
diff --git a/src/app/commands/filters/filter_manager_impl.cpp b/src/app/commands/filters/filter_manager_impl.cpp
index 2805f6c22..d1396e9a2 100644
--- a/src/app/commands/filters/filter_manager_impl.cpp
+++ b/src/app/commands/filters/filter_manager_impl.cpp
@@ -206,7 +206,7 @@ void FilterManagerImpl::applyToTarget()
   bool cancelled = false;
 
   ImagesCollector images((m_target & TARGET_ALL_LAYERS ?
-                          m_site.sprite()->folder():
+                          m_site.sprite()->root():
                           m_site.layer()),
                          m_site.frame(),
                          (m_target & TARGET_ALL_FRAMES) == TARGET_ALL_FRAMES,
diff --git a/src/app/crash/read_document.cpp b/src/app/crash/read_document.cpp
index 5e4c096fc..13b937542 100644
--- a/src/app/crash/read_document.cpp
+++ b/src/app/crash/read_document.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -244,7 +244,7 @@ private:
         ObjectId layId = read32(s);
         Layer* lay = loadObject<Layer*>("lay", layId, &Reader::readLayer);
         if (lay)
-          spr->folder()->addLayer(lay);
+          spr->root()->addLayer(lay);
       }
     }
     else {
@@ -396,7 +396,7 @@ app::Document* read_document_with_raw_images(const std::string& dir,
 
   // Load each image as a new frame
   auto lay = new LayerImage(spr);
-  spr->folder()->addLayer(lay);
+  spr->root()->addLayer(lay);
 
   frame_t frame = 0;
   for (const auto& fn : base::list_files(dir)) {
@@ -421,7 +421,7 @@ app::Document* read_document_with_raw_images(const std::string& dir,
         break;
       case RawImagesAs::kLayers:
         lay = new LayerImage(spr);
-        spr->folder()->addLayer(lay);
+        spr->root()->addLayer(lay);
         break;
     }
   }
diff --git a/src/app/document.cpp b/src/app/document.cpp
index b039541b4..c22925118 100644
--- a/src/app/document.cpp
+++ b/src/app/document.cpp
@@ -324,9 +324,9 @@ void Document::copyLayerContent(const Layer* sourceLayer0, Document* destDoc, La
       newCel.release();
     }
   }
-  else if (sourceLayer0->isFolder() && destLayer0->isFolder()) {
-    const LayerFolder* sourceLayer = static_cast<const LayerFolder*>(sourceLayer0);
-    LayerFolder* destLayer = static_cast<LayerFolder*>(destLayer0);
+  else if (sourceLayer0->isGroup() && destLayer0->isGroup()) {
+    const LayerGroup* sourceLayer = static_cast<const LayerGroup*>(sourceLayer0);
+    LayerGroup* destLayer = static_cast<LayerGroup*>(destLayer0);
 
     LayerConstIterator it = sourceLayer->getLayerBegin();
     LayerConstIterator end = sourceLayer->getLayerEnd();
@@ -339,8 +339,8 @@ void Document::copyLayerContent(const Layer* sourceLayer0, Document* destDoc, La
         destChild.reset(new LayerImage(destLayer->sprite()));
         copyLayerContent(sourceChild, destDoc, destChild);
       }
-      else if (sourceChild->isFolder()) {
-        destChild.reset(new LayerFolder(destLayer->sprite()));
+      else if (sourceChild->isGroup()) {
+        destChild.reset(new LayerGroup(destLayer->sprite()));
         copyLayerContent(sourceChild, destDoc, destChild);
       }
       else {
@@ -352,7 +352,7 @@ void Document::copyLayerContent(const Layer* sourceLayer0, Document* destDoc, La
       // Add the new layer in the sprite.
 
       Layer* newLayer = destChild.release();
-      Layer* afterThis = destLayer->getLastLayer();
+      Layer* afterThis = destLayer->lastLayer();
 
       destLayer->addLayer(newLayer);
       destChild.release();
@@ -400,8 +400,8 @@ Document* Document::duplicate(DuplicateType type) const
   switch (type) {
 
     case DuplicateExactCopy:
-      // Copy the layer folder
-      copyLayerContent(sourceSprite->folder(), documentCopy, spriteCopy->folder());
+      // Copy the layer group
+      copyLayerContent(sourceSprite->root(), documentCopy, spriteCopy->root());
 
       ASSERT((spriteCopy->backgroundLayer() && sourceSprite->backgroundLayer()) ||
              (!spriteCopy->backgroundLayer() && !sourceSprite->backgroundLayer()));
@@ -410,16 +410,16 @@ Document* Document::duplicate(DuplicateType type) const
     case DuplicateWithFlattenLayers:
       {
         // Flatten layers
-        ASSERT(sourceSprite->folder() != NULL);
+        ASSERT(sourceSprite->root() != NULL);
 
         LayerImage* flatLayer = create_flatten_layer_copy
             (spriteCopy,
-             sourceSprite->folder(),
+             sourceSprite->root(),
              gfx::Rect(0, 0, sourceSprite->width(), sourceSprite->height()),
              frame_t(0), sourceSprite->lastFrame());
 
         // Add and select the new flat layer
-        spriteCopy->folder()->addLayer(flatLayer);
+        spriteCopy->root()->addLayer(flatLayer);
 
         // Configure the layer as background only if the original
         // sprite has a background layer.
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 0d617dafa..b132975ab 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -238,7 +238,7 @@ void DocumentApi::moveFrame(Sprite* sprite, frame_t frame, frame_t beforeFrame)
     adjustFrameTags(sprite, beforeFrame, +1, true);
 
     // Change cel positions.
-    moveFrameLayer(sprite->folder(), frame, beforeFrame);
+    moveFrameLayer(sprite->root(), frame, beforeFrame);
   }
 }
 
@@ -289,9 +289,9 @@ void DocumentApi::moveFrameLayer(Layer* layer, frame_t frame, frame_t beforeFram
       break;
     }
 
-    case ObjectType::LayerFolder: {
-      LayerIterator it = static_cast<LayerFolder*>(layer)->getLayerBegin();
-      LayerIterator end = static_cast<LayerFolder*>(layer)->getLayerEnd();
+    case ObjectType::LayerGroup: {
+      LayerIterator it = static_cast<LayerGroup*>(layer)->getLayerBegin();
+      LayerIterator end = static_cast<LayerGroup*>(layer)->getLayerEnd();
 
       for (; it != end; ++it)
         moveFrameLayer(*it, frame, beforeFrame);
@@ -401,23 +401,23 @@ LayerImage* DocumentApi::newLayer(Sprite* sprite, const std::string& name)
   LayerImage* layer = new LayerImage(sprite);
   layer->setName(name);
 
-  addLayer(sprite->folder(), layer,
-           sprite->folder()->getLastLayer());
+  addLayer(sprite->root(), layer,
+           sprite->root()->lastLayer());
 
   return layer;
 }
 
-LayerFolder* DocumentApi::newLayerFolder(Sprite* sprite)
+LayerGroup* DocumentApi::newLayerGroup(Sprite* sprite)
 {
-  LayerFolder* layer = new LayerFolder(sprite);
+  LayerGroup* layer = new LayerGroup(sprite);
 
-  addLayer(sprite->folder(), layer,
-           sprite->folder()->getLastLayer());
+  addLayer(sprite->root(), layer,
+           sprite->root()->lastLayer());
 
   return layer;
 }
 
-void DocumentApi::addLayer(LayerFolder* folder, Layer* newLayer, Layer* afterThis)
+void DocumentApi::addLayer(LayerGroup* folder, Layer* newLayer, Layer* afterThis)
 {
   m_transaction.execute(new cmd::AddLayer(folder, newLayer, afterThis));
 }
diff --git a/src/app/document_api.h b/src/app/document_api.h
index 4d7b6d535..d22309da6 100644
--- a/src/app/document_api.h
+++ b/src/app/document_api.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -21,7 +21,7 @@ namespace doc {
   class Cel;
   class Image;
   class Layer;
-  class LayerFolder;
+  class LayerGroup;
   class LayerImage;
   class Mask;
   class Palette;
@@ -81,8 +81,8 @@ namespace app {
 
     // Layers API
     LayerImage* newLayer(Sprite* sprite, const std::string& name);
-    LayerFolder* newLayerFolder(Sprite* sprite);
-    void addLayer(LayerFolder* folder, Layer* newLayer, Layer* afterThis);
+    LayerGroup* newLayerGroup(Sprite* sprite);
+    void addLayer(LayerGroup* folder, Layer* newLayer, Layer* afterThis);
     void removeLayer(Layer* layer);
     void restackLayerAfter(Layer* layer, Layer* afterThis);
     void restackLayerBefore(Layer* layer, Layer* beforeThis);
diff --git a/src/app/document_api_tests.cpp b/src/app/document_api_tests.cpp
index 56b852c31..5902ac2ac 100644
--- a/src/app/document_api_tests.cpp
+++ b/src/app/document_api_tests.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -26,7 +26,7 @@ TEST(DocumentApi, MoveCel) {
   TestContextT<app::Context> ctx;
   DocumentPtr doc(static_cast<app::Document*>(ctx.documents().add(32, 16)));
   Sprite* sprite = doc->sprite();
-  LayerImage* layer1 = dynamic_cast<LayerImage*>(sprite->folder()->getFirstLayer());
+  LayerImage* layer1 = dynamic_cast<LayerImage*>(sprite->root()->firstLayer());
   LayerImage* layer2 = new LayerImage(sprite);
 
   Cel* cel1 = layer1->cel(frame_t(0));
diff --git a/src/app/document_exporter.cpp b/src/app/document_exporter.cpp
index 6f3c55115..013b56dd9 100644
--- a/src/app/document_exporter.cpp
+++ b/src/app/document_exporter.cpp
@@ -396,7 +396,7 @@ Document* DocumentExporter::exportSheet()
     createEmptyTexture(samples));
 
   Sprite* texture = textureDocument->sprite();
-  Image* textureImage = texture->folder()->getFirstLayer()
+  Image* textureImage = texture->root()->firstLayer()
     ->cel(frame_t(0))->image();
 
   renderTexture(samples, textureImage);
diff --git a/src/app/document_range_tests.cpp b/src/app/document_range_tests.cpp
index d8b5deae3..f355318a9 100644
--- a/src/app/document_range_tests.cpp
+++ b/src/app/document_range_tests.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -82,13 +82,13 @@ public:
 
     doc.reset(static_cast<app::Document*>(ctx.documents().add(4, 4)));
     sprite = doc->sprite();
-    layer1 = dynamic_cast<LayerImage*>(sprite->folder()->getFirstLayer());
+    layer1 = dynamic_cast<LayerImage*>(sprite->root()->firstLayer());
     layer2 = new LayerImage(sprite);
     layer3 = new LayerImage(sprite);
     layer4 = new LayerImage(sprite);
-    sprite->folder()->addLayer(layer2);
-    sprite->folder()->addLayer(layer3);
-    sprite->folder()->addLayer(layer4);
+    sprite->root()->addLayer(layer2);
+    sprite->root()->addLayer(layer3);
+    sprite->root()->addLayer(layer4);
     EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 
     layer1->setName("layer1");
diff --git a/src/app/file/ase_format.cpp b/src/app/file/ase_format.cpp
index bd4b21c54..96c8f5d86 100644
--- a/src/app/file/ase_format.cpp
+++ b/src/app/file/ase_format.cpp
@@ -207,7 +207,7 @@ bool AseFormat::onLoad(FileOp* fop)
   sprite->setPixelRatio(PixelRatio(header.pixel_width, header.pixel_height));
 
   // Prepare variables for layer chunks
-  Layer* last_layer = sprite->folder();
+  Layer* last_layer = sprite->root();
   WithUserData* last_object_with_user_data = nullptr;
   int current_level = -1;
 
@@ -392,8 +392,8 @@ bool AseFormat::onSave(FileOp* fop)
 
     // Write extra chunks in the first frame
     if (frame == fop->roi().fromFrame()) {
-      LayerIterator it = sprite->folder()->getLayerBegin();
-      LayerIterator end = sprite->folder()->getLayerEnd();
+      LayerIterator it = sprite->root()->getLayerBegin();
+      LayerIterator end = sprite->root()->getLayerEnd();
 
       // Write layer chunks
       for (; it != end; ++it)
@@ -408,7 +408,7 @@ bool AseFormat::onSave(FileOp* fop)
 
     // Write cel chunks
     ase_file_write_cels(f, &frame_header,
-                        sprite, sprite->folder(),
+                        sprite, sprite->root(),
                         frame, fop->roi().fromFrame());
 
     // Write the frame header
@@ -580,9 +580,9 @@ static void ase_file_write_layers(FILE* f, ASE_FrameHeader* frame_header, const
   if (!layer->userData().isEmpty())
     ase_file_write_user_data_chunk(f, frame_header, &layer->userData());
 
-  if (layer->isFolder()) {
-    auto it = static_cast<const LayerFolder*>(layer)->getLayerBegin(),
-         end = static_cast<const LayerFolder*>(layer)->getLayerEnd();
+  if (layer->isGroup()) {
+    auto it = static_cast<const LayerGroup*>(layer)->getLayerBegin(),
+         end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
     for (; it != end; ++it)
       ase_file_write_layers(f, frame_header, *it);
@@ -612,9 +612,9 @@ static void ase_file_write_cels(FILE* f, ASE_FrameHeader* frame_header,
     }
   }
 
-  if (layer->isFolder()) {
-    auto it = static_cast<const LayerFolder*>(layer)->getLayerBegin(),
-         end = static_cast<const LayerFolder*>(layer)->getLayerEnd();
+  if (layer->isGroup()) {
+    auto it = static_cast<const LayerGroup*>(layer)->getLayerBegin(),
+         end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
     for (; it != end; ++it)
       ase_file_write_cels(f, frame_header, sprite, *it, frame, firstFrame);
@@ -832,7 +832,7 @@ static Layer* ase_file_read_layer_chunk(FILE* f, ASE_Header* header, Sprite* spr
   }
   // Layer set
   else if (layer_type == 1) {
-    layer = new LayerFolder(sprite);
+    layer = new LayerGroup(sprite);
   }
 
   if (layer) {
@@ -846,7 +846,7 @@ static Layer* ase_file_read_layer_chunk(FILE* f, ASE_Header* header, Sprite* spr
     if (child_level == *current_level)
       (*previous_layer)->parent()->addLayer(layer);
     else if (child_level > *current_level)
-      static_cast<LayerFolder*>(*previous_layer)->addLayer(layer);
+      static_cast<LayerGroup*>(*previous_layer)->addLayer(layer);
     else if (child_level < *current_level)
       (*previous_layer)->parent()->parent()->addLayer(layer);
 
@@ -865,10 +865,10 @@ static void ase_file_write_layer_chunk(FILE* f, ASE_FrameHeader* frame_header, c
   fputw(static_cast<int>(layer->flags()), f);
 
   // Layer type
-  fputw(layer->isImage() ? 0: (layer->isFolder() ? 1: -1), f);
+  fputw(layer->isImage() ? 0: (layer->isGroup() ? 1: -1), f);
 
   // Layer child level
-  LayerFolder* parent = layer->parent();
+  LayerGroup* parent = layer->parent();
   int child_level = -1;
   while (parent != NULL) {
     child_level++;
diff --git a/src/app/file/file.cpp b/src/app/file/file.cpp
index b367e63f4..7e866cf29 100644
--- a/src/app/file/file.cpp
+++ b/src/app/file/file.cpp
@@ -353,7 +353,7 @@ FileOp* FileOp::createSaveDocumentOperation(const Context* context,
   }
 
   // Layers support
-  if (fop->m_document->sprite()->folder()->getLayersCount() > 1) {
+  if (fop->m_document->sprite()->root()->layersCount() > 1) {
     if (!(fop->m_format->support(FILE_SUPPORT_LAYERS))) {
       warnings += "<<- Layers";
     }
@@ -842,7 +842,7 @@ Image* FileOp::sequenceImage(PixelFormat pixelFormat, int w, int h)
       LayerImage* layer = new LayerImage(sprite);
 
       // Add the layer
-      sprite->folder()->addLayer(layer);
+      sprite->root()->addLayer(layer);
 
       // Done
       createDocument(sprite);
diff --git a/src/app/file/file_tests.cpp b/src/app/file/file_tests.cpp
index 05515b589..27b3d403f 100644
--- a/src/app/file/file_tests.cpp
+++ b/src/app/file/file_tests.cpp
@@ -37,7 +37,7 @@ TEST(File, SeveralSizes)
         doc->setFilename(&fn[0]);
 
         // Random pixels
-        Layer* layer = doc->sprite()->folder()->getFirstLayer();
+        Layer* layer = doc->sprite()->root()->firstLayer();
         ASSERT_TRUE(layer != NULL);
         Image* image = layer->cel(frame_t(0))->image();
         std::srand(w*h);
@@ -60,7 +60,7 @@ TEST(File, SeveralSizes)
         ASSERT_EQ(h, doc->sprite()->height());
 
         // Same random pixels (see the seed)
-        Layer* layer = doc->sprite()->folder()->getFirstLayer();
+        Layer* layer = doc->sprite()->root()->firstLayer();
         ASSERT_TRUE(layer != nullptr);
         Image* image = layer->cel(frame_t(0))->image();
         std::srand(w*h);
diff --git a/src/app/file/fli_format.cpp b/src/app/file/fli_format.cpp
index 456bc59c7..1c12ea377 100644
--- a/src/app/file/fli_format.cpp
+++ b/src/app/file/fli_format.cpp
@@ -74,7 +74,7 @@ bool FliFormat::onLoad(FileOp* fop)
   // Create the sprite
   Sprite* sprite = new Sprite(IMAGE_INDEXED, w, h, 256);
   LayerImage* layer = new LayerImage(sprite);
-  sprite->folder()->addLayer(layer);
+  sprite->root()->addLayer(layer);
   layer->configureAsBackground();
 
   // Set frames and speed
diff --git a/src/app/file/gif_format.cpp b/src/app/file/gif_format.cpp
index 023d98ce5..7f244f82c 100644
--- a/src/app/file/gif_format.cpp
+++ b/src/app/file/gif_format.cpp
@@ -679,7 +679,7 @@ private:
     clear_image(m_previousImage.get(), m_bgIndex);
 
     m_layer = new LayerImage(m_sprite.get());
-    m_sprite->folder()->addLayer(m_layer);
+    m_sprite->root()->addLayer(m_layer);
   }
 
   void resetRemap(int ncolors) {
diff --git a/src/app/file/ico_format.cpp b/src/app/file/ico_format.cpp
index 6436dc886..1f797ae0f 100644
--- a/src/app/file/ico_format.cpp
+++ b/src/app/file/ico_format.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -127,7 +127,7 @@ bool IcoFormat::onLoad(FileOp* fop)
   // Create the sprite with one background layer
   Sprite* sprite = new Sprite(pixelFormat, width, height, numcolors);
   LayerImage* layer = new LayerImage(sprite);
-  sprite->folder()->addLayer(layer);
+  sprite->root()->addLayer(layer);
 
   // Create the first image/cel
   ImageRef image(Image::create(pixelFormat, width, height));
diff --git a/src/app/file/palette_file.cpp b/src/app/file/palette_file.cpp
index 6ebe2c0b0..cc6177a1c 100644
--- a/src/app/file/palette_file.cpp
+++ b/src/app/file/palette_file.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -119,7 +119,7 @@ bool save_palette(const char *filename, const Palette* pal, int columns)
       Sprite* sprite = doc->sprite();
       doc->sprite()->setPalette(pal, false);
 
-      Layer* layer = sprite->folder()->getFirstLayer();
+      Layer* layer = sprite->root()->firstLayer();
       Image* image = layer->cel(frame_t(0))->image();
 
       int x, y, c;
diff --git a/src/app/flatten.cpp b/src/app/flatten.cpp
index ddd5be5db..b6af78c84 100644
--- a/src/app/flatten.cpp
+++ b/src/app/flatten.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -66,9 +66,9 @@ static bool has_cels(const Layer* layer, frame_t frame)
     case ObjectType::LayerImage:
       return (layer->cel(frame) ? true: false);
 
-    case ObjectType::LayerFolder: {
-      LayerConstIterator it = static_cast<const LayerFolder*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerFolder*>(layer)->getLayerEnd();
+    case ObjectType::LayerGroup: {
+      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
+      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
       for (; it != end; ++it) {
         if (has_cels(*it, frame))
diff --git a/src/app/ui/document_view.cpp b/src/app/ui/document_view.cpp
index 48f9af230..47287f1a9 100644
--- a/src/app/ui/document_view.cpp
+++ b/src/app/ui/document_view.cpp
@@ -357,7 +357,7 @@ void DocumentView::onBeforeRemoveLayer(doc::DocumentEvent& ev)
 
   // If the layer that was removed is the selected one
   if (layer == m_editor->layer()) {
-    LayerFolder* parent = layer->parent();
+    LayerGroup* parent = layer->parent();
     Layer* layer_select = NULL;
 
     // Select previous layer, or next layer, or the parent (if it is
@@ -366,7 +366,7 @@ void DocumentView::onBeforeRemoveLayer(doc::DocumentEvent& ev)
       layer_select = layer->getPrevious();
     else if (layer->getNext())
       layer_select = layer->getNext();
-    else if (parent != sprite->folder())
+    else if (parent != sprite->root())
       layer_select = parent;
 
     m_editor->setLayer(layer_select);
diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index cc54e787c..e07a773fb 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -152,7 +152,7 @@ Editor::Editor(Document* document, EditorFlags flags)
   , m_decorator(NULL)
   , m_document(document)
   , m_sprite(m_document->sprite())
-  , m_layer(m_sprite->folder()->getFirstLayer())
+  , m_layer(m_sprite->root()->firstLayer())
   , m_frame(frame_t(0))
   , m_docPref(Preferences::instance().document(document))
   , m_brushPreview(this)
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index a16660805..e8bcc972e 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -1060,7 +1060,7 @@ void Timeline::onAfterRemoveLayer(doc::DocumentEvent& ev)
 
   // If the layer that was removed is the selected one
   if (layer == getLayer()) {
-    LayerFolder* parent = layer->parent();
+    LayerGroup* parent = layer->parent();
     Layer* layer_select = NULL;
 
     // Select previous layer, or next layer, or the parent (if it is
@@ -1069,7 +1069,7 @@ void Timeline::onAfterRemoveLayer(doc::DocumentEvent& ev)
       layer_select = layer->getPrevious();
     else if (layer->getNext())
       layer_select = layer->getNext();
-    else if (parent != sprite->folder())
+    else if (parent != sprite->root())
       layer_select = parent;
 
     setLayer(layer_select);
diff --git a/src/app/util/clipboard.cpp b/src/app/util/clipboard.cpp
index 96cb5f477..897cae6c1 100644
--- a/src/app/util/clipboard.cpp
+++ b/src/app/util/clipboard.cpp
@@ -520,10 +520,10 @@ void paste()
               afterThis = nullptr;
             }
             else
-              afterThis = dstSpr->folder()->getLastLayer();
+              afterThis = dstSpr->root()->lastLayer();
 
             LayerImage* newLayer = new LayerImage(dstSpr);
-            api.addLayer(dstSpr->folder(), newLayer, afterThis);
+            api.addLayer(dstSpr->root(), newLayer, afterThis);
 
             srcDoc->copyLayerContent(
               srcLayers[i], dstDoc, newLayer);
diff --git a/src/doc/images_collector.cpp b/src/doc/images_collector.cpp
index cd8d8adf7..0fa35aa02 100644
--- a/src/doc/images_collector.cpp
+++ b/src/doc/images_collector.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2014 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -53,9 +53,9 @@ void ImagesCollector::collectFromLayer(Layer* layer, frame_t frame)
       break;
     }
 
-    case ObjectType::LayerFolder: {
-      LayerIterator it = static_cast<LayerFolder*>(layer)->getLayerBegin();
-      LayerIterator end = static_cast<LayerFolder*>(layer)->getLayerEnd();
+    case ObjectType::LayerGroup: {
+      LayerIterator it = static_cast<LayerGroup*>(layer)->getLayerBegin();
+      LayerIterator end = static_cast<LayerGroup*>(layer)->getLayerEnd();
 
       for (; it != end; ++it)
         collectFromLayer(*it, frame);
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index 5c98bd1c5..095190b46 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -28,7 +28,7 @@ Layer::Layer(ObjectType type, Sprite* sprite)
       int(LayerFlags::Visible) |
       int(LayerFlags::Editable)))
 {
-  ASSERT(type == ObjectType::LayerImage || type == ObjectType::LayerFolder);
+  ASSERT(type == ObjectType::LayerImage || type == ObjectType::LayerGroup);
 
   setName("Layer");
 }
@@ -242,7 +242,7 @@ void LayerImage::configureAsBackground()
   switchFlags(LayerFlags::BackgroundLayerFlags, true);
   setName("Background");
 
-  sprite()->folder()->stackLayer(this, NULL);
+  sprite()->root()->stackLayer(this, NULL);
 }
 
 void LayerImage::displaceFrames(frame_t fromThis, frame_t delta)
@@ -264,20 +264,20 @@ void LayerImage::displaceFrames(frame_t fromThis, frame_t delta)
 }
 
 //////////////////////////////////////////////////////////////////////
-// LayerFolder class
+// LayerGroup class
 
-LayerFolder::LayerFolder(Sprite* sprite)
-  : Layer(ObjectType::LayerFolder, sprite)
+LayerGroup::LayerGroup(Sprite* sprite)
+  : Layer(ObjectType::LayerGroup, sprite)
 {
   setName("Layer Set");
 }
 
-LayerFolder::~LayerFolder()
+LayerGroup::~LayerGroup()
 {
   destroyAllLayers();
 }
 
-void LayerFolder::destroyAllLayers()
+void LayerGroup::destroyAllLayers()
 {
   LayerIterator it = getLayerBegin();
   LayerIterator end = getLayerEnd();
@@ -289,9 +289,9 @@ void LayerFolder::destroyAllLayers()
   m_layers.clear();
 }
 
-int LayerFolder::getMemSize() const
+int LayerGroup::getMemSize() const
 {
-  int size = sizeof(LayerFolder);
+  int size = sizeof(LayerGroup);
   LayerConstIterator it = getLayerBegin();
   LayerConstIterator end = getLayerEnd();
 
@@ -303,7 +303,7 @@ int LayerFolder::getMemSize() const
   return size;
 }
 
-void LayerFolder::getCels(CelList& cels) const
+void LayerGroup::getCels(CelList& cels) const
 {
   LayerConstIterator it = getLayerBegin();
   LayerConstIterator end = getLayerEnd();
@@ -312,13 +312,13 @@ void LayerFolder::getCels(CelList& cels) const
     (*it)->getCels(cels);
 }
 
-void LayerFolder::addLayer(Layer* layer)
+void LayerGroup::addLayer(Layer* layer)
 {
   m_layers.push_back(layer);
   layer->setParent(this);
 }
 
-void LayerFolder::removeLayer(Layer* layer)
+void LayerGroup::removeLayer(Layer* layer)
 {
   LayerIterator it = std::find(m_layers.begin(), m_layers.end(), layer);
   ASSERT(it != m_layers.end());
@@ -327,7 +327,7 @@ void LayerFolder::removeLayer(Layer* layer)
   layer->setParent(NULL);
 }
 
-void LayerFolder::stackLayer(Layer* layer, Layer* after)
+void LayerGroup::stackLayer(Layer* layer, Layer* after)
 {
   ASSERT(layer != after);
   if (layer == after)
@@ -347,7 +347,7 @@ void LayerFolder::stackLayer(Layer* layer, Layer* after)
     m_layers.insert(m_layers.begin(), layer);
 }
 
-void LayerFolder::displaceFrames(frame_t fromThis, frame_t delta)
+void LayerGroup::displaceFrames(frame_t fromThis, frame_t delta)
 {
   for (Layer* layer : m_layers)
     layer->displaceFrames(fromThis, delta);
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 95cf3d06e..bf7c83adc 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -24,7 +24,7 @@ namespace doc {
   class Sprite;
   class Layer;
   class LayerImage;
-  class LayerFolder;
+  class LayerGroup;
 
   //////////////////////////////////////////////////////////////////////
   // Layer class
@@ -52,15 +52,15 @@ namespace doc {
     void setName(const std::string& name) { m_name = name; }
 
     Sprite* sprite() const { return m_sprite; }
-    LayerFolder* parent() const { return m_parent; }
-    void setParent(LayerFolder* folder) { m_parent = folder; }
+    LayerGroup* parent() const { return m_parent; }
+    void setParent(LayerGroup* group) { m_parent = group; }
 
     // Gets the previous sibling of this layer.
     Layer* getPrevious() const;
     Layer* getNext() const;
 
     bool isImage() const { return type() == ObjectType::LayerImage; }
-    bool isFolder() const { return type() == ObjectType::LayerFolder; }
+    bool isGroup() const { return type() == ObjectType::LayerGroup; }
 
     bool isBackground() const { return hasFlags(LayerFlags::Background); }
     bool isVisible() const    { return hasFlags(LayerFlags::Visible); }
@@ -100,7 +100,7 @@ namespace doc {
   private:
     std::string m_name;           // layer name
     Sprite* m_sprite;             // owner of the layer
-    LayerFolder* m_parent;        // parent layer
+    LayerGroup* m_parent;        // parent layer
     LayerFlags m_flags;           // stack order cannot be changed
 
     // Disable assigment
@@ -153,12 +153,12 @@ namespace doc {
   };
 
   //////////////////////////////////////////////////////////////////////
-  // LayerFolder class
+  // LayerGroup class
 
-  class LayerFolder : public Layer {
+  class LayerGroup : public Layer {
   public:
-    explicit LayerFolder(Sprite* sprite);
-    virtual ~LayerFolder();
+    explicit LayerGroup(Sprite* sprite);
+    virtual ~LayerGroup();
 
     virtual int getMemSize() const override;
 
@@ -167,14 +167,14 @@ namespace doc {
     LayerIterator getLayerEnd() { return m_layers.end(); }
     LayerConstIterator getLayerBegin() const { return m_layers.begin(); }
     LayerConstIterator getLayerEnd() const { return m_layers.end(); }
-    int getLayersCount() const { return (int)m_layers.size(); }
+    int layersCount() const { return (int)m_layers.size(); }
 
     void addLayer(Layer* layer);
     void removeLayer(Layer* layer);
     void stackLayer(Layer* layer, Layer* after);
 
-    Layer* getFirstLayer() { return (m_layers.empty() ? NULL: m_layers.front()); }
-    Layer* getLastLayer() { return (m_layers.empty() ? NULL: m_layers.back()); }
+    Layer* firstLayer() { return (m_layers.empty() ? NULL: m_layers.front()); }
+    Layer* lastLayer() { return (m_layers.empty() ? NULL: m_layers.back()); }
 
     void getCels(CelList& cels) const override;
     void displaceFrames(frame_t fromThis, frame_t delta) override;
diff --git a/src/doc/layer_io.cpp b/src/doc/layer_io.cpp
index 066b03457..a2964262e 100644
--- a/src/doc/layer_io.cpp
+++ b/src/doc/layer_io.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -87,12 +87,12 @@ void write_layer(std::ostream& os, const Layer* layer)
       break;
     }
 
-    case ObjectType::LayerFolder: {
-      LayerConstIterator it = static_cast<const LayerFolder*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerFolder*>(layer)->getLayerEnd();
+    case ObjectType::LayerGroup: {
+      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
+      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
       // Number of sub-layers
-      write16(os, static_cast<const LayerFolder*>(layer)->getLayersCount());
+      write16(os, static_cast<const LayerGroup*>(layer)->layersCount());
 
       for (; it != end; ++it)
         write_layer(os, *it);
@@ -150,16 +150,16 @@ Layer* read_layer(std::istream& is, SubObjectsFromSprite* subObjects)
       break;
     }
 
-    case ObjectType::LayerFolder: {
+    case ObjectType::LayerGroup: {
       // Create the layer set
-      layer.reset(new LayerFolder(subObjects->sprite()));
+      layer.reset(new LayerGroup(subObjects->sprite()));
 
       // Number of sub-layers
       int layers = read16(is);
       for (int c=0; c<layers; c++) {
         Layer* child = read_layer(is, subObjects);
         if (child)
-          static_cast<LayerFolder*>(layer.get())->addLayer(child);
+          static_cast<LayerGroup*>(layer.get())->addLayer(child);
         else
           break;
       }
diff --git a/src/doc/object_type.h b/src/doc/object_type.h
index cb7dcaf14..60cb53f4f 100644
--- a/src/doc/object_type.h
+++ b/src/doc/object_type.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -20,7 +20,7 @@ namespace doc {
     Cel,
     CelData,
     LayerImage,
-    LayerFolder,
+    LayerGroup,
     Sprite,
     Document,
     FrameTag,
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index 391ef51f5..c7ca825ee 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -47,7 +47,7 @@ Sprite::Sprite(PixelFormat format, int width, int height, int ncolors)
   ASSERT(width > 0 && height > 0);
 
   m_frlens.push_back(100);      // First frame with 100 msecs of duration
-  m_folder = new LayerFolder(this);
+  m_root = new LayerGroup(this);
 
   // Generate palette
   switch (format) {
@@ -84,7 +84,7 @@ Sprite::Sprite(const ImageSpec& spec, int ncolors)
 Sprite::~Sprite()
 {
   // Destroy layers
-  delete m_folder;
+  delete m_root;
 
   // Destroy palettes
   {
@@ -125,7 +125,7 @@ Sprite* Sprite::createBasicSprite(doc::PixelFormat format, int width, int height
     }
 
     // Add the layer in the sprite.
-    sprite->folder()->addLayer(layer.release()); // Release the layer because it's owned by the sprite
+    sprite->root()->addLayer(layer.release()); // Release the layer because it's owned by the sprite
   }
 
   return sprite.release();
@@ -200,15 +200,10 @@ int Sprite::getMemSize() const
 //////////////////////////////////////////////////////////////////////
 // Layers
 
-LayerFolder* Sprite::folder() const
-{
-  return m_folder;
-}
-
 LayerImage* Sprite::backgroundLayer() const
 {
-  if (folder()->getLayersCount() > 0) {
-    Layer* bglayer = *folder()->getLayerBegin();
+  if (root()->layersCount() > 0) {
+    Layer* bglayer = *root()->getLayerBegin();
 
     if (bglayer->isBackground()) {
       ASSERT(bglayer->isImage());
@@ -220,7 +215,7 @@ LayerImage* Sprite::backgroundLayer() const
 
 LayerIndex Sprite::countLayers() const
 {
-  return LayerIndex(folder()->getLayersCount());
+  return LayerIndex(root()->layersCount());
 }
 
 LayerIndex Sprite::firstLayer() const
@@ -230,7 +225,7 @@ LayerIndex Sprite::firstLayer() const
 
 LayerIndex Sprite::lastLayer() const
 {
-  return LayerIndex(folder()->getLayersCount()-1);
+  return LayerIndex(root()->layersCount()-1);
 }
 
 Layer* Sprite::layer(int layerIndex) const
@@ -244,20 +239,20 @@ Layer* Sprite::indexToLayer(LayerIndex index) const
     return NULL;
 
   int index_count = -1;
-  return index2layer(folder(), index, &index_count);
+  return index2layer(root(), index, &index_count);
 }
 
 LayerIndex Sprite::layerToIndex(const Layer* layer) const
 {
   int index_count = -1;
-  return layer2index(folder(), layer, &index_count);
+  return layer2index(root(), layer, &index_count);
 }
 
 void Sprite::getLayersList(std::vector<Layer*>& layers) const
 {
-  // TODO support subfolders
-  LayerConstIterator it = m_folder->getLayerBegin();
-  LayerConstIterator end = m_folder->getLayerEnd();
+  // TODO support subgroups
+  LayerConstIterator it = m_root->getLayerBegin();
+  LayerConstIterator end = m_root->getLayerEnd();
 
   for (; it != end; ++it) {
     layers.push_back(*it);
@@ -383,12 +378,12 @@ void Sprite::addFrame(frame_t newFrame)
   for (frame_t i=m_frames-1; i>=newFrame; --i)
     setFrameDuration(i, frameDuration(i-1));
 
-  folder()->displaceFrames(newFrame, +1);
+  root()->displaceFrames(newFrame, +1);
 }
 
 void Sprite::removeFrame(frame_t frame)
 {
-  folder()->displaceFrames(frame, -1);
+  root()->displaceFrames(frame, -1);
 
   frame_t newTotal = m_frames-1;
   for (frame_t i=frame; i<newTotal; ++i)
@@ -575,11 +570,11 @@ static Layer* index2layer(const Layer* layer, const LayerIndex& index, int* inde
   else {
     (*index_count)++;
 
-    if (layer->isFolder()) {
+    if (layer->isGroup()) {
       Layer *found;
 
-      LayerConstIterator it = static_cast<const LayerFolder*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerFolder*>(layer)->getLayerEnd();
+      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
+      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
       for (; it != end; ++it) {
         if ((found = index2layer(*it, index, index_count)))
@@ -598,11 +593,11 @@ static LayerIndex layer2index(const Layer* layer, const Layer* find_layer, int*
   else {
     (*index_count)++;
 
-    if (layer->isFolder()) {
+    if (layer->isGroup()) {
       int found;
 
-      LayerConstIterator it = static_cast<const LayerFolder*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerFolder*>(layer)->getLayerEnd();
+      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
+      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
       for (; it != end; ++it) {
         if ((found = layer2index(*it, find_layer, index_count)) >= 0)
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index 59f340919..8147a6525 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -31,7 +31,7 @@ namespace doc {
   class Document;
   class Image;
   class Layer;
-  class LayerFolder;
+  class LayerGroup;
   class LayerImage;
   class LayersRange;
   class Mask;
@@ -90,7 +90,7 @@ namespace doc {
     ////////////////////////////////////////
     // Layers
 
-    LayerFolder* folder() const;
+    LayerGroup* root() const { return m_root; }
     LayerImage* backgroundLayer() const;
 
     LayerIndex countLayers() const;
@@ -167,7 +167,7 @@ namespace doc {
     frame_t m_frames;                      // how many frames has this sprite
     std::vector<int> m_frlens;             // duration per frame
     PalettesList m_palettes;               // list of palettes
-    LayerFolder* m_folder;                 // main folder of layers
+    LayerGroup* m_root;                    // main group of layers
 
     // Current rgb map
     mutable RgbMap* m_rgbMap;
diff --git a/src/doc/sprite_tests.cpp b/src/doc/sprite_tests.cpp
index 33da90405..ef5624408 100644
--- a/src/doc/sprite_tests.cpp
+++ b/src/doc/sprite_tests.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -27,8 +27,8 @@ TEST(Sprite, CelsRange)
 
   LayerImage* lay1 = new LayerImage(spr);
   LayerImage* lay2 = new LayerImage(spr);
-  spr->folder()->addLayer(lay1);
-  spr->folder()->addLayer(lay2);
+  spr->root()->addLayer(lay1);
+  spr->root()->addLayer(lay2);
 
   ImageRef imgA(Image::create(IMAGE_RGB, 32, 32));
   Cel* celA = new Cel(frame_t(0), imgA);
diff --git a/src/doc/test_context.h b/src/doc/test_context.h
index 9b8e1bb30..9a676a1f7 100644
--- a/src/doc/test_context.h
+++ b/src/doc/test_context.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -31,7 +31,7 @@ namespace doc {
 
       site->document(doc);
       site->sprite(doc->sprite());
-      site->layer(doc->sprite()->folder()->getFirstLayer());
+      site->layer(doc->sprite()->root()->firstLayer());
       site->frame(0);
     }
 
diff --git a/src/render/render.cpp b/src/render/render.cpp
index c36d0fac7..8437ae434 100644
--- a/src/render/render.cpp
+++ b/src/render/render.cpp
@@ -528,7 +528,7 @@ void Render::renderSprite(
   // Draw the background layer.
   m_globalOpacity = 255;
   renderLayer(
-    m_sprite->folder(), dstImage,
+    m_sprite->root(), dstImage,
     area, frame, scaled_func,
     true,
     false,
@@ -541,7 +541,7 @@ void Render::renderSprite(
   // Draw the transparent layers.
   m_globalOpacity = 255;
   renderLayer(
-    m_sprite->folder(), dstImage,
+    m_sprite->root(), dstImage,
     area, frame, scaled_func,
     false,
     true,
@@ -578,7 +578,7 @@ void Render::renderOnionskin(
   if (m_onionskin.type() != OnionskinType::NONE) {
     FrameTag* loop = m_onionskin.loopTag();
     Layer* onionLayer = (m_onionskin.layer() ? m_onionskin.layer():
-                                               m_sprite->folder());
+                                               m_sprite->root());
     frame_t frameIn;
 
     for (frame_t frameOut = frame - m_onionskin.prevFrames();
@@ -802,9 +802,9 @@ void Render::renderLayer(
       break;
     }
 
-    case ObjectType::LayerFolder: {
-      LayerConstIterator it = static_cast<const LayerFolder*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerFolder*>(layer)->getLayerEnd();
+    case ObjectType::LayerGroup: {
+      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
+      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
       for (; it != end; ++it) {
         renderLayer(

From 389ea666e5d817138fde4629a05ee249210018aa Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 8 Jun 2016 15:01:02 -0300
Subject: [PATCH 03/86] Fix crash trying to paint in a group layer

---
 src/app/ui/editor/standby_state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index 66c323bb9..951c3d1b2 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -297,7 +297,7 @@ bool StandbyState::onMouseDown(Editor* editor, MouseMessage* msg)
   }
 
   // Start the Tool-Loop
-  if (layer) {
+  if (layer && layer->isImage()) {
     // Disable layer edges to avoid showing the modified cel
     // information by ExpandCelCanvas (i.e. the cel origin is changed
     // to 0,0 coordinate.)

From 44f44c3126edd55edd5ea9e48450a35c09f87680 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 8 Jun 2016 15:15:37 -0300
Subject: [PATCH 04/86] Paint groups with a folder icon in the Timeline

---
 data/skins/default/sheet.png | Bin 14189 -> 14296 bytes
 data/skins/default/skin.xml  |  18 +++++++++++++++
 src/app/ui/timeline.cpp      |  43 ++++++++++++++++++++++++-----------
 src/doc/layer.h              |  15 ++++++++----
 4 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/data/skins/default/sheet.png b/data/skins/default/sheet.png
index bc0ab7ac1f1e10744a73a04232ac0eac029542a0..60327820060900bae59e511982761625b57fa7b7 100644
GIT binary patch
delta 13969
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
K!DZ4${{IJ7UZ}VL

delta 13899
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

diff --git a/data/skins/default/skin.xml b/data/skins/default/skin.xml
index ce0f74400..dfd22cd04 100644
--- a/data/skins/default/skin.xml
+++ b/data/skins/default/skin.xml
@@ -329,6 +329,10 @@
     <part id="timeline_continuous_active"       x="288" y="36" w="12" h="12" />
     <part id="timeline_discontinuous_normal"    x="276" y="48" w="12" h="12" />
     <part id="timeline_discontinuous_active"    x="288" y="48" w="12" h="12" />
+    <part id="timeline_closed_group_normal"     x="276" y="60" w="12" h="12" />
+    <part id="timeline_closed_group_active"     x="288" y="60" w="12" h="12" />
+    <part id="timeline_open_group_normal"       x="276" y="72" w="12" h="12" />
+    <part id="timeline_open_group_active"       x="288" y="72" w="12" h="12" />
     <part id="timeline_empty_frame_normal"      x="240" y="60" w="12" h="12" />
     <part id="timeline_empty_frame_active"      x="252" y="60" w="12" h="12" />
     <part id="timeline_keyframe_normal"         x="240" y="72" w="12" h="12" />
@@ -560,6 +564,20 @@
       <icon part="timeline_discontinuous_active" />
     </style>
 
+    <!-- timeline_group -->
+    <style id="timeline_closed_group" base="timeline_box">
+      <icon part="timeline_closed_group_normal" align="center" valign="middle" />
+    </style>
+    <style id="timeline_closed_group:active">
+      <icon part="timeline_closed_group_active" />
+    </style>
+    <style id="timeline_open_group" base="timeline_box">
+      <icon part="timeline_open_group_normal" align="center" valign="middle" />
+    </style>
+    <style id="timeline_open_group:active">
+      <icon part="timeline_open_group_active" />
+    </style>
+
     <!-- timeline_layer -->
     <style id="timeline_layer" base="timeline_box">
       <text align="left" valign="middle" padding-left="4" />
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index e8bcc972e..17b3f187c 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -662,8 +662,13 @@ bool Timeline::onProcessMessage(Message* msg)
           case PART_LAYER_CONTINUOUS_ICON:
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
               Layer* layer = m_layers[m_clk.layer];
-              ASSERT(layer != NULL);
-              layer->setContinuous(!layer->isContinuous());
+              ASSERT(layer);
+              if (layer) {
+                if (layer->isImage())
+                  layer->setContinuous(!layer->isContinuous());
+                else if (layer->isGroup())
+                  layer->setCollapsed(!layer->isCollapsed());
+              }
             }
             break;
 
@@ -1355,13 +1360,22 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
     (hotlayer && m_hot.part == PART_LAYER_PADLOCK_ICON),
     (clklayer && m_clk.part == PART_LAYER_PADLOCK_ICON));
 
-  // Draw the continuous flag.
+  // Draw the continuous flag/group icon.
   bounds = getPartBounds(Hit(PART_LAYER_CONTINUOUS_ICON, layerIdx));
-  drawPart(g, bounds, NULL,
-    layer->isContinuous() ? styles.timelineContinuous(): styles.timelineDiscontinuous(),
-    is_active,
-    (hotlayer && m_hot.part == PART_LAYER_CONTINUOUS_ICON),
-    (clklayer && m_clk.part == PART_LAYER_CONTINUOUS_ICON));
+  if (layer->isImage()) {
+    drawPart(g, bounds, NULL,
+             layer->isContinuous() ? styles.timelineContinuous(): styles.timelineDiscontinuous(),
+             is_active,
+             (hotlayer && m_hot.part == PART_LAYER_CONTINUOUS_ICON),
+             (clklayer && m_clk.part == PART_LAYER_CONTINUOUS_ICON));
+  }
+  else if (layer->isGroup()) {
+    drawPart(g, bounds, NULL,
+             layer->isCollapsed() ? styles.timelineClosedGroup(): styles.timelineOpenGroup(),
+             is_active,
+             (hotlayer && m_hot.part == PART_LAYER_CONTINUOUS_ICON),
+             (clklayer && m_clk.part == PART_LAYER_CONTINUOUS_ICON));
+  }
 
   // Get the layer's name bounds.
   bounds = getPartBounds(Hit(PART_LAYER_TEXT, layerIdx));
@@ -2179,11 +2193,14 @@ void Timeline::updateStatusBar(ui::Message* msg)
         break;
 
       case PART_LAYER_CONTINUOUS_ICON:
-        if (layer != NULL) {
-          sb->setStatusText(0, "Layer '%s' is %s (%s)",
-            layer->name().c_str(),
-            layer->isContinuous() ? "continuous": "discontinuous",
-            layer->isContinuous() ? "prefer linked cels/frames": "prefer individual cels/frames");
+        if (layer) {
+          if (layer->isImage())
+            sb->setStatusText(0, "Layer '%s' is %s (%s)",
+                              layer->name().c_str(),
+                              layer->isContinuous() ? "continuous": "discontinuous",
+                              layer->isContinuous() ? "prefer linked cels/frames": "prefer individual cels/frames");
+          else if (layer->isGroup())
+            sb->setStatusText(0, "Group '%s'", layer->name().c_str());
           return;
         }
         break;
diff --git a/src/doc/layer.h b/src/doc/layer.h
index bf7c83adc..36c9564f3 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -35,6 +35,7 @@ namespace doc {
     LockMove   = 4,             // Cannot be moved
     Background = 8,             // Stack order cannot be changed
     Continuous = 16,            // Prefer to link cels when the user copy them
+    Collapsed  = 32,            // Prefer to show this group layer collapsed
 
     BackgroundLayerFlags = LockMove | Background,
   };
@@ -62,17 +63,21 @@ namespace doc {
     bool isImage() const { return type() == ObjectType::LayerImage; }
     bool isGroup() const { return type() == ObjectType::LayerGroup; }
 
-    bool isBackground() const { return hasFlags(LayerFlags::Background); }
-    bool isVisible() const    { return hasFlags(LayerFlags::Visible); }
-    bool isEditable() const   { return hasFlags(LayerFlags::Editable); }
-    bool isMovable() const    { return !hasFlags(LayerFlags::LockMove); }
-    bool isContinuous() const { return hasFlags(LayerFlags::Continuous); }
+    bool isBackground() const  { return hasFlags(LayerFlags::Background); }
+    bool isTransparent() const { return !hasFlags(LayerFlags::Background); }
+    bool isVisible() const     { return hasFlags(LayerFlags::Visible); }
+    bool isEditable() const    { return hasFlags(LayerFlags::Editable); }
+    bool isMovable() const     { return !hasFlags(LayerFlags::LockMove); }
+    bool isContinuous() const  { return hasFlags(LayerFlags::Continuous); }
+    bool isCollapsed() const   { return hasFlags(LayerFlags::Collapsed); }
+    bool isExpanded() const    { return !hasFlags(LayerFlags::Collapsed); }
 
     void setBackground(bool state) { switchFlags(LayerFlags::Background, state); }
     void setVisible   (bool state) { switchFlags(LayerFlags::Visible, state); }
     void setEditable  (bool state) { switchFlags(LayerFlags::Editable, state); }
     void setMovable   (bool state) { switchFlags(LayerFlags::LockMove, !state); }
     void setContinuous(bool state) { switchFlags(LayerFlags::Continuous, state); }
+    void setCollapsed (bool state) { switchFlags(LayerFlags::Collapsed, state); }
 
     LayerFlags flags() const {
       return m_flags;

From 33d7f6509f9e80115c9b2a73f8153739e8bba149 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 8 Jun 2016 15:20:11 -0300
Subject: [PATCH 05/86] Rename NewLayerGroup command -> NewGroup command

---
 data/gui.xml                                  |  2 +-
 src/app/CMakeLists.txt                        |  2 +-
 ...md_new_layer_set.cpp => cmd_new_group.cpp} | 20 +++++++++----------
 src/app/commands/commands_list.h              |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename src/app/commands/{cmd_new_layer_set.cpp => cmd_new_group.cpp} (77%)

diff --git a/data/gui.xml b/data/gui.xml
index 841fc4e4d..cbc67e228 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -664,7 +664,7 @@
         <item command="LayerVisibility" text="&amp;Visible" />
         <separator />
         <item command="NewLayer" text="&amp;New Layer" />
-        <item command="NewLayerGroup" text="New &amp;Group" />
+        <item command="NewGroup" text="New &amp;Group" />
         <item command="RemoveLayer" text="&amp;Remove Layer" />
         <item command="BackgroundFromLayer" text="&amp;Background from Layer" />
         <item command="LayerFromBackground" text="&amp;Layer from Background" />
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 903cb3bbc..ef4b1525c 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -228,8 +228,8 @@ add_library(app-lib
   commands/cmd_new_file.cpp
   commands/cmd_new_frame.cpp
   commands/cmd_new_frame_tag.cpp
+  commands/cmd_new_group.cpp
   commands/cmd_new_layer.cpp
-  commands/cmd_new_layer_set.cpp
   commands/cmd_new_sprite_from_selection.cpp
   commands/cmd_onionskin.cpp
   commands/cmd_open_file.cpp
diff --git a/src/app/commands/cmd_new_layer_set.cpp b/src/app/commands/cmd_new_group.cpp
similarity index 77%
rename from src/app/commands/cmd_new_layer_set.cpp
rename to src/app/commands/cmd_new_group.cpp
index ae85fce87..a19ee2076 100644
--- a/src/app/commands/cmd_new_layer_set.cpp
+++ b/src/app/commands/cmd_new_group.cpp
@@ -27,30 +27,30 @@ namespace app {
 
 using namespace ui;
 
-class NewLayerGroupCommand : public Command {
+class NewGroupCommand : public Command {
 public:
-  NewLayerGroupCommand();
-  Command* clone() const override { return new NewLayerGroupCommand(*this); }
+  NewGroupCommand();
+  Command* clone() const override { return new NewGroupCommand(*this); }
 
 protected:
   bool onEnabled(Context* context) override;
   void onExecute(Context* context) override;
 };
 
-NewLayerGroupCommand::NewLayerGroupCommand()
-  : Command("NewLayerGroup",
+NewGroupCommand::NewGroupCommand()
+  : Command("NewGroup",
             "New Layer Group",
             CmdRecordableFlag)
 {
 }
 
-bool NewLayerGroupCommand::onEnabled(Context* context)
+bool NewGroupCommand::onEnabled(Context* context)
 {
   return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
                              ContextFlags::HasActiveSprite);
 }
 
-void NewLayerGroupCommand::onExecute(Context* context)
+void NewGroupCommand::onExecute(Context* context)
 {
   ContextWriter writer(context);
   Document* document(writer.document());
@@ -76,12 +76,12 @@ void NewLayerGroupCommand::onExecute(Context* context)
   update_screen_for_document(document);
 
   StatusBar::instance()->invalidate();
-  StatusBar::instance()->showTip(1000, "Layer `%s' created", name.c_str());
+  StatusBar::instance()->showTip(1000, "Group `%s' created", name.c_str());
 }
 
-Command* CommandFactory::createNewLayerGroupCommand()
+Command* CommandFactory::createNewGroupCommand()
 {
-  return new NewLayerGroupCommand;
+  return new NewGroupCommand;
 }
 
 } // namespace app
diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h
index a8c826e8e..0c0bda2b7 100644
--- a/src/app/commands/commands_list.h
+++ b/src/app/commands/commands_list.h
@@ -78,8 +78,8 @@ FOR_EACH_COMMAND(NewBrush)
 FOR_EACH_COMMAND(NewFile)
 FOR_EACH_COMMAND(NewFrame)
 FOR_EACH_COMMAND(NewFrameTag)
+FOR_EACH_COMMAND(NewGroup)
 FOR_EACH_COMMAND(NewLayer)
-FOR_EACH_COMMAND(NewLayerGroup)
 FOR_EACH_COMMAND(NewSpriteFromSelection)
 FOR_EACH_COMMAND(OpenFile)
 FOR_EACH_COMMAND(OpenInFolder)

From f6fa39ba527e4249fdfacbe2d1b50273364d6a70 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 8 Jun 2016 15:23:51 -0300
Subject: [PATCH 06/86] Merge NewGroup command into NewLayer command

---
 data/gui.xml                       |  4 +-
 data/widgets/new_layer.xml         | 38 +++++--------
 src/app/CMakeLists.txt             |  1 -
 src/app/commands/cmd_new_group.cpp | 87 ------------------------------
 src/app/commands/cmd_new_layer.cpp | 71 +++++++++++++++---------
 src/app/commands/commands_list.h   |  1 -
 src/app/document_api.cpp           |  3 +-
 src/app/document_api.h             |  2 +-
 8 files changed, 65 insertions(+), 142 deletions(-)
 delete mode 100644 src/app/commands/cmd_new_group.cpp

diff --git a/data/gui.xml b/data/gui.xml
index cbc67e228..6bb608ba0 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -664,7 +664,9 @@
         <item command="LayerVisibility" text="&amp;Visible" />
         <separator />
         <item command="NewLayer" text="&amp;New Layer" />
-        <item command="NewGroup" text="New &amp;Group" />
+        <item command="NewLayer" text="New &amp;Group">
+          <param name="group" value="true" />
+	</item>
         <item command="RemoveLayer" text="&amp;Remove Layer" />
         <item command="BackgroundFromLayer" text="&amp;Background from Layer" />
         <item command="LayerFromBackground" text="&amp;Layer from Background" />
diff --git a/data/widgets/new_layer.xml b/data/widgets/new_layer.xml
index c6764ac89..91b5d21b6 100644
--- a/data/widgets/new_layer.xml
+++ b/data/widgets/new_layer.xml
@@ -1,32 +1,20 @@
 <!-- ASEPRITE -->
 <!-- Copyright (C) 2001-2016 by David Capello -->
 <gui>
-<window text="New Layer" id="new_layer">
-  <box vertical="true">
-    <box horizontal="true">
-      <box vertical="true" homogeneous="true">
-        <label text="Name:" />
+  <window text="New Layer" id="new_layer">
+    <box vertical="true">
+      <box horizontal="true">
+	<box vertical="true" homogeneous="true">
+          <label text="Name:" />
+	</box>
+	<box vertical="true" homogeneous="true">
+          <entry maxsize="256" text="New Layer" id="name" magnet="true" />
+	</box>
       </box>
-      <box vertical="true" homogeneous="true">
-        <entry maxsize="256" text="New Layer" id="name" magnet="true" />
+      <box horizontal="true" homogeneous="true">
+	<button text="&amp;OK" closewindow="true" id="ok" magnet="true" />
+	<button text="&amp;Cancel" closewindow="true" />
       </box>
     </box>
-    <box horizontal="true" homogeneous="true">
-      <button text="&amp;OK" closewindow="true" id="ok" magnet="true" />
-      <button text="&amp;Cancel" closewindow="true" />
-    </box>
-  </box>
-</window>
-<window text="New Group" id="new_layer_set">
-  <box vertical="true">
-    <box horizontal="true">
-      <label text="Name:" />
-      <entry maxsize="256" text="New Group" id="name" expansive="true" />
-    </box>
-    <box horizontal="true" homogeneous="true">
-      <button text="&amp;OK" closewindow="true" id="ok" magnet="true" width="60" />
-      <button text="&amp;Cancel" closewindow="true" />
-    </box>
-  </box>
-</window>
+  </window>
 </gui>
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index ef4b1525c..0366f9b7f 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -228,7 +228,6 @@ add_library(app-lib
   commands/cmd_new_file.cpp
   commands/cmd_new_frame.cpp
   commands/cmd_new_frame_tag.cpp
-  commands/cmd_new_group.cpp
   commands/cmd_new_layer.cpp
   commands/cmd_new_sprite_from_selection.cpp
   commands/cmd_onionskin.cpp
diff --git a/src/app/commands/cmd_new_group.cpp b/src/app/commands/cmd_new_group.cpp
deleted file mode 100644
index a19ee2076..000000000
--- a/src/app/commands/cmd_new_group.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Aseprite
-// Copyright (C) 2001-2016  David Capello
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "app/app.h"
-#include "app/commands/command.h"
-#include "app/context_access.h"
-#include "app/document_api.h"
-#include "app/document_api.h"
-#include "app/find_widget.h"
-#include "app/load_widget.h"
-#include "app/modules/gui.h"
-#include "app/ui/status_bar.h"
-#include "app/transaction.h"
-#include "doc/layer.h"
-#include "doc/sprite.h"
-#include "ui/ui.h"
-
-namespace app {
-
-using namespace ui;
-
-class NewGroupCommand : public Command {
-public:
-  NewGroupCommand();
-  Command* clone() const override { return new NewGroupCommand(*this); }
-
-protected:
-  bool onEnabled(Context* context) override;
-  void onExecute(Context* context) override;
-};
-
-NewGroupCommand::NewGroupCommand()
-  : Command("NewGroup",
-            "New Layer Group",
-            CmdRecordableFlag)
-{
-}
-
-bool NewGroupCommand::onEnabled(Context* context)
-{
-  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
-                             ContextFlags::HasActiveSprite);
-}
-
-void NewGroupCommand::onExecute(Context* context)
-{
-  ContextWriter writer(context);
-  Document* document(writer.document());
-  Sprite* sprite(writer.sprite());
-
-  // load the window widget
-  base::UniquePtr<Window> window(app::load_widget<Window>("new_layer.xml", "new_layer_set"));
-
-  window->openWindowInForeground();
-
-  if (window->closer() != window->findChild("ok"))
-    return;
-
-  std::string name = window->findChild("name")->text();
-  Layer* layer;
-  {
-    Transaction transaction(writer.context(), "New Group");
-    layer = document->getApi(transaction).newLayerGroup(sprite);
-    transaction.commit();
-  }
-  layer->setName(name);
-
-  update_screen_for_document(document);
-
-  StatusBar::instance()->invalidate();
-  StatusBar::instance()->showTip(1000, "Group `%s' created", name.c_str());
-}
-
-Command* CommandFactory::createNewGroupCommand()
-{
-  return new NewGroupCommand;
-}
-
-} // namespace app
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 6218651f5..886fb414e 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -24,6 +24,8 @@
 #include "doc/sprite.h"
 #include "ui/ui.h"
 
+#include "new_layer.xml.h"
+
 #include <cstdio>
 #include <cstring>
 
@@ -42,14 +44,16 @@ protected:
   void onExecute(Context* context) override;
 
 private:
+  std::string getUniqueLayerName(const Sprite* sprite) const;
+  int getMaxLayerNum(const Layer* layer) const;
+  const char* layerPrefix() const;
+
   bool m_ask;
   bool m_top;
+  bool m_group;
   std::string m_name;
 };
 
-static std::string get_unique_layer_name(Sprite* sprite);
-static int get_max_layer_num(Layer* layer);
-
 NewLayerCommand::NewLayerCommand()
   : Command("NewLayer",
             "New Layer",
@@ -57,6 +61,7 @@ NewLayerCommand::NewLayerCommand()
 {
   m_ask = false;
   m_top = false;
+  m_group = false;
   m_name = "";
 }
 
@@ -64,6 +69,7 @@ void NewLayerCommand::onLoadParams(const Params& params)
 {
   m_ask = (params.get("ask") == "true");
   m_top = (params.get("top") == "true");
+  m_group = (params.get("group") == "true");
   m_name = params.get("name");
 }
 
@@ -84,30 +90,33 @@ void NewLayerCommand::onExecute(Context* context)
   if (!m_name.empty())
     name = m_name;
   else
-    name = get_unique_layer_name(sprite);
+    name = getUniqueLayerName(sprite);
 
   // If params specify to ask the user about the name...
   if (m_ask) {
     // We open the window to ask the name
-    base::UniquePtr<Window> window(app::load_widget<Window>("new_layer.xml", "new_layer"));
-    Widget* name_widget = app::find_widget<Widget>(window, "name");
-    name_widget->setText(name.c_str());
-    name_widget->setMinSize(gfx::Size(128, 0));
-
-    window->openWindowInForeground();
-
-    if (window->closer() != window->findChild("ok"))
+    app::gen::NewLayer window;
+    window.name()->setText(name.c_str());
+    window.name()->setMinSize(gfx::Size(128, 0));
+    window.openWindowInForeground();
+    if (window.closer() != window.ok())
       return;
 
-    name = window->findChild("name")->text();
+    name = window.name()->text();
   }
 
   Layer* activeLayer = writer.layer();
   Layer* layer;
   {
-    Transaction transaction(writer.context(), "New Layer");
+    Transaction transaction(
+      writer.context(),
+      std::string("New ") + layerPrefix());
     DocumentApi api = document->getApi(transaction);
-    layer = api.newLayer(sprite, name);
+
+    if (m_group)
+      layer = api.newGroup(sprite, name);
+    else
+      layer = api.newLayer(sprite, name);
 
     // If "top" parameter is false, create the layer above the active
     // one.
@@ -119,31 +128,38 @@ void NewLayerCommand::onExecute(Context* context)
   update_screen_for_document(document);
 
   StatusBar::instance()->invalidate();
-  StatusBar::instance()->showTip(1000, "Layer `%s' created", name.c_str());
+  StatusBar::instance()->showTip(
+    1000, "%s '%s' created",
+    layerPrefix(),
+    name.c_str());
 
   App::instance()->mainWindow()->popTimeline();
 }
 
-static std::string get_unique_layer_name(Sprite* sprite)
+std::string NewLayerCommand::getUniqueLayerName(const Sprite* sprite) const
 {
   char buf[1024];
-  std::sprintf(buf, "Layer %d", get_max_layer_num(sprite->root())+1);
+  std::sprintf(buf, "%s %d",
+               layerPrefix(),
+               getMaxLayerNum(sprite->root())+1);
   return buf;
 }
 
-static int get_max_layer_num(Layer* layer)
+int NewLayerCommand::getMaxLayerNum(const Layer* layer) const
 {
-  int max = 0;
+  std::string prefix = layerPrefix();
+  prefix += " ";
 
-  if (std::strncmp(layer->name().c_str(), "Layer ", 6) == 0)
-    max = std::strtol(layer->name().c_str()+6, NULL, 10);
+  int max = 0;
+  if (std::strncmp(layer->name().c_str(), prefix.c_str(), prefix.size()) == 0)
+    max = std::strtol(layer->name().c_str()+prefix.size(), NULL, 10);
 
   if (layer->isGroup()) {
-    LayerIterator it = static_cast<LayerGroup*>(layer)->getLayerBegin();
-    LayerIterator end = static_cast<LayerGroup*>(layer)->getLayerEnd();
+    auto it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
+    auto end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
 
     for (; it != end; ++it) {
-      int tmp = get_max_layer_num(*it);
+      int tmp = getMaxLayerNum(*it);
       max = MAX(tmp, max);
     }
   }
@@ -151,6 +167,11 @@ static int get_max_layer_num(Layer* layer)
   return max;
 }
 
+const char* NewLayerCommand::layerPrefix() const
+{
+  return (m_group ? "Group": "Layer");
+}
+
 Command* CommandFactory::createNewLayerCommand()
 {
   return new NewLayerCommand;
diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h
index 0c0bda2b7..fd58521b5 100644
--- a/src/app/commands/commands_list.h
+++ b/src/app/commands/commands_list.h
@@ -78,7 +78,6 @@ FOR_EACH_COMMAND(NewBrush)
 FOR_EACH_COMMAND(NewFile)
 FOR_EACH_COMMAND(NewFrame)
 FOR_EACH_COMMAND(NewFrameTag)
-FOR_EACH_COMMAND(NewGroup)
 FOR_EACH_COMMAND(NewLayer)
 FOR_EACH_COMMAND(NewSpriteFromSelection)
 FOR_EACH_COMMAND(OpenFile)
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index b132975ab..053545f37 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -407,9 +407,10 @@ LayerImage* DocumentApi::newLayer(Sprite* sprite, const std::string& name)
   return layer;
 }
 
-LayerGroup* DocumentApi::newLayerGroup(Sprite* sprite)
+LayerGroup* DocumentApi::newGroup(Sprite* sprite, const std::string& name)
 {
   LayerGroup* layer = new LayerGroup(sprite);
+  layer->setName(name);
 
   addLayer(sprite->root(), layer,
            sprite->root()->lastLayer());
diff --git a/src/app/document_api.h b/src/app/document_api.h
index d22309da6..2edbfdaee 100644
--- a/src/app/document_api.h
+++ b/src/app/document_api.h
@@ -81,7 +81,7 @@ namespace app {
 
     // Layers API
     LayerImage* newLayer(Sprite* sprite, const std::string& name);
-    LayerGroup* newLayerGroup(Sprite* sprite);
+    LayerGroup* newGroup(Sprite* sprite, const std::string& name);
     void addLayer(LayerGroup* folder, Layer* newLayer, Layer* afterThis);
     void removeLayer(Layer* layer);
     void restackLayerAfter(Layer* layer, Layer* afterThis);

From 64c1ecf555565f305d461278287fb9ce903aad61 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 8 Jun 2016 15:55:44 -0300
Subject: [PATCH 07/86] Add support to create layers inside groups

---
 src/app/commands/cmd_import_sprite_sheet.cpp |  2 +-
 src/app/commands/cmd_new_layer.cpp           | 17 +++++++++++++++--
 src/app/document_api.cpp                     | 20 ++++++++------------
 src/app/document_api.h                       |  6 +++---
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/app/commands/cmd_import_sprite_sheet.cpp b/src/app/commands/cmd_import_sprite_sheet.cpp
index cb0d02521..873b41b8d 100644
--- a/src/app/commands/cmd_import_sprite_sheet.cpp
+++ b/src/app/commands/cmd_import_sprite_sheet.cpp
@@ -378,7 +378,7 @@ void ImportSpriteSheetCommand::onExecute(Context* context)
     DocumentApi api = document->getApi(transaction);
 
     // Add the layer in the sprite.
-    LayerImage* resultLayer = api.newLayer(sprite, "Sprite Sheet");
+    LayerImage* resultLayer = api.newLayer(sprite->root(), "Sprite Sheet");
 
     // Add all frames+cels to the new layer
     for (size_t i=0; i<animation.size(); ++i) {
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 886fb414e..113b6d613 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -105,7 +105,20 @@ void NewLayerCommand::onExecute(Context* context)
     name = window.name()->text();
   }
 
+  LayerGroup* parent = sprite->root();
   Layer* activeLayer = writer.layer();
+  if (activeLayer) {
+    if (activeLayer->isGroup() &&
+        activeLayer->isExpanded() &&
+        !m_group) {
+      parent = static_cast<LayerGroup*>(activeLayer);
+      activeLayer = nullptr;
+    }
+    else {
+      parent = activeLayer->parent();
+    }
+  }
+
   Layer* layer;
   {
     Transaction transaction(
@@ -114,9 +127,9 @@ void NewLayerCommand::onExecute(Context* context)
     DocumentApi api = document->getApi(transaction);
 
     if (m_group)
-      layer = api.newGroup(sprite, name);
+      layer = api.newGroup(parent, name);
     else
-      layer = api.newLayer(sprite, name);
+      layer = api.newLayer(parent, name);
 
     // If "top" parameter is false, create the layer above the active
     // one.
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 053545f37..4bcf30dff 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -396,31 +396,27 @@ void DocumentApi::swapCel(
   if (cel2) setCelFramePosition(cel2, frame1);
 }
 
-LayerImage* DocumentApi::newLayer(Sprite* sprite, const std::string& name)
+LayerImage* DocumentApi::newLayer(LayerGroup* parent, const std::string& name)
 {
-  LayerImage* layer = new LayerImage(sprite);
+  LayerImage* layer = new LayerImage(parent->sprite());
   layer->setName(name);
 
-  addLayer(sprite->root(), layer,
-           sprite->root()->lastLayer());
-
+  addLayer(parent, layer, parent->lastLayer());
   return layer;
 }
 
-LayerGroup* DocumentApi::newGroup(Sprite* sprite, const std::string& name)
+LayerGroup* DocumentApi::newGroup(LayerGroup* parent, const std::string& name)
 {
-  LayerGroup* layer = new LayerGroup(sprite);
+  LayerGroup* layer = new LayerGroup(parent->sprite());
   layer->setName(name);
 
-  addLayer(sprite->root(), layer,
-           sprite->root()->lastLayer());
-
+  addLayer(parent, layer, parent->lastLayer());
   return layer;
 }
 
-void DocumentApi::addLayer(LayerGroup* folder, Layer* newLayer, Layer* afterThis)
+void DocumentApi::addLayer(LayerGroup* parent, Layer* newLayer, Layer* afterThis)
 {
-  m_transaction.execute(new cmd::AddLayer(folder, newLayer, afterThis));
+  m_transaction.execute(new cmd::AddLayer(parent, newLayer, afterThis));
 }
 
 void DocumentApi::removeLayer(Layer* layer)
diff --git a/src/app/document_api.h b/src/app/document_api.h
index 2edbfdaee..8bfb999ac 100644
--- a/src/app/document_api.h
+++ b/src/app/document_api.h
@@ -80,9 +80,9 @@ namespace app {
       LayerImage* layer, frame_t frame1, frame_t frame2);
 
     // Layers API
-    LayerImage* newLayer(Sprite* sprite, const std::string& name);
-    LayerGroup* newGroup(Sprite* sprite, const std::string& name);
-    void addLayer(LayerGroup* folder, Layer* newLayer, Layer* afterThis);
+    LayerImage* newLayer(LayerGroup* parent, const std::string& name);
+    LayerGroup* newGroup(LayerGroup* parent, const std::string& name);
+    void addLayer(LayerGroup* parent, Layer* newLayer, Layer* afterThis);
     void removeLayer(Layer* layer);
     void restackLayerAfter(Layer* layer, Layer* afterThis);
     void restackLayerBefore(Layer* layer, Layer* beforeThis);

From f1f3dc91deeb300b8c36336365fc579e8bb13037 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 8 Jun 2016 16:12:24 -0300
Subject: [PATCH 08/86] Rename LayerGroup::getLayersList -> layers()

---
 src/app/cmd/flatten_layers.cpp               | 2 +-
 src/app/commands/cmd_import_sprite_sheet.cpp | 2 +-
 src/doc/layer.h                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/cmd/flatten_layers.cpp b/src/app/cmd/flatten_layers.cpp
index 4b6bea806..a634598a0 100644
--- a/src/app/cmd/flatten_layers.cpp
+++ b/src/app/cmd/flatten_layers.cpp
@@ -92,7 +92,7 @@ void FlattenLayers::onExecute()
   }
 
   // Delete old layers.
-  LayerList layers = sprite->root()->getLayersList();
+  LayerList layers = sprite->root()->layers();
   for (Layer* layer : layers)
     if (layer != flatLayer)
       executeAndAdd(new cmd::RemoveLayer(layer));
diff --git a/src/app/commands/cmd_import_sprite_sheet.cpp b/src/app/commands/cmd_import_sprite_sheet.cpp
index 873b41b8d..5b49388ab 100644
--- a/src/app/commands/cmd_import_sprite_sheet.cpp
+++ b/src/app/commands/cmd_import_sprite_sheet.cpp
@@ -391,7 +391,7 @@ void ImportSpriteSheetCommand::onExecute(Context* context)
     }
 
     // Copy the list of layers (because we will modify it in the iteration).
-    LayerList layers = sprite->root()->getLayersList();
+    LayerList layers = sprite->root()->layers();
 
     // Remove all other layers
     for (LayerIterator it=layers.begin(), end=layers.end(); it!=end; ++it) {
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 36c9564f3..df713fe69 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -167,7 +167,7 @@ namespace doc {
 
     virtual int getMemSize() const override;
 
-    const LayerList& getLayersList() { return m_layers; }
+    const LayerList& layers() { return m_layers; }
     LayerIterator getLayerBegin() { return m_layers.begin(); }
     LayerIterator getLayerEnd() { return m_layers.end(); }
     LayerConstIterator getLayerBegin() const { return m_layers.begin(); }

From 58f8ed64766ee2eda006bbe9c5be1cc46a972582 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 8 Jun 2016 16:46:15 -0300
Subject: [PATCH 09/86] Prefer LayerGroup::layers() instead of iterators

---
 src/app/commands/cmd_import_sprite_sheet.cpp |  6 +--
 src/app/commands/cmd_new_layer.cpp           |  7 +--
 src/app/document.cpp                         |  6 +--
 src/app/document_api.cpp                     |  7 +--
 src/app/file/ase_format.cpp                  | 21 +++-----
 src/app/flatten.cpp                          |  7 +--
 src/doc/images_collector.cpp                 |  8 +--
 src/doc/images_collector.h                   |  2 +-
 src/doc/layer.cpp                            | 55 ++++++++------------
 src/doc/layer.h                              |  6 +--
 src/doc/layer_io.cpp                         |  7 +--
 src/doc/layer_list.h                         |  4 +-
 src/doc/sprite.cpp                           | 23 +++-----
 src/render/render.cpp                        |  7 +--
 14 files changed, 54 insertions(+), 112 deletions(-)

diff --git a/src/app/commands/cmd_import_sprite_sheet.cpp b/src/app/commands/cmd_import_sprite_sheet.cpp
index 5b49388ab..9df0aae0e 100644
--- a/src/app/commands/cmd_import_sprite_sheet.cpp
+++ b/src/app/commands/cmd_import_sprite_sheet.cpp
@@ -394,9 +394,9 @@ void ImportSpriteSheetCommand::onExecute(Context* context)
     LayerList layers = sprite->root()->layers();
 
     // Remove all other layers
-    for (LayerIterator it=layers.begin(), end=layers.end(); it!=end; ++it) {
-      if (*it != resultLayer)
-        api.removeLayer(*it);
+    for (Layer* child : layers) {
+      if (child != resultLayer)
+        api.removeLayer(child);
     }
 
     // Change the number of frames
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 113b6d613..8896e8963 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -168,11 +168,8 @@ int NewLayerCommand::getMaxLayerNum(const Layer* layer) const
     max = std::strtol(layer->name().c_str()+prefix.size(), NULL, 10);
 
   if (layer->isGroup()) {
-    auto it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
-    auto end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
-    for (; it != end; ++it) {
-      int tmp = getMaxLayerNum(*it);
+    for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
+      int tmp = getMaxLayerNum(child);
       max = MAX(tmp, max);
     }
   }
diff --git a/src/app/document.cpp b/src/app/document.cpp
index c22925118..efa331c98 100644
--- a/src/app/document.cpp
+++ b/src/app/document.cpp
@@ -328,11 +328,7 @@ void Document::copyLayerContent(const Layer* sourceLayer0, Document* destDoc, La
     const LayerGroup* sourceLayer = static_cast<const LayerGroup*>(sourceLayer0);
     LayerGroup* destLayer = static_cast<LayerGroup*>(destLayer0);
 
-    LayerConstIterator it = sourceLayer->getLayerBegin();
-    LayerConstIterator end = sourceLayer->getLayerEnd();
-
-    for (; it != end; ++it) {
-      Layer* sourceChild = *it;
+    for (Layer* sourceChild : sourceLayer->layers()) {
       base::UniquePtr<Layer> destChild(NULL);
 
       if (sourceChild->isImage()) {
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 4bcf30dff..89448647d 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -290,11 +290,8 @@ void DocumentApi::moveFrameLayer(Layer* layer, frame_t frame, frame_t beforeFram
     }
 
     case ObjectType::LayerGroup: {
-      LayerIterator it = static_cast<LayerGroup*>(layer)->getLayerBegin();
-      LayerIterator end = static_cast<LayerGroup*>(layer)->getLayerEnd();
-
-      for (; it != end; ++it)
-        moveFrameLayer(*it, frame, beforeFrame);
+      for (Layer* child : static_cast<LayerGroup*>(layer)->layers())
+        moveFrameLayer(child, frame, beforeFrame);
       break;
     }
 
diff --git a/src/app/file/ase_format.cpp b/src/app/file/ase_format.cpp
index 96c8f5d86..c1ce949bb 100644
--- a/src/app/file/ase_format.cpp
+++ b/src/app/file/ase_format.cpp
@@ -392,12 +392,9 @@ bool AseFormat::onSave(FileOp* fop)
 
     // Write extra chunks in the first frame
     if (frame == fop->roi().fromFrame()) {
-      LayerIterator it = sprite->root()->getLayerBegin();
-      LayerIterator end = sprite->root()->getLayerEnd();
-
       // Write layer chunks
-      for (; it != end; ++it)
-        ase_file_write_layers(f, &frame_header, *it);
+      for (Layer* child : sprite->root()->layers())
+        ase_file_write_layers(f, &frame_header, child);
 
       // Writer frame tags
       if (sprite->frameTags().size() > 0)
@@ -581,11 +578,8 @@ static void ase_file_write_layers(FILE* f, ASE_FrameHeader* frame_header, const
     ase_file_write_user_data_chunk(f, frame_header, &layer->userData());
 
   if (layer->isGroup()) {
-    auto it = static_cast<const LayerGroup*>(layer)->getLayerBegin(),
-         end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
-    for (; it != end; ++it)
-      ase_file_write_layers(f, frame_header, *it);
+    for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers())
+      ase_file_write_layers(f, frame_header, child);
   }
 }
 
@@ -613,11 +607,8 @@ static void ase_file_write_cels(FILE* f, ASE_FrameHeader* frame_header,
   }
 
   if (layer->isGroup()) {
-    auto it = static_cast<const LayerGroup*>(layer)->getLayerBegin(),
-         end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
-    for (; it != end; ++it)
-      ase_file_write_cels(f, frame_header, sprite, *it, frame, firstFrame);
+    for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers())
+      ase_file_write_cels(f, frame_header, sprite, child, frame, firstFrame);
   }
 }
 
diff --git a/src/app/flatten.cpp b/src/app/flatten.cpp
index b6af78c84..45292b6b6 100644
--- a/src/app/flatten.cpp
+++ b/src/app/flatten.cpp
@@ -67,11 +67,8 @@ static bool has_cels(const Layer* layer, frame_t frame)
       return (layer->cel(frame) ? true: false);
 
     case ObjectType::LayerGroup: {
-      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
-      for (; it != end; ++it) {
-        if (has_cels(*it, frame))
+      for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
+        if (has_cels(child, frame))
           return true;
       }
       break;
diff --git a/src/doc/images_collector.cpp b/src/doc/images_collector.cpp
index 0fa35aa02..2e704dfc3 100644
--- a/src/doc/images_collector.cpp
+++ b/src/doc/images_collector.cpp
@@ -54,12 +54,8 @@ void ImagesCollector::collectFromLayer(Layer* layer, frame_t frame)
     }
 
     case ObjectType::LayerGroup: {
-      LayerIterator it = static_cast<LayerGroup*>(layer)->getLayerBegin();
-      LayerIterator end = static_cast<LayerGroup*>(layer)->getLayerEnd();
-
-      for (; it != end; ++it)
-        collectFromLayer(*it, frame);
-
+      for (Layer* child : static_cast<LayerGroup*>(layer)->layers())
+        collectFromLayer(child, frame);
       break;
     }
 
diff --git a/src/doc/images_collector.h b/src/doc/images_collector.h
index 229d687b9..0029a5748 100644
--- a/src/doc/images_collector.h
+++ b/src/doc/images_collector.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index 095190b46..8bc06bded 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -44,39 +44,39 @@ int Layer::getMemSize() const
 
 Layer* Layer::getPrevious() const
 {
-  if (m_parent != NULL) {
-    LayerConstIterator it =
-      std::find(m_parent->getLayerBegin(),
-                m_parent->getLayerEnd(), this);
+  if (m_parent) {
+    auto it =
+      std::find(m_parent->layers().begin(),
+                m_parent->layers().end(), this);
 
-    if (it != m_parent->getLayerEnd() &&
-        it != m_parent->getLayerBegin()) {
+    if (it != m_parent->layers().end() &&
+        it != m_parent->layers().begin()) {
       it--;
       return *it;
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 Layer* Layer::getNext() const
 {
-  if (m_parent != NULL) {
-    LayerConstIterator it =
-      std::find(m_parent->getLayerBegin(),
-                m_parent->getLayerEnd(), this);
+  if (m_parent) {
+    auto it =
+      std::find(m_parent->layers().begin(),
+                m_parent->layers().end(), this);
 
-    if (it != m_parent->getLayerEnd()) {
+    if (it != m_parent->layers().end()) {
       it++;
-      if (it != m_parent->getLayerEnd())
+      if (it != m_parent->layers().end())
         return *it;
     }
   }
-  return NULL;
+  return nullptr;
 }
 
 Cel* Layer::cel(frame_t frame) const
 {
-  return NULL;
+  return nullptr;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -279,24 +279,16 @@ LayerGroup::~LayerGroup()
 
 void LayerGroup::destroyAllLayers()
 {
-  LayerIterator it = getLayerBegin();
-  LayerIterator end = getLayerEnd();
-
-  for (; it != end; ++it) {
-    Layer* layer = *it;
+  for (Layer* layer : m_layers)
     delete layer;
-  }
   m_layers.clear();
 }
 
 int LayerGroup::getMemSize() const
 {
   int size = sizeof(LayerGroup);
-  LayerConstIterator it = getLayerBegin();
-  LayerConstIterator end = getLayerEnd();
 
-  for (; it != end; ++it) {
-    const Layer* layer = *it;
+  for (const Layer* layer : m_layers) {
     size += layer->getMemSize();
   }
 
@@ -305,11 +297,8 @@ int LayerGroup::getMemSize() const
 
 void LayerGroup::getCels(CelList& cels) const
 {
-  LayerConstIterator it = getLayerBegin();
-  LayerConstIterator end = getLayerEnd();
-
-  for (; it != end; ++it)
-    (*it)->getCels(cels);
+  for (const Layer* layer : m_layers)
+    layer->getCels(cels);
 }
 
 void LayerGroup::addLayer(Layer* layer)
@@ -320,7 +309,7 @@ void LayerGroup::addLayer(Layer* layer)
 
 void LayerGroup::removeLayer(Layer* layer)
 {
-  LayerIterator it = std::find(m_layers.begin(), m_layers.end(), layer);
+  auto it = std::find(m_layers.begin(), m_layers.end(), layer);
   ASSERT(it != m_layers.end());
   m_layers.erase(it);
 
@@ -333,12 +322,12 @@ void LayerGroup::stackLayer(Layer* layer, Layer* after)
   if (layer == after)
     return;
 
-  LayerIterator it = std::find(m_layers.begin(), m_layers.end(), layer);
+  auto it = std::find(m_layers.begin(), m_layers.end(), layer);
   ASSERT(it != m_layers.end());
   m_layers.erase(it);
 
   if (after) {
-    LayerIterator after_it = std::find(m_layers.begin(), m_layers.end(), after);
+    auto after_it = std::find(m_layers.begin(), m_layers.end(), after);
     ASSERT(after_it != m_layers.end());
     after_it++;
     m_layers.insert(after_it, layer);
diff --git a/src/doc/layer.h b/src/doc/layer.h
index df713fe69..a6f8df6c3 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -167,11 +167,7 @@ namespace doc {
 
     virtual int getMemSize() const override;
 
-    const LayerList& layers() { return m_layers; }
-    LayerIterator getLayerBegin() { return m_layers.begin(); }
-    LayerIterator getLayerEnd() { return m_layers.end(); }
-    LayerConstIterator getLayerBegin() const { return m_layers.begin(); }
-    LayerConstIterator getLayerEnd() const { return m_layers.end(); }
+    const LayerList& layers() const { return m_layers; }
     int layersCount() const { return (int)m_layers.size(); }
 
     void addLayer(Layer* layer);
diff --git a/src/doc/layer_io.cpp b/src/doc/layer_io.cpp
index a2964262e..e56a59bf8 100644
--- a/src/doc/layer_io.cpp
+++ b/src/doc/layer_io.cpp
@@ -88,14 +88,11 @@ void write_layer(std::ostream& os, const Layer* layer)
     }
 
     case ObjectType::LayerGroup: {
-      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
       // Number of sub-layers
       write16(os, static_cast<const LayerGroup*>(layer)->layersCount());
 
-      for (; it != end; ++it)
-        write_layer(os, *it);
+      for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers())
+        write_layer(os, child);
       break;
     }
 
diff --git a/src/doc/layer_list.h b/src/doc/layer_list.h
index 82aaa5790..aebee54dc 100644
--- a/src/doc/layer_list.h
+++ b/src/doc/layer_list.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -15,8 +15,6 @@ namespace doc {
   class Layer;
 
   typedef std::vector<Layer*> LayerList;
-  typedef LayerList::iterator LayerIterator;
-  typedef LayerList::const_iterator LayerConstIterator;
 
 } // namespace doc
 
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index c7ca825ee..c08c7b6b3 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -203,7 +203,7 @@ int Sprite::getMemSize() const
 LayerImage* Sprite::backgroundLayer() const
 {
   if (root()->layersCount() > 0) {
-    Layer* bglayer = *root()->getLayerBegin();
+    Layer* bglayer = root()->layers().front();
 
     if (bglayer->isBackground()) {
       ASSERT(bglayer->isImage());
@@ -251,11 +251,8 @@ LayerIndex Sprite::layerToIndex(const Layer* layer) const
 void Sprite::getLayersList(std::vector<Layer*>& layers) const
 {
   // TODO support subgroups
-  LayerConstIterator it = m_root->getLayerBegin();
-  LayerConstIterator end = m_root->getLayerEnd();
-
-  for (; it != end; ++it) {
-    layers.push_back(*it);
+  for (Layer* child : m_root->layers()) {
+    layers.push_back(child);
   }
 }
 
@@ -573,11 +570,8 @@ static Layer* index2layer(const Layer* layer, const LayerIndex& index, int* inde
     if (layer->isGroup()) {
       Layer *found;
 
-      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
-      for (; it != end; ++it) {
-        if ((found = index2layer(*it, index, index_count)))
+      for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
+        if ((found = index2layer(child, index, index_count)))
           return found;
       }
     }
@@ -596,11 +590,8 @@ static LayerIndex layer2index(const Layer* layer, const Layer* find_layer, int*
     if (layer->isGroup()) {
       int found;
 
-      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
-      for (; it != end; ++it) {
-        if ((found = layer2index(*it, find_layer, index_count)) >= 0)
+      for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
+        if ((found = layer2index(child, find_layer, index_count)) >= 0)
           return LayerIndex(found);
       }
     }
diff --git a/src/render/render.cpp b/src/render/render.cpp
index 8437ae434..ebd0fa4c5 100644
--- a/src/render/render.cpp
+++ b/src/render/render.cpp
@@ -803,12 +803,9 @@ void Render::renderLayer(
     }
 
     case ObjectType::LayerGroup: {
-      LayerConstIterator it = static_cast<const LayerGroup*>(layer)->getLayerBegin();
-      LayerConstIterator end = static_cast<const LayerGroup*>(layer)->getLayerEnd();
-
-      for (; it != end; ++it) {
+      for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
         renderLayer(
-          *it, image,
+          child, image,
           area, frame,
           scaled_func,
           render_background,

From 5deabfe365007d850a61878414facbfbeeffaa1d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 9 Jun 2016 14:31:30 -0300
Subject: [PATCH 10/86] New flag in .aseprite files

---
 docs/files/ase.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/files/ase.txt b/docs/files/ase.txt
index 03ac3003c..1d1b33b58 100644
--- a/docs/files/ase.txt
+++ b/docs/files/ase.txt
@@ -156,6 +156,7 @@ Layer Chunk (0x2004)
                   4 = Lock movement
                   8 = Background
                   16 = Prefer linked cels
+                  32 = The layer group should be displayed collapsed
   WORD          Layer type (0=normal (image) layer, 1=layer set)
   WORD          Layer child level (see NOTE.1)
   WORD          Default layer width in pixels (ignored)

From 6bffc9f740e49f21302f43507479b761e5d3a1cb Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 10 Jun 2016 12:23:04 -0300
Subject: [PATCH 11/86] Avoid using LayerIndex in SpritePosition

We're planning to remove the LayerIndex as it doesn't make too much
sense with the new Timeline with groups.
---
 src/app/cmd_transaction.cpp   |  2 +-
 src/app/commands/cmd_undo.cpp | 14 ++++++++-----
 src/doc/sprite_position.h     | 39 ++++++++++++++++++++++-------------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/app/cmd_transaction.cpp b/src/app/cmd_transaction.cpp
index a3f92c4c6..aad3b7cc9 100644
--- a/src/app/cmd_transaction.cpp
+++ b/src/app/cmd_transaction.cpp
@@ -65,7 +65,7 @@ std::string CmdTransaction::onLabel() const
 doc::SpritePosition CmdTransaction::calcSpritePosition()
 {
   doc::Site site = context()->activeSite();
-  return doc::SpritePosition(site.layerIndex(), site.frame());
+  return doc::SpritePosition(site.layer(), site.frame());
 }
 
 } // namespace app
diff --git a/src/app/commands/cmd_undo.cpp b/src/app/commands/cmd_undo.cpp
index 87eaf9bca..d61453f1b 100644
--- a/src/app/commands/cmd_undo.cpp
+++ b/src/app/commands/cmd_undo.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -71,7 +71,7 @@ void UndoCommand::onExecute(Context* context)
     Preferences::instance().undo.gotoModified();
 
   if (gotoModified) {
-    SpritePosition currentPosition(writer.site()->layerIndex(),
+    SpritePosition currentPosition(writer.site()->layer(),
                                    writer.site()->frame());
 
     if (m_type == Undo)
@@ -80,7 +80,9 @@ void UndoCommand::onExecute(Context* context)
       spritePosition = undo->nextRedoSpritePosition();
 
     if (spritePosition != currentPosition) {
-      current_editor->setLayer(sprite->indexToLayer(spritePosition.layerIndex()));
+      Layer* selectLayer = spritePosition.layer();
+      if (selectLayer)
+        current_editor->setLayer(selectLayer);
       current_editor->setFrame(spritePosition.frame());
 
       // Draw the current layer/frame (which is not undone yet) so the
@@ -112,11 +114,13 @@ void UndoCommand::onExecute(Context* context)
   // weren't able to reach before the undo).
   if (gotoModified) {
     SpritePosition currentPosition(
-      writer.site()->layerIndex(),
+      writer.site()->layer(),
       writer.site()->frame());
 
     if (spritePosition != currentPosition) {
-      current_editor->setLayer(sprite->indexToLayer(spritePosition.layerIndex()));
+      Layer* selectLayer = spritePosition.layer();
+      if (selectLayer)
+        current_editor->setLayer(selectLayer);
       current_editor->setFrame(spritePosition.frame());
     }
   }
diff --git a/src/doc/sprite_position.h b/src/doc/sprite_position.h
index 61893d29b..153d00553 100644
--- a/src/doc/sprite_position.h
+++ b/src/doc/sprite_position.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -9,34 +9,45 @@
 #pragma once
 
 #include "doc/frame.h"
-#include "doc/layer_index.h"
+#include "doc/layer.h"
+#include "doc/object.h"
+#include "doc/object_id.h"
 
 namespace doc {
 
-  class Sprite;
-
   class SpritePosition {
   public:
     SpritePosition()
-      : m_layerIndex(0)
+      : m_layerId(NullId)
       , m_frame(0) {
     }
-    SpritePosition(LayerIndex layerIndex, frame_t frame)
-      : m_layerIndex(layerIndex)
+
+    SpritePosition(const Layer* layer, frame_t frame)
+      : m_layerId(layer ? layer->id(): NullId)
       , m_frame(frame) {
     }
 
-    const LayerIndex& layerIndex() const { return m_layerIndex; }
-    const frame_t& frame() const { return m_frame; }
+    Layer* layer() const { return get<Layer>(m_layerId); }
+    ObjectId layerId() const { return m_layerId; }
+    frame_t frame() const { return m_frame; }
 
-    void layerIndex(LayerIndex layerIndex) { m_layerIndex = layerIndex; }
-    void frame(frame_t frame) { m_frame = frame; }
+    void layer(Layer* layer) {
+      m_layerId = (layer ? layer->id(): NullId);
+    }
 
-    bool operator==(const SpritePosition& o) const { return m_layerIndex == o.m_layerIndex && m_frame == o.m_frame; }
-    bool operator!=(const SpritePosition& o) const { return m_layerIndex != o.m_layerIndex || m_frame != o.m_frame; }
+    void layerId(ObjectId layerId) {
+      m_layerId = layerId;
+    }
+
+    void frame(frame_t frame) {
+      m_frame = frame;
+    }
+
+    bool operator==(const SpritePosition& o) const { return m_layerId == o.m_layerId && m_frame == o.m_frame; }
+    bool operator!=(const SpritePosition& o) const { return m_layerId != o.m_layerId || m_frame != o.m_frame; }
 
   private:
-    LayerIndex m_layerIndex;
+    ObjectId m_layerId;
     frame_t m_frame;
   };
 

From ab86a1f5ee544119c4de0e92916f0a373073797f Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 10 Jun 2016 15:23:45 -0300
Subject: [PATCH 12/86] Remove Site::layerIndex() member

---
 src/app/commands/cmd_goto_layer.cpp | 165 ++++++++++++++--------------
 src/doc/site.cpp                    |  12 --
 src/doc/site.h                      |   3 -
 3 files changed, 83 insertions(+), 97 deletions(-)

diff --git a/src/app/commands/cmd_goto_layer.cpp b/src/app/commands/cmd_goto_layer.cpp
index bd27f7725..218fe1562 100644
--- a/src/app/commands/cmd_goto_layer.cpp
+++ b/src/app/commands/cmd_goto_layer.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -16,104 +16,105 @@
 #include "app/modules/gui.h"
 #include "app/ui/editor/editor.h"
 #include "app/ui/status_bar.h"
+#include "app/ui/timeline.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
 
 namespace app {
 
-class GotoCommand : public Command {
+class GotoLayerCommand : public Command {
 public:
-  GotoCommand(const char* short_name, const char* friendly_name, CommandFlags flags)
-    : Command(short_name, friendly_name, flags) {
+  GotoLayerCommand(int offset,
+                   const char* shortName,
+                   const char* friendlyName,
+                   CommandFlags flags)
+    : Command(shortName, friendlyName, flags),
+      m_offset(offset) {
   }
 
 protected:
+
+  bool onEnabled(Context* context) override {
+    return (current_editor &&
+            current_editor->document());
+  }
+
+  void onExecute(Context* context) override {
+    Site site = current_editor->getSite();
+
+    // TODO add support for layer groups
+
+    Layer* layer = site.layer();
+    if (!layer)
+      return;
+
+    const auto& layers = layer->parent()->layers();
+    auto it = std::find(layers.begin(), layers.end(), layer);
+    if (it == layers.end())
+      return;
+
+    if (m_offset > 0) {
+      int i = m_offset;
+      while (i-- > 0) {
+        ++it;
+        if (it == layers.end())
+          it = layers.begin();
+      }
+    }
+    else if (m_offset < 0) {
+      int i = m_offset;
+      while (i++ < 0) {
+        if (it == layers.begin())
+          it = layers.end();
+        --it;
+      }
+    }
+
+    site.layer(*it);
+
+    // Flash the current layer
+    current_editor->setLayer(site.layer());
+    current_editor->flashCurrentLayer();
+
+    updateStatusBar(site);
+  }
+
   void updateStatusBar(Site& site) {
     if (site.layer() != NULL)
-      StatusBar::instance()
-        ->setStatusText(1000, "Layer `%s' selected",
-          site.layer()->name().c_str());
+      StatusBar::instance()->setStatusText(
+        1000, "%s '%s' selected",
+        (site.layer()->isGroup() ? "Group": "Layer"),
+        site.layer()->name().c_str());
+  }
+
+private:
+  int m_offset;
+};
+
+class GotoPreviousLayerCommand : public GotoLayerCommand {
+public:
+  GotoPreviousLayerCommand()
+    : GotoLayerCommand(-1, "GotoPreviousLayer",
+                       "Go to Previous Layer",
+                       CmdUIOnlyFlag) {
+  }
+  Command* clone() const override {
+    return new GotoPreviousLayerCommand(*this);
   }
 };
 
-class GotoPreviousLayerCommand : public GotoCommand {
+class GotoNextLayerCommand : public GotoLayerCommand {
 public:
-  GotoPreviousLayerCommand();
-  Command* clone() const override { return new GotoPreviousLayerCommand(*this); }
-
-protected:
-  bool onEnabled(Context* context) override;
-  void onExecute(Context* context) override;
+  GotoNextLayerCommand()
+    : GotoLayerCommand(+1, "GotoNextLayer",
+                       "Go to Next Layer",
+                       CmdUIOnlyFlag) {
+  }
+  Command* clone() const override {
+    return new GotoNextLayerCommand(*this);
+  }
 };
 
-GotoPreviousLayerCommand::GotoPreviousLayerCommand()
- : GotoCommand("GotoPreviousLayer",
-               "Go to Previous Layer",
-               CmdUIOnlyFlag)
-{
-}
-
-bool GotoPreviousLayerCommand::onEnabled(Context* context)
-{
-  return (current_editor != nullptr &&
-          current_editor->document());
-}
-
-void GotoPreviousLayerCommand::onExecute(Context* context)
-{
-  Site site = current_editor->getSite();
-
-  if (site.layerIndex() > 0)
-    site.layerIndex(site.layerIndex().previous());
-  else
-    site.layerIndex(LayerIndex(site.sprite()->countLayers()-1));
-
-  // Flash the current layer
-  current_editor->setLayer(site.layer());
-  current_editor->flashCurrentLayer();
-
-  updateStatusBar(site);
-}
-
-class GotoNextLayerCommand : public GotoCommand {
-public:
-  GotoNextLayerCommand();
-  Command* clone() const override { return new GotoNextLayerCommand(*this); }
-
-protected:
-  bool onEnabled(Context* context) override;
-  void onExecute(Context* context) override;
-};
-
-GotoNextLayerCommand::GotoNextLayerCommand()
-  : GotoCommand("GotoNextLayer",
-                "Go to Next Layer",
-                CmdUIOnlyFlag)
-{
-}
-
-bool GotoNextLayerCommand::onEnabled(Context* context)
-{
-  return (current_editor != nullptr &&
-          current_editor->document());
-}
-
-void GotoNextLayerCommand::onExecute(Context* context)
-{
-  Site site = current_editor->getSite();
-
-  if (site.layerIndex() < site.sprite()->countLayers()-1)
-    site.layerIndex(site.layerIndex().next());
-  else
-    site.layerIndex(LayerIndex(0));
-
-  // Flash the current layer
-  current_editor->setLayer(site.layer());
-  current_editor->flashCurrentLayer();
-
-  updateStatusBar(site);
-}
-
 Command* CommandFactory::createGotoPreviousLayerCommand()
 {
   return new GotoPreviousLayerCommand;
diff --git a/src/doc/site.cpp b/src/doc/site.cpp
index e65e74fd4..9efb8e302 100644
--- a/src/doc/site.cpp
+++ b/src/doc/site.cpp
@@ -17,18 +17,6 @@
 
 namespace doc {
 
-LayerIndex Site::layerIndex() const
-{
-  return (m_sprite && m_layer ?
-          m_sprite->layerToIndex(m_layer): LayerIndex());
-}
-
-void Site::layerIndex(LayerIndex layerIndex)
-{
-  ASSERT(m_sprite != NULL);
-  m_layer = m_sprite->indexToLayer(layerIndex);
-}
-
 Palette* Site::palette()
 {
   return (m_sprite ? m_sprite->palette(m_frame): NULL);
diff --git a/src/doc/site.h b/src/doc/site.h
index d1b051944..be8b62313 100644
--- a/src/doc/site.h
+++ b/src/doc/site.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "doc/frame.h"
-#include "doc/layer_index.h"
 
 namespace doc {
 
@@ -47,8 +46,6 @@ namespace doc {
     void layer(Layer* layer) { m_layer = layer; }
     void frame(frame_t frame) { m_frame = frame; }
 
-    LayerIndex layerIndex() const;
-    void layerIndex(LayerIndex layerIndex);
     Palette* palette();
     Image* image(int* x = nullptr, int* y = nullptr, int* opacity = nullptr) const;
     Palette* palette() const;

From 9ff7a13f30a7d3b2430b9df3197a1f47d19fd5ad Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 10 Jun 2016 15:38:23 -0300
Subject: [PATCH 13/86] Remove unused member from LayersRange::iterator

---
 src/doc/layers_range.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/doc/layers_range.h b/src/doc/layers_range.h
index 3fba454d2..9f67cb0b8 100644
--- a/src/doc/layers_range.h
+++ b/src/doc/layers_range.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -11,8 +11,6 @@
 #include "doc/layer_index.h"
 #include "doc/object_id.h"
 
-#include <set>
-
 namespace doc {
   class Layer;
   class Sprite;
@@ -43,7 +41,6 @@ namespace doc {
     private:
       Layer* m_layer;
       LayerIndex m_cur, m_last;
-      std::set<ObjectId> m_visited;
     };
 
     iterator begin() { return m_begin; }

From f1a150420bb570c7c89317ce33114d623c9f844b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 11:01:45 -0300
Subject: [PATCH 14/86] Paint sublayers in Timeline

---
 src/app/ui/timeline.cpp | 76 ++++++++++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 17b3f187c..070f20682 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -118,6 +118,20 @@ struct Timeline::DrawCelData {
   CelIterator lastLink;         // Last link to the active cel
 };
 
+namespace {
+
+  template<typename Pred>
+  void for_each_expanded_layer(LayerGroup* group, Pred&& pred) {
+    for (Layer* child : group->layers()) {
+      if (child->isGroup() && !child->isCollapsed())
+        for_each_expanded_layer<Pred>(static_cast<LayerGroup*>(child),
+                                      std::forward<Pred>(pred));
+      pred(child);
+    }
+  }
+
+}
+
 Timeline::Timeline()
   : Widget(kGenericWidget)
   , m_hbar(HORIZONTAL, this)
@@ -666,8 +680,13 @@ bool Timeline::onProcessMessage(Message* msg)
               if (layer) {
                 if (layer->isImage())
                   layer->setContinuous(!layer->isContinuous());
-                else if (layer->isGroup())
+                else if (layer->isGroup()) {
                   layer->setCollapsed(!layer->isCollapsed());
+
+                  regenerateLayers();
+                  showCurrentCel();
+                  invalidate();
+                }
               }
             }
             break;
@@ -940,11 +959,20 @@ void Timeline::onPaint(ui::PaintEvent& ev)
       if (!clip)
         continue;
 
+      Layer* layerPtr = m_layers[layer];
+      if (!layerPtr->isImage()) {
+        // Draw empty cels
+        for (frame=first_frame; frame<=last_frame; ++frame) {
+          drawCel(g, layer, frame, nullptr, nullptr);
+        }
+        continue;
+      }
+
       // Get the first CelIterator to be drawn (it is the first cel with cel->frame >= first_frame)
-      LayerImage* layerPtr = static_cast<LayerImage*>(m_layers[layer]);
-      data.begin = layerPtr->getCelBegin();
-      data.end = layerPtr->getCelEnd();
-      data.it = layerPtr->findFirstCelIteratorAfter(first_frame-1);
+      LayerImage* layerImagePtr = static_cast<LayerImage*>(layerPtr);
+      data.begin = layerImagePtr->getCelBegin();
+      data.end = layerImagePtr->getCelEnd();
+      data.it = layerImagePtr->findFirstCelIteratorAfter(first_frame-1);
       data.prevIt = data.end;
       data.nextIt = (data.it != data.end ? data.it+1: data.end);
 
@@ -953,7 +981,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
       data.lastLink = data.end;
 
       if (layerPtr == m_layer) {
-        data.activeIt = layerPtr->findCelIterator(m_frame);
+        data.activeIt = layerImagePtr->findCelIterator(m_frame);
         if (data.activeIt != data.end) {
           data.firstLink = data.activeIt;
           data.lastLink = data.activeIt;
@@ -1434,13 +1462,13 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
 void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Cel* cel, DrawCelData* data)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
-  LayerImage* layer = static_cast<LayerImage*>(m_layers[layerIndex]);
-  Image* image = (cel ? cel->image(): NULL);
+  Layer* layer = m_layers[layerIndex];
+  Image* image = (cel ? cel->image(): nullptr);
   bool is_hover = (m_hot.part == PART_CEL &&
     m_hot.layer == layerIndex &&
     m_hot.frame == frame);
   bool is_active = (isLayerActive(layerIndex) || isFrameActive(frame));
-  bool is_empty = (image == NULL);
+  bool is_empty = (image == nullptr);
   gfx::Rect bounds = getPartBounds(Hit(PART_CEL, layerIndex, frame));
   IntersectClip clip(g, bounds);
   if (!clip)
@@ -1468,7 +1496,7 @@ void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Ce
   skin::Style* style;
   bool fromLeft = false;
   bool fromRight = false;
-  if (is_empty) {
+  if (is_empty || !data) {
     style = styles.timelineEmptyFrame();
   }
   else {
@@ -1496,7 +1524,7 @@ void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Ce
   drawPart(g, bounds, NULL, style, is_active, is_hover);
 
   // Draw decorators to link the activeCel with its links.
-  if (data->activeIt != data->end)
+  if (data && data->activeIt != data->end)
     drawCelLinkDecorators(g, bounds, cel, frame, is_active, is_hover, data);
 }
 
@@ -1895,19 +1923,29 @@ void Timeline::invalidateHit(const Hit& hit)
 
 void Timeline::regenerateLayers()
 {
-  ASSERT(m_document != NULL);
-  ASSERT(m_sprite != NULL);
+  ASSERT(m_document);
+  ASSERT(m_sprite);
+
+  size_t nlayers = 0;
+  for_each_expanded_layer(
+    m_sprite->root(),
+    [&nlayers](Layer* layer){
+      ++nlayers;
+    });
 
-  size_t nlayers = m_sprite->countLayers();
   if (m_layers.size() != nlayers) {
     if (nlayers > 0)
-      m_layers.resize(nlayers, NULL);
+      m_layers.resize(nlayers, nullptr);
     else
       m_layers.clear();
   }
 
-  for (size_t c=0; c<nlayers; c++)
-    m_layers[c] = m_sprite->indexToLayer(LayerIndex(c));
+  size_t i = 0;
+  for_each_expanded_layer(
+    m_sprite->root(),
+    [&i, this](Layer* layer){
+      m_layers[i++] = layer;
+    });
 
   updateScrollBars();
 }
@@ -2369,10 +2407,8 @@ bool Timeline::allLayersDiscontinuous()
 LayerIndex Timeline::getLayerIndex(const Layer* layer) const
 {
   for (int i=0; i<(int)m_layers.size(); i++)
-    if (m_layers[i] == layer) {
-      ASSERT(m_sprite->layerToIndex(layer) == LayerIndex(i));
+    if (m_layers[i] == layer)
       return LayerIndex(i);
-    }
 
   return LayerIndex::NoLayer;
 }

From 5de8ac136eef481b91ba9deb8b693e3fec0738db Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 12:26:21 -0300
Subject: [PATCH 15/86] Paint sublayers name in Timeline with indentation

---
 src/app/ui/timeline.cpp | 87 +++++++++++++++++++++++------------------
 src/app/ui/timeline.h   | 15 ++++++-
 2 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 070f20682..9d69fc778 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -121,12 +121,12 @@ struct Timeline::DrawCelData {
 namespace {
 
   template<typename Pred>
-  void for_each_expanded_layer(LayerGroup* group, Pred&& pred) {
+  void for_each_expanded_layer(LayerGroup* group, Pred&& pred, int level = 0) {
     for (Layer* child : group->layers()) {
       if (child->isGroup() && !child->isCollapsed())
         for_each_expanded_layer<Pred>(static_cast<LayerGroup*>(child),
-                                      std::forward<Pred>(pred));
-      pred(child);
+                                      std::forward<Pred>(pred), level+1);
+      pred(child, level);
     }
   }
 
@@ -296,7 +296,7 @@ void Timeline::moveRange(Range& range)
 
   if (range.layerBegin() >= LayerIndex(0) &&
       range.layerBegin() + m_moveRangeData.activeRelativeLayer < int(m_layers.size())) {
-    setLayer(m_layers[range.layerBegin() + m_moveRangeData.activeRelativeLayer]);
+    setLayer(m_layers[range.layerBegin() + m_moveRangeData.activeRelativeLayer].layer);
   }
 
   if (range.frameBegin() >= frame_t(0))
@@ -396,7 +396,7 @@ bool Timeline::onProcessMessage(Message* msg)
 
             // Did the user select another layer?
             if (old_layer != m_clk.layer) {
-              setLayer(m_layers[m_clk.layer]);
+              setLayer(m_layers[m_clk.layer].layer);
               invalidate();
             }
           }
@@ -427,7 +427,7 @@ bool Timeline::onProcessMessage(Message* msg)
           // Select the new clicked-part.
           if (old_layer != m_clk.layer
             || old_frame != m_clk.frame) {
-            setLayer(m_layers[m_clk.layer]);
+            setLayer(m_layers[m_clk.layer].layer);
             setFrame(m_clk.frame, true);
             invalidate();
           }
@@ -527,9 +527,9 @@ bool Timeline::onProcessMessage(Message* msg)
         switch (m_state) {
 
           case STATE_SELECTING_LAYERS: {
-            if (m_layer != m_layers[hit.layer]) {
+            if (m_layer != m_layers[hit.layer].layer) {
               m_range.endRange(hit.layer, m_frame);
-              setLayer(m_layers[m_clk.layer = hit.layer]);
+              setLayer(m_layers[m_clk.layer = hit.layer].layer);
             }
             break;
           }
@@ -541,10 +541,10 @@ bool Timeline::onProcessMessage(Message* msg)
           }
 
           case STATE_SELECTING_CELS:
-            if ((m_layer != m_layers[hit.layer])
+            if ((m_layer != m_layers[hit.layer].layer)
               || (m_frame != hit.frame)) {
               m_range.endRange(hit.layer, hit.frame);
-              setLayer(m_layers[m_clk.layer = hit.layer]);
+              setLayer(m_layers[m_clk.layer = hit.layer].layer);
               setFrame(m_clk.frame = hit.frame, true);
             }
             break;
@@ -579,7 +579,7 @@ bool Timeline::onProcessMessage(Message* msg)
           case PART_HEADER_EYE: {
             bool newVisibleState = !allLayersVisible();
             for (size_t i=0; i<m_layers.size(); i++)
-              m_layers[i]->setVisible(newVisibleState);
+              m_layers[i].layer->setVisible(newVisibleState);
 
             // Redraw all views.
             m_document->notifyGeneralUpdate();
@@ -589,14 +589,14 @@ bool Timeline::onProcessMessage(Message* msg)
           case PART_HEADER_PADLOCK: {
             bool newEditableState = !allLayersUnlocked();
             for (size_t i=0; i<m_layers.size(); i++)
-              m_layers[i]->setEditable(newEditableState);
+              m_layers[i].layer->setEditable(newEditableState);
             break;
           }
 
           case PART_HEADER_CONTINUOUS: {
             bool newContinuousState = !allLayersContinuous();
             for (size_t i=0; i<m_layers.size(); i++)
-              m_layers[i]->setContinuous(newContinuousState);
+              m_layers[i].layer->setContinuous(newContinuousState);
             break;
           }
 
@@ -655,7 +655,7 @@ bool Timeline::onProcessMessage(Message* msg)
           case PART_LAYER_EYE_ICON:
             // Hide/show layer.
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
-              Layer* layer = m_layers[m_clk.layer];
+              Layer* layer = m_layers[m_clk.layer].layer;
               ASSERT(layer != NULL);
               layer->setVisible(!layer->isVisible());
 
@@ -667,7 +667,7 @@ bool Timeline::onProcessMessage(Message* msg)
           case PART_LAYER_PADLOCK_ICON:
             // Lock/unlock layer.
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
-              Layer* layer = m_layers[m_clk.layer];
+              Layer* layer = m_layers[m_clk.layer].layer;
               ASSERT(layer != NULL);
               layer->setEditable(!layer->isEditable());
             }
@@ -675,7 +675,7 @@ bool Timeline::onProcessMessage(Message* msg)
 
           case PART_LAYER_CONTINUOUS_ICON:
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
-              Layer* layer = m_layers[m_clk.layer];
+              Layer* layer = m_layers[m_clk.layer].layer;
               ASSERT(layer);
               if (layer) {
                 if (layer->isImage())
@@ -959,7 +959,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
       if (!clip)
         continue;
 
-      Layer* layerPtr = m_layers[layer];
+      Layer* layerPtr = m_layers[layer].layer;
       if (!layerPtr->isImage()) {
         // Draw empty cels
         for (frame=first_frame; frame<=last_frame; ++frame) {
@@ -1363,7 +1363,7 @@ void Timeline::drawHeaderFrame(ui::Graphics* g, frame_t frame)
 void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
-  Layer* layer = m_layers[layerIdx];
+  Layer* layer = m_layers[layerIdx].layer;
   bool is_active = isLayerActive(layerIdx);
   bool hotlayer = (m_hot.layer == layerIdx);
   bool clklayer = (m_clk.layer == layerIdx);
@@ -1410,12 +1410,19 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
 
   // Draw layer name.
   doc::color_t layerColor = layer->userData().color();
-  if (doc::rgba_geta(layerColor) > 0) {
-    drawPart(g, bounds, nullptr, styles.timelineLayer(),
-             is_active,
-             (hotlayer && m_hot.part == PART_LAYER_TEXT),
-             (clklayer && m_clk.part == PART_LAYER_TEXT));
+  gfx::Rect textBounds = bounds;
+  if (m_layers[layerIdx].level > 0) {
+    int w = m_layers[layerIdx].level*FRMSIZE;
+    textBounds.x += w;
+    textBounds.w -= w;
+  }
 
+  drawPart(g, bounds, nullptr, styles.timelineLayer(),
+           is_active,
+           (hotlayer && m_hot.part == PART_LAYER_TEXT),
+           (clklayer && m_clk.part == PART_LAYER_TEXT));
+
+  if (doc::rgba_geta(layerColor) > 0) {
     // Fill with an user-defined custom color.
     auto b2 = bounds;
     b2.shrink(1*guiscale()).inflate(1*guiscale());
@@ -1425,13 +1432,13 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
                           doc::rgba_geta(layerColor)),
                 b2);
 
-    drawPart(g, bounds, layer->name().c_str(), styles.timelineLayerTextOnly(),
+    drawPart(g, textBounds, layer->name().c_str(), styles.timelineLayerTextOnly(),
              is_active,
              (hotlayer && m_hot.part == PART_LAYER_TEXT),
              (clklayer && m_clk.part == PART_LAYER_TEXT));
   }
   else {
-    drawPart(g, bounds, layer->name().c_str(), styles.timelineLayer(),
+    drawPart(g, textBounds, layer->name().c_str(), styles.timelineLayer(),
              is_active,
              (hotlayer && m_hot.part == PART_LAYER_TEXT),
              (clklayer && m_clk.part == PART_LAYER_TEXT));
@@ -1462,7 +1469,7 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
 void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Cel* cel, DrawCelData* data)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
-  Layer* layer = m_layers[layerIndex];
+  Layer* layer = m_layers[layerIndex].layer;
   Image* image = (cel ? cel->image(): nullptr);
   bool is_hover = (m_hot.part == PART_CEL &&
     m_hot.layer == layerIndex &&
@@ -1929,13 +1936,13 @@ void Timeline::regenerateLayers()
   size_t nlayers = 0;
   for_each_expanded_layer(
     m_sprite->root(),
-    [&nlayers](Layer* layer){
+    [&nlayers](Layer* layer, int level){
       ++nlayers;
     });
 
   if (m_layers.size() != nlayers) {
     if (nlayers > 0)
-      m_layers.resize(nlayers, nullptr);
+      m_layers.resize(nlayers);
     else
       m_layers.clear();
   }
@@ -1943,8 +1950,8 @@ void Timeline::regenerateLayers()
   size_t i = 0;
   for_each_expanded_layer(
     m_sprite->root(),
-    [&i, this](Layer* layer){
-      m_layers[i++] = layer;
+    [&i, this](Layer* layer, int level){
+      m_layers[i++] = LayerInfo(layer, level);
     });
 
   updateScrollBars();
@@ -2175,7 +2182,8 @@ void Timeline::updateStatusBar(ui::Message* msg)
         else if (m_dropTarget.vhit == DropTarget::Top)
           layerIdx = m_dropRange.layerEnd();
 
-        Layer* layer = ((layerIdx >= 0 && layerIdx < (int)m_layers.size()) ? m_layers[layerIdx]: NULL);
+        Layer* layer = ((layerIdx >= 0 && layerIdx < (int)m_layers.size()) ? m_layers[layerIdx].layer:
+                                                                             nullptr);
         if (layer) {
           if (m_dropTarget.vhit == DropTarget::Bottom) {
             sb->setStatusText(0, "%s at bottom of layer %s", verb, layer->name().c_str());
@@ -2192,7 +2200,8 @@ void Timeline::updateStatusBar(ui::Message* msg)
     }
   }
   else {
-    Layer* layer = (validLayer(m_hot.layer) ? m_layers[m_hot.layer]: NULL);
+    Layer* layer = (validLayer(m_hot.layer) ? m_layers[m_hot.layer].layer:
+                                              nullptr);
 
     switch (m_hot.part) {
 
@@ -2353,7 +2362,7 @@ gfx::Point Timeline::getMaxScrollablePos() const
 bool Timeline::allLayersVisible()
 {
   for (size_t i=0; i<m_layers.size(); i++)
-    if (!m_layers[i]->isVisible())
+    if (!m_layers[i].layer->isVisible())
       return false;
 
   return true;
@@ -2362,7 +2371,7 @@ bool Timeline::allLayersVisible()
 bool Timeline::allLayersInvisible()
 {
   for (size_t i=0; i<m_layers.size(); i++)
-    if (m_layers[i]->isVisible())
+    if (m_layers[i].layer->isVisible())
       return false;
 
   return true;
@@ -2371,7 +2380,7 @@ bool Timeline::allLayersInvisible()
 bool Timeline::allLayersLocked()
 {
   for (size_t i=0; i<m_layers.size(); i++)
-    if (m_layers[i]->isEditable())
+    if (m_layers[i].layer->isEditable())
       return false;
 
   return true;
@@ -2380,7 +2389,7 @@ bool Timeline::allLayersLocked()
 bool Timeline::allLayersUnlocked()
 {
   for (size_t i=0; i<m_layers.size(); i++)
-    if (!m_layers[i]->isEditable())
+    if (!m_layers[i].layer->isEditable())
       return false;
 
   return true;
@@ -2389,7 +2398,7 @@ bool Timeline::allLayersUnlocked()
 bool Timeline::allLayersContinuous()
 {
   for (size_t i=0; i<m_layers.size(); i++)
-    if (!m_layers[i]->isContinuous())
+    if (!m_layers[i].layer->isContinuous())
       return false;
 
   return true;
@@ -2398,7 +2407,7 @@ bool Timeline::allLayersContinuous()
 bool Timeline::allLayersDiscontinuous()
 {
   for (size_t i=0; i<m_layers.size(); i++)
-    if (m_layers[i]->isContinuous())
+    if (m_layers[i].layer->isContinuous())
       return false;
 
   return true;
@@ -2407,7 +2416,7 @@ bool Timeline::allLayersDiscontinuous()
 LayerIndex Timeline::getLayerIndex(const Layer* layer) const
 {
   for (int i=0; i<(int)m_layers.size(); i++)
-    if (m_layers[i] == layer)
+    if (m_layers[i].layer == layer)
       return LayerIndex(i);
 
   return LayerIndex::NoLayer;
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 2a72342e4..e8e269382 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -255,6 +255,19 @@ namespace app {
     DocumentPreferences& docPref() const;
     skin::SkinTheme* skinTheme() const;
 
+    struct LayerInfo {
+      Layer* layer;
+      int level;
+
+      LayerInfo()
+        : layer(nullptr), level(0) {
+      }
+
+      LayerInfo(Layer* layer, int level)
+        : layer(layer), level(level) {
+      }
+    };
+
     ui::ScrollBar m_hbar;
     ui::ScrollBar m_vbar;
     gfx::Rect m_viewportArea;
@@ -267,7 +280,7 @@ namespace app {
     Range m_range;
     Range m_dropRange;
     State m_state;
-    std::vector<Layer*> m_layers;
+    std::vector<LayerInfo> m_layers;
     int m_separator_x;
     int m_separator_w;
     int m_origFrames;

From e6097eabac6c2ea3a1d47627c222a107ebaa5f25 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 14:50:43 -0300
Subject: [PATCH 16/86] Add selected layers into doc::Site

---
 src/app/ui/timeline.cpp     | 11 +++++++++++
 src/app/ui/timeline.h       |  2 ++
 src/app/ui_context.cpp      | 20 ++++++++++++++++++++
 src/doc/CMakeLists.txt      |  1 +
 src/doc/selected_layers.cpp | 37 +++++++++++++++++++++++++++++++++++++
 src/doc/selected_layers.h   | 23 +++++++++++++++++++++++
 src/doc/site.h              | 25 ++++++++++++++++++++++++-
 7 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 src/doc/selected_layers.cpp
 create mode 100644 src/doc/selected_layers.h

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 9d69fc778..678627fae 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -282,6 +282,17 @@ void Timeline::setFrame(frame_t frame, bool byUser)
   }
 }
 
+SelectedLayers Timeline::selectedLayers() const
+{
+  SelectedLayers layers;
+
+  for (LayerIndex layer = m_range.layerBegin(); layer <= m_range.layerEnd(); ++layer) {
+    layers.insert(m_layers[layer].layer);
+  }
+
+  return layers;
+}
+
 void Timeline::prepareToMoveRange()
 {
   ASSERT(m_range.enabled());
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index e8e269382..6df7ead2b 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -19,6 +19,7 @@
 #include "doc/documents_observer.h"
 #include "doc/frame.h"
 #include "doc/layer_index.h"
+#include "doc/selected_layers.h"
 #include "doc/sprite.h"
 #include "ui/scroll_bar.h"
 #include "ui/timer.h"
@@ -88,6 +89,7 @@ namespace app {
     bool isMovingCel() const;
 
     Range range() const { return m_range; }
+    SelectedLayers selectedLayers() const;
 
     void prepareToMoveRange();
     void moveRange(Range& range);
diff --git a/src/app/ui_context.cpp b/src/app/ui_context.cpp
index 88fedebef..aa94b1a61 100644
--- a/src/app/ui_context.cpp
+++ b/src/app/ui_context.cpp
@@ -221,6 +221,26 @@ void UIContext::onGetActiveSite(Site* site) const
   DocumentView* view = activeView();
   if (view) {
     view->getSite(site);
+
+    if (site->sprite()) {
+      // Selected layers
+      Timeline* timeline = App::instance()->timeline();
+      if (timeline &&
+          timeline->range().enabled()) {
+        site->focus(Site::OnTimeline);
+        site->selectedLayers(timeline->selectedLayers());
+      }
+      else {
+        ColorBar* colorBar = ColorBar::instance();
+        if (colorBar &&
+            colorBar->getPaletteView()->getSelectedEntriesCount() > 0) {
+          site->focus(Site::OnColorBar);
+        }
+        else {
+          site->focus(Site::OnEditor);
+        }
+      }
+    }
   }
   // Default/dummy site (maybe for batch/command line mode)
   else if (!isUIAvailable()) {
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index e43f6dafb..1548c0070 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -55,6 +55,7 @@ add_library(doc-lib
   primitives.cpp
   remap.cpp
   rgbmap.cpp
+  selected_layers.cpp
   site.cpp
   sort_palette.cpp
   sprite.cpp
diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
new file mode 100644
index 000000000..22dad7e67
--- /dev/null
+++ b/src/doc/selected_layers.cpp
@@ -0,0 +1,37 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "doc/selected_layers.h"
+
+#include "doc/layer.h"
+
+namespace doc {
+
+void remove_children_if_parent_is_selected(SelectedLayers& layers)
+{
+  SelectedLayers removeThese;
+
+  for (Layer* child : layers) {
+    Layer* parent = child->parent();
+    while (parent) {
+      if (layers.find(parent) != layers.end()) {
+        removeThese.insert(child);
+        break;
+      }
+      parent = parent->parent();
+    }
+  }
+
+  for (Layer* child : removeThese) {
+    layers.erase(child);
+  }
+}
+
+} // namespace doc
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
new file mode 100644
index 000000000..40861e058
--- /dev/null
+++ b/src/doc/selected_layers.h
@@ -0,0 +1,23 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_SELECTED_LAYERS_H_INCLUDED
+#define DOC_SELECTED_LAYERS_H_INCLUDED
+#pragma once
+
+#include <set>
+
+namespace doc {
+
+  class Layer;
+
+  typedef std::set<Layer*> SelectedLayers;
+
+  void remove_children_if_parent_is_selected(SelectedLayers& layers);
+
+} // namespace doc
+
+#endif  // DOC_LAYER_LIST_H_INCLUDED
diff --git a/src/doc/site.h b/src/doc/site.h
index be8b62313..c7387ce15 100644
--- a/src/doc/site.h
+++ b/src/doc/site.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "doc/frame.h"
+#include "doc/selected_layers.h"
 
 namespace doc {
 
@@ -24,12 +25,24 @@ namespace doc {
   // etc.).
   class Site {
   public:
+    // Were is the user focus. E.g. If this focus is in the timeline,
+    // it means that commands should applied in the context of the
+    // timeline (layers + frames).
+    enum Focus {
+      None,
+      OnEditor,
+      OnTimeline,
+      OnColorBar
+    };
+
     Site()
-      : m_document(nullptr)
+      : m_focus(None)
+      , m_document(nullptr)
       , m_sprite(nullptr)
       , m_layer(nullptr)
       , m_frame(0) { }
 
+    const Focus focus() const { return m_focus; }
     const Document* document() const { return m_document; }
     const Sprite* sprite() const { return m_sprite; }
     const Layer* layer() const { return m_layer; }
@@ -41,20 +54,30 @@ namespace doc {
     Layer* layer() { return m_layer; }
     Cel* cel();
 
+    void focus(Focus focus) { m_focus = focus; }
     void document(Document* document) { m_document = document; }
     void sprite(Sprite* sprite) { m_sprite = sprite; }
     void layer(Layer* layer) { m_layer = layer; }
     void frame(frame_t frame) { m_frame = frame; }
 
+    const SelectedLayers& selectedLayers() const { return m_selectedLayers; }
+    SelectedLayers& selectedLayers() { return m_selectedLayers; }
+
+    void selectedLayers(const SelectedLayers& selectedLayers) {
+      m_selectedLayers = selectedLayers;
+    }
+
     Palette* palette();
     Image* image(int* x = nullptr, int* y = nullptr, int* opacity = nullptr) const;
     Palette* palette() const;
 
   private:
+    Focus m_focus;
     Document* m_document;
     Sprite* m_sprite;
     Layer* m_layer;
     frame_t m_frame;
+    SelectedLayers m_selectedLayers;
   };
 
 } // namespace app

From 9307c12174d69ca8f5095a87e8b0b8410f00f619 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 14:53:02 -0300
Subject: [PATCH 17/86] Fix RemoveLayer when we remove groups/sublayers/etc

---
 src/app/commands/cmd_remove_layer.cpp | 32 +++++++++++++++++----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp
index 5b82c1c20..2aba96f6e 100644
--- a/src/app/commands/cmd_remove_layer.cpp
+++ b/src/app/commands/cmd_remove_layer.cpp
@@ -15,7 +15,6 @@
 #include "app/document_api.h"
 #include "app/modules/gui.h"
 #include "app/ui/status_bar.h"
-#include "app/ui/timeline.h"
 #include "app/transaction.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
@@ -52,25 +51,33 @@ bool RemoveLayerCommand::onEnabled(Context* context)
 
 void RemoveLayerCommand::onExecute(Context* context)
 {
-  std::string layer_name;
+  std::string layerName;
   ContextWriter writer(context);
   Document* document(writer.document());
   Sprite* sprite(writer.sprite());
-  Layer* layer(writer.layer());
   {
     Transaction transaction(writer.context(), "Remove Layer");
     DocumentApi api = document->getApi(transaction);
 
-    // TODO the range of selected layer should be in doc::Site.
-    auto range = App::instance()->timeline()->range();
-    if (range.enabled()) {
-      if (range.layers() == sprite->countLayers()) {
+    const Site* site = writer.site();
+    if (site->focus() == Site::OnTimeline &&
+        !site->selectedLayers().empty()) {
+      SelectedLayers selLayers = site->selectedLayers();
+      remove_children_if_parent_is_selected(selLayers);
+
+      int deletedTopLevelLayers = 0;
+      for (Layer* layer : selLayers) {
+        if (layer->parent() == sprite->root())
+          ++deletedTopLevelLayers;
+      }
+
+      if (deletedTopLevelLayers == sprite->countLayers()) {
         ui::Alert::show("Error<<You cannot delete all layers.||&OK");
         return;
       }
 
-      for (LayerIndex layer = range.layerEnd(); layer >= range.layerBegin(); --layer) {
-        api.removeLayer(sprite->indexToLayer(layer));
+      for (Layer* layer : selLayers) {
+        api.removeLayer(layer);
       }
     }
     else {
@@ -79,7 +86,8 @@ void RemoveLayerCommand::onExecute(Context* context)
         return;
       }
 
-      layer_name = layer->name();
+      Layer* layer = writer.layer();
+      layerName = layer->name();
       api.removeLayer(layer);
     }
 
@@ -88,8 +96,8 @@ void RemoveLayerCommand::onExecute(Context* context)
   update_screen_for_document(document);
 
   StatusBar::instance()->invalidate();
-  if (!layer_name.empty())
-    StatusBar::instance()->showTip(1000, "Layer `%s' removed", layer_name.c_str());
+  if (!layerName.empty())
+    StatusBar::instance()->showTip(1000, "Layer '%s' removed", layerName.c_str());
   else
     StatusBar::instance()->showTip(1000, "Layers removed");
 }

From 0713fb8db07ff528d52cc36772345ed2d6841575 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 16:30:03 -0300
Subject: [PATCH 18/86] Add SelectedFrames into doc::Site

---
 src/doc/CMakeLists.txt            |  1 +
 src/doc/frame_range.h             | 32 +++++++++++
 src/doc/selected_frames.cpp       | 71 +++++++++++++++++++++++
 src/doc/selected_frames.h         | 75 ++++++++++++++++++++++++
 src/doc/selected_frames_tests.cpp | 94 +++++++++++++++++++++++++++++++
 src/doc/site.h                    |  9 ++-
 6 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 src/doc/frame_range.h
 create mode 100644 src/doc/selected_frames.cpp
 create mode 100644 src/doc/selected_frames.h
 create mode 100644 src/doc/selected_frames_tests.cpp

diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 1548c0070..268bf26c0 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -55,6 +55,7 @@ add_library(doc-lib
   primitives.cpp
   remap.cpp
   rgbmap.cpp
+  selected_frames.cpp
   selected_layers.cpp
   site.cpp
   sort_palette.cpp
diff --git a/src/doc/frame_range.h b/src/doc/frame_range.h
new file mode 100644
index 000000000..16f4f8dc6
--- /dev/null
+++ b/src/doc/frame_range.h
@@ -0,0 +1,32 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_FRAME_RANGE_H_INCLUDED
+#define DOC_FRAME_RANGE_H_INCLUDED
+#pragma once
+
+#include "doc/frame.h"
+
+namespace doc {
+
+  struct FrameRange {
+    frame_t fromFrame, toFrame;
+
+    FrameRange() : fromFrame(0), toFrame(0) {
+    }
+
+    explicit FrameRange(frame_t frame)
+      : fromFrame(frame), toFrame(frame) {
+    }
+
+    FrameRange(frame_t fromFrame, frame_t toFrame)
+      : fromFrame(fromFrame), toFrame(toFrame) {
+    }
+  };
+
+} // namespace doc
+
+#endif
diff --git a/src/doc/selected_frames.cpp b/src/doc/selected_frames.cpp
new file mode 100644
index 000000000..b5f6c9f80
--- /dev/null
+++ b/src/doc/selected_frames.cpp
@@ -0,0 +1,71 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "doc/selected_frames.h"
+
+namespace doc {
+
+void SelectedFrames::insert(frame_t frame)
+{
+  if (m_ranges.empty()) {
+    m_ranges.push_back(FrameRange(frame));
+    return;
+  }
+
+  auto it = m_ranges.begin();
+  auto end = m_ranges.end();
+  auto next = it;
+
+  for (; it!=end; it=next) {
+    if (frame >= it->fromFrame &&
+        frame <= it->toFrame)
+      break;
+
+    if (frame < it->fromFrame) {
+      if (frame == it->fromFrame-1)
+        --it->fromFrame;
+      else
+        m_ranges.insert(it, FrameRange(frame));
+      break;
+    }
+
+    ++next;
+
+    if (frame > it->toFrame && (next == end || frame < next->fromFrame-1)) {
+      if (frame == it->toFrame+1)
+        ++it->toFrame;
+      else
+        m_ranges.insert(next, FrameRange(frame));
+      break;
+    }
+  }
+}
+
+void SelectedFrames::insert(frame_t fromFrame, frame_t toFrame)
+{
+  // TODO improve this
+  for (frame_t frame = fromFrame; frame <= toFrame; ++frame) {
+    insert(frame);
+  }
+}
+
+bool SelectedFrames::contains(frame_t frame) const
+{
+  return std::binary_search(
+    m_ranges.begin(),
+    m_ranges.end(),
+    FrameRange(frame),
+    [](const FrameRange& a,
+       const FrameRange& b) -> bool {
+      return (a.toFrame < b.fromFrame);
+    });
+}
+
+} // namespace doc
diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
new file mode 100644
index 000000000..cf45a8f6b
--- /dev/null
+++ b/src/doc/selected_frames.h
@@ -0,0 +1,75 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_SELECTED_FRAMES_H_INCLUDED
+#define DOC_SELECTED_FRAMES_H_INCLUDED
+#pragma once
+
+#include "doc/frame_range.h"
+
+#include <iterator>
+#include <vector>
+
+namespace doc {
+
+  class SelectedFrames {
+    typedef std::vector<FrameRange> Ranges;
+
+  public:
+    class const_iterator : public std::iterator<std::forward_iterator_tag, frame_t> {
+    public:
+      const_iterator(const Ranges::const_iterator& it)
+        : m_it(it), m_frame(-1) {
+      }
+
+      const_iterator& operator++() {
+        if (m_frame < 0)
+          m_frame = m_it->fromFrame;
+
+        if (m_frame < m_it->toFrame)
+          ++m_frame;
+        else {
+          m_frame = -1;
+          ++m_it;
+        }
+
+        return *this;
+      }
+
+      frame_t operator*() const {
+        if (m_frame < 0)
+          m_frame = m_it->fromFrame;
+        return m_frame;
+      }
+
+      bool operator==(const const_iterator& o) const {
+        return (m_it == o.m_it && m_frame == o.m_frame);
+      }
+
+      bool operator!=(const const_iterator& it) const {
+        return !operator==(it);
+      }
+
+    private:
+      mutable Ranges::const_iterator m_it;
+      mutable frame_t m_frame;
+    };
+
+    const_iterator begin() const { return const_iterator(m_ranges.begin()); }
+    const_iterator end() const { return const_iterator(m_ranges.end()); }
+
+    void insert(frame_t frame);
+    void insert(frame_t fromFrame, frame_t toFrame);
+
+    bool contains(frame_t frame) const;
+
+  private:
+    Ranges m_ranges;
+  };
+
+} // namespace doc
+
+#endif  // DOC_LAYER_LIST_H_INCLUDED
diff --git a/src/doc/selected_frames_tests.cpp b/src/doc/selected_frames_tests.cpp
new file mode 100644
index 000000000..4ffd37c91
--- /dev/null
+++ b/src/doc/selected_frames_tests.cpp
@@ -0,0 +1,94 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gtest/gtest.h>
+
+#include "doc/selected_frames.h"
+
+#include <algorithm>
+#include <iterator>
+
+using namespace doc;
+
+TEST(SelectedFrames, BasicOneRange)
+{
+  SelectedFrames f;
+  f.insert(1);
+  f.insert(2);
+  f.insert(3);
+
+  std::vector<frame_t> res;
+  std::copy(f.begin(), f.end(), std::back_inserter(res));
+
+  ASSERT_EQ(3, res.size());
+  EXPECT_EQ(1, res[0]);
+  EXPECT_EQ(2, res[1]);
+  EXPECT_EQ(3, res[2]);
+}
+
+TEST(SelectedFrames, BasicThreeRanges)
+{
+  SelectedFrames f;
+  f.insert(1);
+  f.insert(3);
+  f.insert(5);
+
+  std::vector<frame_t> res;
+  std::copy(f.begin(), f.end(), std::back_inserter(res));
+
+  ASSERT_EQ(3, res.size());
+  EXPECT_EQ(1, res[0]);
+  EXPECT_EQ(3, res[1]);
+  EXPECT_EQ(5, res[2]);
+}
+
+TEST(SelectedFrames, InsertSelectedFrameInsideSelectedRange)
+{
+  SelectedFrames f;
+  f.insert(3);
+  f.insert(5, 8);
+  f.insert(7);
+
+  std::vector<frame_t> res;
+  std::copy(f.begin(), f.end(), std::back_inserter(res));
+
+  ASSERT_EQ(5, res.size());
+  EXPECT_EQ(3, res[0]);
+  EXPECT_EQ(5, res[1]);
+  EXPECT_EQ(6, res[2]);
+  EXPECT_EQ(7, res[3]);
+  EXPECT_EQ(8, res[4]);
+}
+
+TEST(SelectedFrames, Contains)
+{
+  SelectedFrames f;
+  f.insert(1);
+  f.insert(4, 5);
+  f.insert(7, 9);
+
+  EXPECT_FALSE(f.contains(0));
+  EXPECT_TRUE(f.contains(1));
+  EXPECT_FALSE(f.contains(2));
+  EXPECT_FALSE(f.contains(3));
+  EXPECT_TRUE(f.contains(4));
+  EXPECT_TRUE(f.contains(5));
+  EXPECT_FALSE(f.contains(6));
+  EXPECT_TRUE(f.contains(7));
+  EXPECT_TRUE(f.contains(8));
+  EXPECT_TRUE(f.contains(9));
+  EXPECT_FALSE(f.contains(10));
+}
+
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/src/doc/site.h b/src/doc/site.h
index c7387ce15..a2f4c6520 100644
--- a/src/doc/site.h
+++ b/src/doc/site.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "doc/frame.h"
+#include "doc/selected_frames.h"
 #include "doc/selected_layers.h"
 
 namespace doc {
@@ -62,11 +63,16 @@ namespace doc {
 
     const SelectedLayers& selectedLayers() const { return m_selectedLayers; }
     SelectedLayers& selectedLayers() { return m_selectedLayers; }
-
     void selectedLayers(const SelectedLayers& selectedLayers) {
       m_selectedLayers = selectedLayers;
     }
 
+    const SelectedFrames& selectedFrames() const { return m_selectedFrames; }
+    SelectedFrames& selectedFrames() { return m_selectedFrames; }
+    void selectedFrames(const SelectedFrames& selectedFrames) {
+      m_selectedFrames = selectedFrames;
+    }
+
     Palette* palette();
     Image* image(int* x = nullptr, int* y = nullptr, int* opacity = nullptr) const;
     Palette* palette() const;
@@ -78,6 +84,7 @@ namespace doc {
     Layer* m_layer;
     frame_t m_frame;
     SelectedLayers m_selectedLayers;
+    SelectedFrames m_selectedFrames;
   };
 
 } // namespace app

From 52d088ef80a8b9ebe23491c80dc2db2b040e75ef Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 17:24:41 -0300
Subject: [PATCH 19/86] Fill SelectedFrames from Timeline in UIContext

---
 src/app/ui/timeline.cpp | 13 +++++++++++++
 src/app/ui/timeline.h   |  2 ++
 src/app/ui_context.cpp  |  1 +
 3 files changed, 16 insertions(+)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 678627fae..01c29e89c 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -293,6 +293,19 @@ SelectedLayers Timeline::selectedLayers() const
   return layers;
 }
 
+SelectedFrames Timeline::selectedFrames() const
+{
+  SelectedFrames frames;
+
+  if (m_range.enabled() &&
+      m_range.frameBegin() >= frame_t(0)) {
+    frames.insert(m_range.frameBegin(),
+                  m_range.frameEnd());
+  }
+
+  return frames;
+}
+
 void Timeline::prepareToMoveRange()
 {
   ASSERT(m_range.enabled());
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 6df7ead2b..2c59f8ce5 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -19,6 +19,7 @@
 #include "doc/documents_observer.h"
 #include "doc/frame.h"
 #include "doc/layer_index.h"
+#include "doc/selected_frames.h"
 #include "doc/selected_layers.h"
 #include "doc/sprite.h"
 #include "ui/scroll_bar.h"
@@ -90,6 +91,7 @@ namespace app {
 
     Range range() const { return m_range; }
     SelectedLayers selectedLayers() const;
+    SelectedFrames selectedFrames() const;
 
     void prepareToMoveRange();
     void moveRange(Range& range);
diff --git a/src/app/ui_context.cpp b/src/app/ui_context.cpp
index aa94b1a61..45914b93a 100644
--- a/src/app/ui_context.cpp
+++ b/src/app/ui_context.cpp
@@ -229,6 +229,7 @@ void UIContext::onGetActiveSite(Site* site) const
           timeline->range().enabled()) {
         site->focus(Site::OnTimeline);
         site->selectedLayers(timeline->selectedLayers());
+        site->selectedFrames(timeline->selectedFrames());
       }
       else {
         ColorBar* colorBar = ColorBar::instance();

From 5e5a91444e3670ebfe70a0552321e2a2ad56df11 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 17:47:17 -0300
Subject: [PATCH 20/86] Add SelectedFrames::size/empty() member functions

---
 src/doc/selected_frames.cpp       | 8 ++++++++
 src/doc/selected_frames.h         | 3 +++
 src/doc/selected_frames_tests.cpp | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/src/doc/selected_frames.cpp b/src/doc/selected_frames.cpp
index b5f6c9f80..1e7b3772f 100644
--- a/src/doc/selected_frames.cpp
+++ b/src/doc/selected_frames.cpp
@@ -12,6 +12,14 @@
 
 namespace doc {
 
+std::size_t SelectedFrames::size() const
+{
+  std::size_t size = 0;
+  for (auto& range : m_ranges)
+    size += (range.toFrame - range.fromFrame + 1);
+  return size;
+}
+
 void SelectedFrames::insert(frame_t frame)
 {
   if (m_ranges.empty()) {
diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index cf45a8f6b..1ea54ccec 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -61,6 +61,9 @@ namespace doc {
     const_iterator begin() const { return const_iterator(m_ranges.begin()); }
     const_iterator end() const { return const_iterator(m_ranges.end()); }
 
+    std::size_t size() const;
+    bool empty() const { return m_ranges.empty(); }
+
     void insert(frame_t frame);
     void insert(frame_t fromFrame, frame_t toFrame);
 
diff --git a/src/doc/selected_frames_tests.cpp b/src/doc/selected_frames_tests.cpp
index 4ffd37c91..757494b33 100644
--- a/src/doc/selected_frames_tests.cpp
+++ b/src/doc/selected_frames_tests.cpp
@@ -20,9 +20,12 @@ using namespace doc;
 TEST(SelectedFrames, BasicOneRange)
 {
   SelectedFrames f;
+  ASSERT_TRUE(f.empty());
   f.insert(1);
   f.insert(2);
   f.insert(3);
+  ASSERT_FALSE(f.empty());
+  ASSERT_EQ(3, f.size());
 
   std::vector<frame_t> res;
   std::copy(f.begin(), f.end(), std::back_inserter(res));
@@ -39,6 +42,7 @@ TEST(SelectedFrames, BasicThreeRanges)
   f.insert(1);
   f.insert(3);
   f.insert(5);
+  ASSERT_EQ(3, f.size());
 
   std::vector<frame_t> res;
   std::copy(f.begin(), f.end(), std::back_inserter(res));
@@ -55,6 +59,7 @@ TEST(SelectedFrames, InsertSelectedFrameInsideSelectedRange)
   f.insert(3);
   f.insert(5, 8);
   f.insert(7);
+  ASSERT_EQ(5, f.size());
 
   std::vector<frame_t> res;
   std::copy(f.begin(), f.end(), std::back_inserter(res));

From daf4e0e0228b93527c9ab3c8dd295243f24ac735 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 17:47:42 -0300
Subject: [PATCH 21/86] Add reverse iterator to SelectedFrames

---
 src/doc/selected_frames.h         | 41 +++++++++++++++++++++++++++++++
 src/doc/selected_frames_tests.cpp | 16 ++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index 1ea54ccec..1b8e0435c 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -58,8 +58,49 @@ namespace doc {
       mutable frame_t m_frame;
     };
 
+    class const_reverse_iterator : public std::iterator<std::forward_iterator_tag, frame_t> {
+    public:
+      const_reverse_iterator(const Ranges::const_reverse_iterator& it)
+        : m_it(it), m_frame(-1) {
+      }
+
+      const_reverse_iterator& operator++() {
+        if (m_frame < 0)
+          m_frame = m_it->toFrame;
+
+        if (m_frame > m_it->fromFrame)
+          --m_frame;
+        else {
+          m_frame = -1;
+          ++m_it;
+        }
+
+        return *this;
+      }
+
+      frame_t operator*() const {
+        if (m_frame < 0)
+          m_frame = m_it->toFrame;
+        return m_frame;
+      }
+
+      bool operator==(const const_reverse_iterator& o) const {
+        return (m_it == o.m_it && m_frame == o.m_frame);
+      }
+
+      bool operator!=(const const_reverse_iterator& it) const {
+        return !operator==(it);
+      }
+
+    private:
+      mutable Ranges::const_reverse_iterator m_it;
+      mutable frame_t m_frame;
+    };
+
     const_iterator begin() const { return const_iterator(m_ranges.begin()); }
     const_iterator end() const { return const_iterator(m_ranges.end()); }
+    const_reverse_iterator rbegin() const { return const_reverse_iterator(m_ranges.rbegin()); }
+    const_reverse_iterator rend() const { return const_reverse_iterator(m_ranges.rend()); }
 
     std::size_t size() const;
     bool empty() const { return m_ranges.empty(); }
diff --git a/src/doc/selected_frames_tests.cpp b/src/doc/selected_frames_tests.cpp
index 757494b33..eda7e1247 100644
--- a/src/doc/selected_frames_tests.cpp
+++ b/src/doc/selected_frames_tests.cpp
@@ -92,6 +92,22 @@ TEST(SelectedFrames, Contains)
   EXPECT_FALSE(f.contains(10));
 }
 
+TEST(SelectedFrames, ReverseIterators)
+{
+  SelectedFrames f;
+  f.insert(1);
+  f.insert(5, 7);
+
+  std::vector<frame_t> res;
+  std::copy(f.rbegin(), f.rend(), std::back_inserter(res));
+
+  ASSERT_EQ(4, res.size());
+  EXPECT_EQ(7, res[0]);
+  EXPECT_EQ(6, res[1]);
+  EXPECT_EQ(5, res[2]);
+  EXPECT_EQ(1, res[3]);
+}
+
 int main(int argc, char** argv)
 {
   ::testing::InitGoogleTest(&argc, argv);

From 7ced1c791b30d2c5a35a551c9b03cf339c91c48b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 13 Jun 2016 17:48:00 -0300
Subject: [PATCH 22/86] Include <algorithm> for binary search in contains()

---
 src/doc/selected_frames.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/doc/selected_frames.cpp b/src/doc/selected_frames.cpp
index 1e7b3772f..3c0d11a49 100644
--- a/src/doc/selected_frames.cpp
+++ b/src/doc/selected_frames.cpp
@@ -10,6 +10,8 @@
 
 #include "doc/selected_frames.h"
 
+#include <algorithm>
+
 namespace doc {
 
 std::size_t SelectedFrames::size() const

From 147588ff6fe5ea27f0c829d3562422ef239a982b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 10:15:47 -0300
Subject: [PATCH 23/86] Identify different Timeline areas with Site::Focus

---
 src/app/commands/cmd_remove_layer.cpp |  2 +-
 src/app/ui_context.cpp                | 10 +++++++---
 src/doc/site.h                        | 17 +++++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp
index 2aba96f6e..17d97ab10 100644
--- a/src/app/commands/cmd_remove_layer.cpp
+++ b/src/app/commands/cmd_remove_layer.cpp
@@ -60,7 +60,7 @@ void RemoveLayerCommand::onExecute(Context* context)
     DocumentApi api = document->getApi(transaction);
 
     const Site* site = writer.site();
-    if (site->focus() == Site::OnTimeline &&
+    if (site->inTimeline() &&
         !site->selectedLayers().empty()) {
       SelectedLayers selLayers = site->selectedLayers();
       remove_children_if_parent_is_selected(selLayers);
diff --git a/src/app/ui_context.cpp b/src/app/ui_context.cpp
index 45914b93a..737b81094 100644
--- a/src/app/ui_context.cpp
+++ b/src/app/ui_context.cpp
@@ -227,7 +227,11 @@ void UIContext::onGetActiveSite(Site* site) const
       Timeline* timeline = App::instance()->timeline();
       if (timeline &&
           timeline->range().enabled()) {
-        site->focus(Site::OnTimeline);
+        switch (timeline->range().type()) {
+          case DocumentRange::kCels:   site->focus(Site::InCels); break;
+          case DocumentRange::kFrames: site->focus(Site::InFrames); break;
+          case DocumentRange::kLayers: site->focus(Site::InLayers); break;
+        }
         site->selectedLayers(timeline->selectedLayers());
         site->selectedFrames(timeline->selectedFrames());
       }
@@ -235,10 +239,10 @@ void UIContext::onGetActiveSite(Site* site) const
         ColorBar* colorBar = ColorBar::instance();
         if (colorBar &&
             colorBar->getPaletteView()->getSelectedEntriesCount() > 0) {
-          site->focus(Site::OnColorBar);
+          site->focus(Site::InColorBar);
         }
         else {
-          site->focus(Site::OnEditor);
+          site->focus(Site::InEditor);
         }
       }
     }
diff --git a/src/doc/site.h b/src/doc/site.h
index a2f4c6520..872172507 100644
--- a/src/doc/site.h
+++ b/src/doc/site.h
@@ -28,12 +28,14 @@ namespace doc {
   public:
     // Were is the user focus. E.g. If this focus is in the timeline,
     // it means that commands should applied in the context of the
-    // timeline (layers + frames).
+    // timeline (layers, or frames, or cels).
     enum Focus {
       None,
-      OnEditor,
-      OnTimeline,
-      OnColorBar
+      InEditor,
+      InLayers,
+      InFrames,
+      InCels,
+      InColorBar
     };
 
     Site()
@@ -44,6 +46,13 @@ namespace doc {
       , m_frame(0) { }
 
     const Focus focus() const { return m_focus; }
+    bool inEditor() const { return m_focus == InEditor; }
+    bool inLayers() const { return m_focus == InLayers; }
+    bool inFrames() const { return m_focus == InFrames; }
+    bool inCels() const { return m_focus == InCels; }
+    bool inColorBar() const { return m_focus == InColorBar; }
+    bool inTimeline() const { return (inLayers() || inFrames() || inCels()); }
+
     const Document* document() const { return m_document; }
     const Sprite* sprite() const { return m_sprite; }
     const Layer* layer() const { return m_layer; }

From 8a3e74f7ec3c0c6f3f728e80ffb04de7bbe25aa1 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 10:56:30 -0300
Subject: [PATCH 24/86] Add doc::select_all_layers() function

---
 src/doc/selected_layers.cpp | 9 +++++++++
 src/doc/selected_layers.h   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
index 22dad7e67..f2f7ce763 100644
--- a/src/doc/selected_layers.cpp
+++ b/src/doc/selected_layers.cpp
@@ -34,4 +34,13 @@ void remove_children_if_parent_is_selected(SelectedLayers& layers)
   }
 }
 
+void select_all_layers(LayerGroup* group, SelectedLayers& layers)
+{
+  for (Layer* layer : group->layers()) {
+    if (layer->isGroup())
+      select_all_layers(static_cast<LayerGroup*>(layer), layers);
+    layers.insert(layer);
+  }
+}
+
 } // namespace doc
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
index 40861e058..adecad75d 100644
--- a/src/doc/selected_layers.h
+++ b/src/doc/selected_layers.h
@@ -13,10 +13,12 @@
 namespace doc {
 
   class Layer;
+  class LayerGroup;
 
   typedef std::set<Layer*> SelectedLayers;
 
   void remove_children_if_parent_is_selected(SelectedLayers& layers);
+  void select_all_layers(LayerGroup* group, SelectedLayers& layers);
 
 } // namespace doc
 

From 5d222c9c3eab432ac614a9595c1a985779da2d84 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 11:05:03 -0300
Subject: [PATCH 25/86] Add SelectedFrames::ranges/firstFrame/lastFrame()

---
 src/doc/selected_frames.h         |  4 ++++
 src/doc/selected_frames_tests.cpp | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index 1b8e0435c..0ce0d54de 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -103,6 +103,7 @@ namespace doc {
     const_reverse_iterator rend() const { return const_reverse_iterator(m_ranges.rend()); }
 
     std::size_t size() const;
+    std::size_t ranges() const { return m_ranges.size(); }
     bool empty() const { return m_ranges.empty(); }
 
     void insert(frame_t frame);
@@ -110,6 +111,9 @@ namespace doc {
 
     bool contains(frame_t frame) const;
 
+    frame_t firstFrame() const { return (!m_ranges.empty() ? m_ranges.front().fromFrame: -1); }
+    frame_t lastFrame() const { return (!m_ranges.empty() ? m_ranges.back().toFrame: -1); }
+
   private:
     Ranges m_ranges;
   };
diff --git a/src/doc/selected_frames_tests.cpp b/src/doc/selected_frames_tests.cpp
index eda7e1247..8a46af432 100644
--- a/src/doc/selected_frames_tests.cpp
+++ b/src/doc/selected_frames_tests.cpp
@@ -20,12 +20,13 @@ using namespace doc;
 TEST(SelectedFrames, BasicOneRange)
 {
   SelectedFrames f;
-  ASSERT_TRUE(f.empty());
+  EXPECT_TRUE(f.empty());
   f.insert(1);
   f.insert(2);
   f.insert(3);
-  ASSERT_FALSE(f.empty());
-  ASSERT_EQ(3, f.size());
+  EXPECT_FALSE(f.empty());
+  EXPECT_EQ(3, f.size());
+  EXPECT_EQ(1, f.ranges());
 
   std::vector<frame_t> res;
   std::copy(f.begin(), f.end(), std::back_inserter(res));
@@ -42,7 +43,8 @@ TEST(SelectedFrames, BasicThreeRanges)
   f.insert(1);
   f.insert(3);
   f.insert(5);
-  ASSERT_EQ(3, f.size());
+  EXPECT_EQ(3, f.size());
+  EXPECT_EQ(3, f.ranges());
 
   std::vector<frame_t> res;
   std::copy(f.begin(), f.end(), std::back_inserter(res));
@@ -59,7 +61,10 @@ TEST(SelectedFrames, InsertSelectedFrameInsideSelectedRange)
   f.insert(3);
   f.insert(5, 8);
   f.insert(7);
-  ASSERT_EQ(5, f.size());
+  EXPECT_EQ(5, f.size());
+  EXPECT_EQ(2, f.ranges());
+  EXPECT_EQ(3, f.firstFrame());
+  EXPECT_EQ(8, f.lastFrame());
 
   std::vector<frame_t> res;
   std::copy(f.begin(), f.end(), std::back_inserter(res));
@@ -78,6 +83,8 @@ TEST(SelectedFrames, Contains)
   f.insert(1);
   f.insert(4, 5);
   f.insert(7, 9);
+  EXPECT_EQ(6, f.size());
+  EXPECT_EQ(3, f.ranges());
 
   EXPECT_FALSE(f.contains(0));
   EXPECT_TRUE(f.contains(1));
@@ -97,6 +104,8 @@ TEST(SelectedFrames, ReverseIterators)
   SelectedFrames f;
   f.insert(1);
   f.insert(5, 7);
+  EXPECT_EQ(4, f.size());
+  EXPECT_EQ(2, f.ranges());
 
   std::vector<frame_t> res;
   std::copy(f.rbegin(), f.rend(), std::back_inserter(res));

From e58d54600a61e4c69cf0baeecd9b62057134d10b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 11:08:17 -0300
Subject: [PATCH 26/86] Fix #endif footer in some files

---
 src/doc/selected_frames.h | 2 +-
 src/doc/selected_layers.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index 0ce0d54de..c834e2195 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -120,4 +120,4 @@ namespace doc {
 
 } // namespace doc
 
-#endif  // DOC_LAYER_LIST_H_INCLUDED
+#endif  // DOC_SELECTED_FRAMES_H_INCLUDED
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
index adecad75d..32ccc1c6d 100644
--- a/src/doc/selected_layers.h
+++ b/src/doc/selected_layers.h
@@ -22,4 +22,4 @@ namespace doc {
 
 } // namespace doc
 
-#endif  // DOC_LAYER_LIST_H_INCLUDED
+#endif  // DOC_SELECTED_LAYERS_H_INCLUDED

From ad518b7fb272ec6ccec7e891a3374c648fd531dd Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 11:14:24 -0300
Subject: [PATCH 27/86] Add SelectedFrames::reversed() function

---
 src/doc/selected_frames.h         | 17 +++++++++++++++++
 src/doc/selected_frames_tests.cpp |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index c834e2195..caaa08733 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -97,6 +97,21 @@ namespace doc {
       mutable frame_t m_frame;
     };
 
+    class Reversed {
+    public:
+      typedef const_reverse_iterator const_iterator;
+
+      const_iterator begin() const { return m_selectedFrames.rbegin(); }
+      const_iterator end() const { return m_selectedFrames.rend(); }
+
+      Reversed(const SelectedFrames& selectedFrames)
+        : m_selectedFrames(selectedFrames) {
+      }
+
+    private:
+      const SelectedFrames& m_selectedFrames;
+    };
+
     const_iterator begin() const { return const_iterator(m_ranges.begin()); }
     const_iterator end() const { return const_iterator(m_ranges.end()); }
     const_reverse_iterator rbegin() const { return const_reverse_iterator(m_ranges.rbegin()); }
@@ -114,6 +129,8 @@ namespace doc {
     frame_t firstFrame() const { return (!m_ranges.empty() ? m_ranges.front().fromFrame: -1); }
     frame_t lastFrame() const { return (!m_ranges.empty() ? m_ranges.back().toFrame: -1); }
 
+    Reversed reversed() const { return Reversed(*this); }
+
   private:
     Ranges m_ranges;
   };
diff --git a/src/doc/selected_frames_tests.cpp b/src/doc/selected_frames_tests.cpp
index 8a46af432..a579e7972 100644
--- a/src/doc/selected_frames_tests.cpp
+++ b/src/doc/selected_frames_tests.cpp
@@ -115,6 +115,12 @@ TEST(SelectedFrames, ReverseIterators)
   EXPECT_EQ(6, res[1]);
   EXPECT_EQ(5, res[2]);
   EXPECT_EQ(1, res[3]);
+
+  std::vector<frame_t> res2;
+  for (frame_t frame : f.reversed())
+    res2.push_back(frame);
+
+  EXPECT_EQ(res, res2);
 }
 
 int main(int argc, char** argv)

From 3931341deef2d1cd9c38217482f88df42a0d4529 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 11:32:34 -0300
Subject: [PATCH 28/86] Fix ClearCelCommand for cels inside groups

---
 src/app/commands/cmd_clear_cel.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/app/commands/cmd_clear_cel.cpp b/src/app/commands/cmd_clear_cel.cpp
index c20d835cc..cd46df728 100644
--- a/src/app/commands/cmd_clear_cel.cpp
+++ b/src/app/commands/cmd_clear_cel.cpp
@@ -16,7 +16,6 @@
 #include "app/modules/gui.h"
 #include "app/transaction.h"
 #include "app/ui/status_bar.h"
-#include "app/ui/timeline.h"
 #include "doc/cel.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
@@ -53,22 +52,17 @@ void ClearCelCommand::onExecute(Context* context)
   {
     Transaction transaction(writer.context(), "Clear Cel");
 
-    // TODO the range of selected frames should be in doc::Site.
-    auto range = App::instance()->timeline()->range();
-    if (range.enabled()) {
-      Sprite* sprite = writer.sprite();
-
-      for (LayerIndex layerIdx = range.layerBegin(); layerIdx <= range.layerEnd(); ++layerIdx) {
-        Layer* layer = sprite->indexToLayer(layerIdx);
+    const Site* site = writer.site();
+    if (site->inTimeline() &&
+        !site->selectedLayers().empty() &&
+        !site->selectedFrames().empty()) {
+      for (Layer* layer : site->selectedLayers()) {
         if (!layer->isImage())
           continue;
 
         LayerImage* layerImage = static_cast<LayerImage*>(layer);
 
-        for (frame_t frame = range.frameEnd(),
-               begin = range.frameBegin()-1;
-             frame != begin;
-             --frame) {
+        for (frame_t frame : site->selectedFrames().reversed()) {
           if (layerImage->cel(frame)) {
             if (layerImage->isEditable())
               document->getApi(transaction).clearCel(layerImage, frame);

From 47eeb4f5640c1b39946b57bf63def7a72b49421c Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 12:57:13 -0300
Subject: [PATCH 29/86] Fix CelsRange to iterate over layer groups

---
 src/doc/cels_range.cpp   | 60 +++++++++++++++++++++++++++-------------
 src/doc/cels_range.h     |  5 +++-
 src/doc/sprite_tests.cpp | 41 ++++++++++++++++++++++-----
 3 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/src/doc/cels_range.cpp b/src/doc/cels_range.cpp
index 403812ced..edb4dd21d 100644
--- a/src/doc/cels_range.cpp
+++ b/src/doc/cels_range.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -37,14 +37,18 @@ CelsRange::iterator::iterator(const Sprite* sprite, frame_t first, frame_t last,
   // Get first cel
   Layer* layer = sprite->layer(sprite->firstLayer());
   while (layer && !m_cel) {
-    for (frame_t f=first; f<=last; ++f) {
-      m_cel = layer->cel(f);
-      if (m_cel)
-        break;
-      m_cel = nullptr;
+    if (layer->isImage()) {
+      for (frame_t f=first; f<=last; ++f) {
+        m_cel = layer->cel(f);
+        if (m_cel)
+          break;
+      }
     }
-    layer = layer->getNext();
+
+    if (!m_cel)
+      nextLayer(layer);
   }
+
   if (m_cel && flags == CelsRange::UNIQUE)
     m_visited.insert(m_cel->data()->id());
 }
@@ -60,25 +64,43 @@ CelsRange::iterator& CelsRange::iterator::operator++()
   m_cel = nullptr;
 
   while (layer && !m_cel) {
-    for (frame_t f=first; f<=m_last; ++f) {
-      m_cel = layer->cel(f);
-      if (m_cel) {
-        if (m_flags == CelsRange::UNIQUE) {
-          if (m_visited.find(m_cel->data()->id()) == m_visited.end()) {
-            m_visited.insert(m_cel->data()->id());
-            break;
+    if (layer->isImage()) {
+      for (frame_t f=first; f<=m_last; ++f) {
+        m_cel = layer->cel(f);
+        if (m_cel) {
+          if (m_flags == CelsRange::UNIQUE) {
+            if (m_visited.find(m_cel->data()->id()) == m_visited.end()) {
+              m_visited.insert(m_cel->data()->id());
+              break;
+            }
+            else
+              m_cel = nullptr;
           }
           else
-            m_cel = nullptr;
+            break;
         }
-        else
-          break;
       }
     }
-    layer = layer->getNext();
-    first = m_first;
+
+    if (!m_cel) {
+      nextLayer(layer);
+      first = m_first;
+    }
   }
   return *this;
 }
 
+void CelsRange::iterator::nextLayer(Layer*& layer)
+{
+  // Go to children
+  if (layer->isGroup()) {
+    layer = static_cast<LayerGroup*>(layer)->firstLayer();
+  }
+  // Go to next layer in the parent
+  else if (!layer->getNext())
+    layer = layer->parent()->getNext();
+  else
+    layer = layer->getNext();
+}
+
 } // namespace doc
diff --git a/src/doc/cels_range.h b/src/doc/cels_range.h
index d14e20ba0..d7f4ad299 100644
--- a/src/doc/cels_range.h
+++ b/src/doc/cels_range.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -15,6 +15,7 @@
 
 namespace doc {
   class Cel;
+  class Layer;
   class Sprite;
 
   class CelsRange {
@@ -47,6 +48,8 @@ namespace doc {
       iterator& operator++();
 
     private:
+      void nextLayer(Layer*& layer);
+
       Cel* m_cel;
       frame_t m_first, m_last;
       Flags m_flags;
diff --git a/src/doc/sprite_tests.cpp b/src/doc/sprite_tests.cpp
index ef5624408..0712a20b3 100644
--- a/src/doc/sprite_tests.cpp
+++ b/src/doc/sprite_tests.cpp
@@ -18,8 +18,13 @@
 
 using namespace doc;
 
-// lay1 = A _ B
-// lay2 = C D E
+//            frames
+//            0 1 2
+// root
+// - lay1:    A~~~B
+// - lay2:    C D~E
+// - grp1:
+//   - lay3:  F G~H
 TEST(Sprite, CelsRange)
 {
   Sprite* spr = new Sprite(IMAGE_RGB, 32, 32, 256);
@@ -27,8 +32,12 @@ TEST(Sprite, CelsRange)
 
   LayerImage* lay1 = new LayerImage(spr);
   LayerImage* lay2 = new LayerImage(spr);
+  LayerGroup* grp1 = new LayerGroup(spr);
+  LayerImage* lay3 = new LayerImage(spr);
   spr->root()->addLayer(lay1);
   spr->root()->addLayer(lay2);
+  spr->root()->addLayer(grp1);
+  grp1->addLayer(lay3);
 
   ImageRef imgA(Image::create(IMAGE_RGB, 32, 32));
   Cel* celA = new Cel(frame_t(0), imgA);
@@ -47,6 +56,16 @@ TEST(Sprite, CelsRange)
   lay2->addCel(celD);
   lay2->addCel(celE);
 
+  ImageRef imgF(Image::create(IMAGE_RGB, 32, 32));
+  ImageRef imgG(Image::create(IMAGE_RGB, 32, 32));
+  Cel* celF = new Cel(frame_t(0), imgF);
+  Cel* celG = new Cel(frame_t(1), imgG);
+  Cel* celH = Cel::createLink(celG);
+  celH->setFrame(frame_t(2));
+  lay3->addCel(celF);
+  lay3->addCel(celG);
+  lay3->addCel(celH);
+
   int i = 0;
   for (Cel* cel : spr->cels()) {
     switch (i) {
@@ -55,10 +74,13 @@ TEST(Sprite, CelsRange)
       case 2: EXPECT_EQ(cel, celC); break;
       case 3: EXPECT_EQ(cel, celD); break;
       case 4: EXPECT_EQ(cel, celE); break;
+      case 5: EXPECT_EQ(cel, celF); break;
+      case 6: EXPECT_EQ(cel, celG); break;
+      case 7: EXPECT_EQ(cel, celH); break;
     }
     ++i;
   }
-  EXPECT_EQ(5, i);
+  EXPECT_EQ(8, i);
 
   i = 0;
   for (Cel* cel : spr->uniqueCels()) {
@@ -66,39 +88,44 @@ TEST(Sprite, CelsRange)
       case 0: EXPECT_EQ(cel, celA); break;
       case 1: EXPECT_EQ(cel, celC); break;
       case 2: EXPECT_EQ(cel, celD); break;
+      case 3: EXPECT_EQ(cel, celF); break;
+      case 4: EXPECT_EQ(cel, celG); break;
     }
     ++i;
   }
-  EXPECT_EQ(3, i);
+  EXPECT_EQ(5, i);
 
   i = 0;
   for (Cel* cel : spr->cels(frame_t(0))) {
     switch (i) {
       case 0: EXPECT_EQ(cel, celA); break;
       case 1: EXPECT_EQ(cel, celC); break;
+      case 2: EXPECT_EQ(cel, celF); break;
     }
     ++i;
   }
-  EXPECT_EQ(2, i);
+  EXPECT_EQ(3, i);
 
   i = 0;
   for (Cel* cel : spr->cels(frame_t(1))) {
     switch (i) {
       case 0: EXPECT_EQ(cel, celD); break;
+      case 1: EXPECT_EQ(cel, celG); break;
     }
     ++i;
   }
-  EXPECT_EQ(1, i);
+  EXPECT_EQ(2, i);
 
   i = 0;
   for (Cel* cel : spr->cels(frame_t(2))) {
     switch (i) {
       case 0: EXPECT_EQ(cel, celB); break;
       case 1: EXPECT_EQ(cel, celE); break;
+      case 2: EXPECT_EQ(cel, celH); break;
     }
     ++i;
   }
-  EXPECT_EQ(2, i);
+  EXPECT_EQ(3, i);
 }
 
 int main(int argc, char** argv)

From 19b31ff31acdeca42db29b06344527ebf8ee208c Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 12:58:07 -0300
Subject: [PATCH 30/86] Fix UnlinkCel command to support layer groups

---
 src/app/commands/cmd_unlink_cel.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/app/commands/cmd_unlink_cel.cpp b/src/app/commands/cmd_unlink_cel.cpp
index 274c4a11d..5a126bee8 100644
--- a/src/app/commands/cmd_unlink_cel.cpp
+++ b/src/app/commands/cmd_unlink_cel.cpp
@@ -16,7 +16,6 @@
 #include "app/modules/gui.h"
 #include "app/transaction.h"
 #include "app/ui/status_bar.h"
-#include "app/ui/timeline.h"
 #include "doc/cel.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
@@ -53,22 +52,16 @@ void UnlinkCelCommand::onExecute(Context* context)
   {
     Transaction transaction(writer.context(), "Unlink Cel");
 
-    // TODO the range of selected frames should be in doc::Site.
-    auto range = App::instance()->timeline()->range();
-    if (range.enabled()) {
-      Sprite* sprite = writer.sprite();
-
-      for (LayerIndex layerIdx = range.layerBegin(); layerIdx <= range.layerEnd(); ++layerIdx) {
-        Layer* layer = sprite->indexToLayer(layerIdx);
+    const Site* site = writer.site();
+    if (site->inTimeline() &&
+        !site->selectedLayers().empty()) {
+      for (Layer* layer : site->selectedLayers()) {
         if (!layer->isImage())
           continue;
 
         LayerImage* layerImage = static_cast<LayerImage*>(layer);
 
-        for (frame_t frame = range.frameEnd(),
-               begin = range.frameBegin()-1;
-             frame != begin;
-             --frame) {
+        for (frame_t frame : site->selectedFrames().reversed()) {
           Cel* cel = layerImage->cel(frame);
           if (cel && cel->links()) {
             if (layerImage->isEditable())

From a738f3ed328b2bf458ec92f3e17378f9860d2a0f Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 12:59:08 -0300
Subject: [PATCH 31/86] Add some asserts in cmd::AddCel

---
 src/app/cmd/add_cel.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/cmd/add_cel.cpp b/src/app/cmd/add_cel.cpp
index 0c7448a15..aad94f854 100644
--- a/src/app/cmd/add_cel.cpp
+++ b/src/app/cmd/add_cel.cpp
@@ -39,6 +39,8 @@ void AddCel::onExecute()
 {
   Layer* layer = this->layer();
   Cel* cel = this->cel();
+  ASSERT(layer);
+  ASSERT(cel);
 
   addCel(layer, cel);
 }
@@ -47,6 +49,8 @@ void AddCel::onUndo()
 {
   Layer* layer = this->layer();
   Cel* cel = this->cel();
+  ASSERT(layer);
+  ASSERT(cel);
 
   // Save the CelData only if the cel isn't linked
   bool has_data = (cel->links() == 0);
@@ -64,6 +68,7 @@ void AddCel::onUndo()
 void AddCel::onRedo()
 {
   Layer* layer = this->layer();
+  ASSERT(layer);
 
   SubObjectsFromSprite io(layer->sprite());
   bool has_data = (read8(m_stream) != 0);
@@ -75,6 +80,7 @@ void AddCel::onRedo()
     io.addCelDataRef(celdata);
   }
   Cel* cel = read_cel(m_stream, &io);
+  ASSERT(cel);
 
   addCel(layer, cel);
 

From b925151c7a94328a768db9283c99dbc896d9f296 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 13:06:30 -0300
Subject: [PATCH 32/86] Fix LinkCels command for group layers

---
 src/app/commands/cmd_link_cels.cpp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/app/commands/cmd_link_cels.cpp b/src/app/commands/cmd_link_cels.cpp
index db882636f..d4b9b7905 100644
--- a/src/app/commands/cmd_link_cels.cpp
+++ b/src/app/commands/cmd_link_cels.cpp
@@ -16,7 +16,6 @@
 #include "app/modules/gui.h"
 #include "app/transaction.h"
 #include "app/ui/status_bar.h"
-#include "app/ui/timeline.h"
 #include "doc/cel.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
@@ -43,9 +42,9 @@ LinkCelsCommand::LinkCelsCommand()
 bool LinkCelsCommand::onEnabled(Context* context)
 {
   if (context->checkFlags(ContextFlags::ActiveDocumentIsWritable)) {
-    // TODO the range of selected frames should be in doc::Site.
-    auto range = App::instance()->timeline()->range();
-    return (range.enabled() && range.frames() > 1);
+    auto site = context->activeSite();
+    return (site.inTimeline() &&
+            site.selectedFrames().size() > 1);
   }
   else
     return false;
@@ -57,18 +56,14 @@ void LinkCelsCommand::onExecute(Context* context)
   Document* document(writer.document());
   bool nonEditableLayers = false;
   {
-    // TODO the range of selected frames should be in doc::Site.
-    auto range = App::instance()->timeline()->range();
-    if (!range.enabled())
+    auto site = context->activeSite();
+    if (!site.inTimeline())
       return;
 
     Transaction transaction(writer.context(), friendlyName());
     Sprite* sprite = writer.sprite();
-    frame_t begin = range.frameBegin();
-    frame_t end = range.frameEnd();
 
-    for (LayerIndex layerIdx = range.layerBegin(); layerIdx <= range.layerEnd(); ++layerIdx) {
-      Layer* layer = sprite->indexToLayer(layerIdx);
+    for (Layer* layer : site.selectedLayers()) {
       if (!layer->isImage())
         continue;
 
@@ -78,15 +73,17 @@ void LinkCelsCommand::onExecute(Context* context)
       }
 
       LayerImage* layerImage = static_cast<LayerImage*>(layer);
-      for (frame_t frame=begin; frame < end+1; ++frame) {
+
+      for (auto it=site.selectedFrames().begin(), end=site.selectedFrames().end();
+           it != end; ++it) {
+        frame_t frame = *it;
         Cel* cel = layerImage->cel(frame);
         if (cel) {
-          for (frame = cel->frame()+1;
-               frame < end+1; ++frame) {
+          for (++it; it != end; ++it) {
             transaction.execute(
               new cmd::CopyCel(
                 layerImage, cel->frame(),
-                layerImage, frame,
+                layerImage, *it,
                 true));         // true = force links
           }
           break;

From dba780e28d83b980222677a3170a32dc05a87cc0 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 13:08:17 -0300
Subject: [PATCH 33/86] Use Site::selectedFrames() in FrameProperties

---
 src/app/commands/cmd_frame_properties.cpp | 49 +++++++++++++----------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/app/commands/cmd_frame_properties.cpp b/src/app/commands/cmd_frame_properties.cpp
index dd52bbcb9..99261d3bc 100644
--- a/src/app/commands/cmd_frame_properties.cpp
+++ b/src/app/commands/cmd_frame_properties.cpp
@@ -10,11 +10,11 @@
 #endif
 
 #include "app/app.h"
+#include "app/context.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
 #include "app/context_access.h"
 #include "app/document_api.h"
-#include "app/ui/timeline.h"
 #include "app/transaction.h"
 #include "base/convert_to.h"
 #include "doc/sprite.h"
@@ -82,51 +82,58 @@ void FramePropertiesCommand::onExecute(Context* context)
   const Sprite* sprite = reader.sprite();
 
   app::gen::FrameProperties window;
-  frame_t firstFrame = 0;
-  frame_t lastFrame = 0;
+  SelectedFrames selFrames;
 
   switch (m_target) {
 
     case ALL_FRAMES:
-      lastFrame = sprite->lastFrame();
+      selFrames.insert(0, sprite->lastFrame());
       break;
 
     case CURRENT_RANGE: {
-      // TODO the range of selected frames should be in doc::Site.
-      auto range = App::instance()->timeline()->range();
-      if (range.enabled()) {
-        firstFrame = range.frameBegin();
-        lastFrame = range.frameEnd();
+      Site site = context->activeSite();
+      if (site.inTimeline()) {
+        selFrames = site.selectedFrames();
       }
       else {
-        firstFrame = lastFrame = reader.frame();
+        selFrames.insert(site.frame());
       }
       break;
     }
 
     case SPECIFIC_FRAME:
-      firstFrame = lastFrame = m_frame;
+      selFrames.insert(m_frame);
       break;
   }
 
-  if (firstFrame != lastFrame)
-    window.frame()->setTextf("[%d...%d]", (int)firstFrame+1, (int)lastFrame+1);
-  else
-    window.frame()->setTextf("%d", (int)firstFrame+1);
+  ASSERT(!selFrames.empty());
+  if (selFrames.empty())
+    return;
 
-  window.frlen()->setTextf("%d", sprite->frameDuration(firstFrame));
+  if (selFrames.size() == 1)
+    window.frame()->setTextf("%d", selFrames.firstFrame()+1);
+  else if (selFrames.ranges() == 1) {
+    window.frame()->setTextf("[%d...%d]",
+                             selFrames.firstFrame()+1,
+                             selFrames.lastFrame()+1);
+  }
+  else
+    window.frame()->setTextf("Multiple Frames");
+
+  window.frlen()->setTextf(
+    "%d", sprite->frameDuration(selFrames.firstFrame()));
 
   window.openWindowInForeground();
   if (window.closer() == window.ok()) {
-    int num = window.frlen()->textInt();
+    int newMsecs = window.frlen()->textInt();
 
     ContextWriter writer(reader);
     Transaction transaction(writer.context(), "Frame Duration");
     DocumentApi api = writer.document()->getApi(transaction);
-    if (firstFrame != lastFrame)
-      api.setFrameRangeDuration(writer.sprite(), firstFrame, lastFrame, num);
-    else
-      api.setFrameDuration(writer.sprite(), firstFrame, num);
+
+    for (frame_t frame : selFrames)
+      api.setFrameDuration(writer.sprite(), frame, newMsecs);
+
     transaction.commit();
   }
 }

From 530efae6b2e9f36c52bb299d1ee03bd2c0571cd6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 14:11:30 -0300
Subject: [PATCH 34/86] Update hot layer after expanding/collapsing a group

In this way we can click several times in the same position to
expand/collapse the folder without moving the mouse.
---
 src/app/ui/timeline.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 01c29e89c..7f422c515 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -710,6 +710,9 @@ bool Timeline::onProcessMessage(Message* msg)
                   regenerateLayers();
                   showCurrentCel();
                   invalidate();
+
+                  updateByMousePos(
+                    msg, ui::get_mouse_position() - bounds().origin());
                 }
               }
             }

From d0e4a62cab782eeca226198de81d07b282d05071 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 14:17:52 -0300
Subject: [PATCH 35/86] Use Site::selectedFrames() in RemoveFrame command

---
 src/app/commands/cmd_remove_frame.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/app/commands/cmd_remove_frame.cpp b/src/app/commands/cmd_remove_frame.cpp
index 81554bffb..0448d96a2 100644
--- a/src/app/commands/cmd_remove_frame.cpp
+++ b/src/app/commands/cmd_remove_frame.cpp
@@ -14,7 +14,6 @@
 #include "app/context_access.h"
 #include "app/document_api.h"
 #include "app/modules/gui.h"
-#include "app/ui/timeline.h"
 #include "app/transaction.h"
 #include "doc/sprite.h"
 #include "ui/ui.h"
@@ -55,14 +54,10 @@ void RemoveFrameCommand::onExecute(Context* context)
   {
     Transaction transaction(writer.context(), "Remove Frame");
     DocumentApi api = document->getApi(transaction);
-
-    // TODO the range of selected frames should be in doc::Site.
-    auto range = App::instance()->timeline()->range();
-    if (range.enabled()) {
-      for (frame_t frame = range.frameEnd(),
-             begin = range.frameBegin()-1;
-           frame != begin;
-           --frame) {
+    const Site* site = writer.site();
+    if (site->inTimeline() &&
+        !site->selectedFrames().empty()) {
+      for (frame_t frame : site->selectedFrames().reversed()) {
         api.removeFrame(sprite, frame);
       }
     }

From f20850194bce247a90e471669d78213ba23eb907 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 14:28:00 -0300
Subject: [PATCH 36/86] Use Site::selectedFrames/Layers() in NewFrame to
 duplicate cels

---
 src/app/commands/cmd_new_frame.cpp | 47 ++++++++++++++++--------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/app/commands/cmd_new_frame.cpp b/src/app/commands/cmd_new_frame.cpp
index 99fb04fbd..ed0f4cb68 100644
--- a/src/app/commands/cmd_new_frame.cpp
+++ b/src/app/commands/cmd_new_frame.cpp
@@ -106,34 +106,37 @@ void NewFrameCommand::onExecute(Context* context)
 
       case Content::DUPLICATE_CELS:
       case Content::DUPLICATE_CELS_BLOCK: {
-        // TODO the range of selected frames should be in doc::Site.
-        Timeline* timeline = App::instance()->timeline();
-        Timeline::Range range = timeline->range();
-        if (range.enabled()) {
+        const Site* site = writer.site();
+        if (site->inTimeline() &&
+            !site->selectedLayers().empty() &&
+            !site->selectedFrames().empty()) {
           std::map<CelData*, Cel*> relatedCels;
+
+          auto timeline = App::instance()->timeline();
           timeline->prepareToMoveRange();
+          DocumentRange range = timeline->range();
 
-          LayerIndex layerBegin = range.layerBegin();
-          LayerIndex layerEnd = range.layerEnd();
+          SelectedLayers selLayers;
+          if (site->inFrames())
+            select_all_layers(writer.sprite()->root(), selLayers);
+          else
+            selLayers = site->selectedLayers();
 
-          if (range.type() == DocumentRange::kFrames) {
-            layerBegin = writer.sprite()->firstLayer();
-            layerEnd = writer.sprite()->lastLayer();
-          }
+          frame_t frameRange =
+            (site->selectedFrames().lastFrame() -
+             site->selectedFrames().firstFrame() + 1);
 
-          for (LayerIndex layer = layerBegin; layer <= layerEnd; ++layer) {
-            Layer* layerPtr = writer.sprite()->indexToLayer(layer);
-            if (layerPtr->isImage()) {
-              for (frame_t frame = range.frameEnd(); frame >= range.frameBegin(); --frame) {
-                frame_t srcFrame = frame;
-                frame_t dstFrame = frame+range.frames();
+          for (Layer* layer : selLayers) {
+            if (layer->isImage()) {
+              for (frame_t srcFrame : site->selectedFrames().reversed()) {
+                frame_t dstFrame = srcFrame+frameRange;
                 bool continuous;
                 CelData* srcCelData = nullptr;
 
                 if (m_content == Content::DUPLICATE_CELS_BLOCK) {
                   continuous = false;
 
-                  Cel* srcCel = static_cast<LayerImage*>(layerPtr)->cel(srcFrame);
+                  Cel* srcCel = static_cast<LayerImage*>(layer)->cel(srcFrame);
                   if (srcCel) {
                     srcCelData = srcCel->data();
 
@@ -145,19 +148,19 @@ void NewFrameCommand::onExecute(Context* context)
                   }
                 }
                 else
-                  continuous = layerPtr->isContinuous();
+                  continuous = layer->isContinuous();
 
                 api.copyCel(
-                  static_cast<LayerImage*>(layerPtr), srcFrame,
-                  static_cast<LayerImage*>(layerPtr), dstFrame, continuous);
+                  static_cast<LayerImage*>(layer), srcFrame,
+                  static_cast<LayerImage*>(layer), dstFrame, continuous);
 
                 if (srcCelData && !relatedCels[srcCelData])
-                  relatedCels[srcCelData] = layerPtr->cel(dstFrame);
+                  relatedCels[srcCelData] = layer->cel(dstFrame);
               }
             }
           }
 
-          range.displace(0, range.frames());
+          range.displace(0, frameRange);
           timeline->moveRange(range);
         }
         else {

From 5e89ab3148f590dd36321a3d22dd7b79eda51e8e Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 15:00:11 -0300
Subject: [PATCH 37/86] Fix GotoNext/PreviousLayer for groups

---
 src/app/commands/cmd_goto_layer.cpp | 23 ++++++++-----------
 src/doc/cels_range.cpp              | 17 ++------------
 src/doc/cels_range.h                |  2 --
 src/doc/layer.cpp                   | 35 +++++++++++++++++++++++++++++
 src/doc/layer.h                     |  7 ++++--
 5 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/src/app/commands/cmd_goto_layer.cpp b/src/app/commands/cmd_goto_layer.cpp
index 218fe1562..c34b2a5b7 100644
--- a/src/app/commands/cmd_goto_layer.cpp
+++ b/src/app/commands/cmd_goto_layer.cpp
@@ -42,35 +42,30 @@ protected:
   void onExecute(Context* context) override {
     Site site = current_editor->getSite();
 
-    // TODO add support for layer groups
-
     Layer* layer = site.layer();
     if (!layer)
       return;
 
-    const auto& layers = layer->parent()->layers();
-    auto it = std::find(layers.begin(), layers.end(), layer);
-    if (it == layers.end())
-      return;
-
     if (m_offset > 0) {
       int i = m_offset;
       while (i-- > 0) {
-        ++it;
-        if (it == layers.end())
-          it = layers.begin();
+        layer = layer->getNextInWholeHierarchy();
+        if (!layer)
+          layer = site.sprite()->indexToLayer(
+            site.sprite()->firstLayer());
       }
     }
     else if (m_offset < 0) {
       int i = m_offset;
       while (i++ < 0) {
-        if (it == layers.begin())
-          it = layers.end();
-        --it;
+        layer = layer->getPreviousInWholeHierarchy();
+        if (!layer)
+          layer = site.sprite()->indexToLayer(
+            site.sprite()->lastLayer());
       }
     }
 
-    site.layer(*it);
+    site.layer(layer);
 
     // Flash the current layer
     current_editor->setLayer(site.layer());
diff --git a/src/doc/cels_range.cpp b/src/doc/cels_range.cpp
index edb4dd21d..9a8152ad7 100644
--- a/src/doc/cels_range.cpp
+++ b/src/doc/cels_range.cpp
@@ -46,7 +46,7 @@ CelsRange::iterator::iterator(const Sprite* sprite, frame_t first, frame_t last,
     }
 
     if (!m_cel)
-      nextLayer(layer);
+      layer = layer->getNextInWholeHierarchy();
   }
 
   if (m_cel && flags == CelsRange::UNIQUE)
@@ -83,24 +83,11 @@ CelsRange::iterator& CelsRange::iterator::operator++()
     }
 
     if (!m_cel) {
-      nextLayer(layer);
+      layer = layer->getNextInWholeHierarchy();
       first = m_first;
     }
   }
   return *this;
 }
 
-void CelsRange::iterator::nextLayer(Layer*& layer)
-{
-  // Go to children
-  if (layer->isGroup()) {
-    layer = static_cast<LayerGroup*>(layer)->firstLayer();
-  }
-  // Go to next layer in the parent
-  else if (!layer->getNext())
-    layer = layer->parent()->getNext();
-  else
-    layer = layer->getNext();
-}
-
 } // namespace doc
diff --git a/src/doc/cels_range.h b/src/doc/cels_range.h
index d7f4ad299..c12152204 100644
--- a/src/doc/cels_range.h
+++ b/src/doc/cels_range.h
@@ -48,8 +48,6 @@ namespace doc {
       iterator& operator++();
 
     private:
-      void nextLayer(Layer*& layer);
-
       Cel* m_cel;
       frame_t m_first, m_last;
       Flags m_flags;
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index 8bc06bded..cca4ea4d9 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -74,6 +74,41 @@ Layer* Layer::getNext() const
   return nullptr;
 }
 
+Layer* Layer::getPreviousInWholeHierarchy() const
+{
+  // Go to children
+  if (isGroup())
+    return static_cast<const LayerGroup*>(this)->lastLayer();
+
+  // Go to previous layer
+  if (Layer* prev = getPrevious())
+    return prev;
+
+  // Go to previous layer in the parent
+  return parent()->getPrevious();
+}
+
+Layer* Layer::getNextInWholeHierarchy() const
+{
+  // Go to next layer
+  if (Layer* next = getNext()) {
+    // Go to children
+    while (next->isGroup()) {
+      Layer* firstChild = static_cast<const LayerGroup*>(next)->firstLayer();
+      if (!firstChild)
+        break;
+      next = firstChild;
+    }
+    return next;
+  }
+
+  // Go to parent
+  if (m_sprite && parent() != m_sprite->root())
+    return m_parent;
+
+  return nullptr;
+}
+
 Cel* Layer::cel(frame_t frame) const
 {
   return nullptr;
diff --git a/src/doc/layer.h b/src/doc/layer.h
index a6f8df6c3..3449f116d 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -60,6 +60,9 @@ namespace doc {
     Layer* getPrevious() const;
     Layer* getNext() const;
 
+    Layer* getPreviousInWholeHierarchy() const;
+    Layer* getNextInWholeHierarchy() const;
+
     bool isImage() const { return type() == ObjectType::LayerImage; }
     bool isGroup() const { return type() == ObjectType::LayerGroup; }
 
@@ -174,8 +177,8 @@ namespace doc {
     void removeLayer(Layer* layer);
     void stackLayer(Layer* layer, Layer* after);
 
-    Layer* firstLayer() { return (m_layers.empty() ? NULL: m_layers.front()); }
-    Layer* lastLayer() { return (m_layers.empty() ? NULL: m_layers.back()); }
+    Layer* firstLayer() const { return (m_layers.empty() ? nullptr: m_layers.front()); }
+    Layer* lastLayer() const { return (m_layers.empty() ? nullptr: m_layers.back()); }
 
     void getCels(CelList& cels) const override;
     void displaceFrames(frame_t fromThis, frame_t delta) override;

From 81c404312755d6774b3349fe56f66ea6e80fdcf8 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 14 Jun 2016 19:57:07 -0300
Subject: [PATCH 38/86] Fix crash in BrushPreview using the "extra" to patch a
 group layer

---
 src/app/ui/editor/brush_preview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/editor/brush_preview.cpp b/src/app/ui/editor/brush_preview.cpp
index 960c0c750..dc0b2a45a 100644
--- a/src/app/ui/editor/brush_preview.cpp
+++ b/src/app/ui/editor/brush_preview.cpp
@@ -85,7 +85,9 @@ void BrushPreview::show(const gfx::Point& screenPos)
 
   app::Document* document = m_editor->document();
   Sprite* sprite = m_editor->sprite();
-  Layer* layer = m_editor->layer();
+  Layer* layer = (m_editor->layer() &&
+                  m_editor->layer()->isImage() ? m_editor->layer():
+                                                 nullptr);
   ASSERT(sprite);
 
   // Get drawable region

From a2a06965dbe42958d633a06cffc7a562cf47c07c Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 12:00:31 -0300
Subject: [PATCH 39/86] Show disabled eye/padlock in Timeline when parent is
 deactivated

We've added a new "disabled" style state to do this.
---
 data/skins/default/skin.xml     | 12 +++++
 src/app/ui/skin/skin_theme.cpp  |  2 +-
 src/app/ui/skin/style.cpp       | 13 +++--
 src/app/ui/skin/style.h         |  9 +++-
 src/app/ui/skin/style_sheet.cpp |  4 +-
 src/app/ui/skin/style_sheet.h   |  4 +-
 src/app/ui/timeline.cpp         | 89 +++++++++++++++++++++++++--------
 src/app/ui/timeline.h           | 16 ++++--
 src/doc/layer.h                 |  1 +
 9 files changed, 116 insertions(+), 34 deletions(-)

diff --git a/data/skins/default/skin.xml b/data/skins/default/skin.xml
index dfd22cd04..ea08d2bc4 100644
--- a/data/skins/default/skin.xml
+++ b/data/skins/default/skin.xml
@@ -529,12 +529,18 @@
     <style id="timeline_open_eye:active">
       <icon part="timeline_open_eye_active" />
     </style>
+    <style id="timeline_open_eye:disabled">
+      <icon color="disabled" />
+    </style>
     <style id="timeline_closed_eye" base="timeline_box">
       <icon part="timeline_closed_eye_normal" align="center" valign="middle" />
     </style>
     <style id="timeline_closed_eye:active">
       <icon part="timeline_closed_eye_active" />
     </style>
+    <style id="timeline_closed_eye:disabled">
+      <icon color="disabled" />
+    </style>
 
     <!-- timeline_padlock -->
     <style id="timeline_open_padlock" base="timeline_box">
@@ -543,12 +549,18 @@
     <style id="timeline_open_padlock:active">
       <icon part="timeline_open_padlock_active" />
     </style>
+    <style id="timeline_open_padlock:disabled">
+      <icon color="disabled" />
+    </style>
     <style id="timeline_closed_padlock" base="timeline_box">
       <icon part="timeline_closed_padlock_normal" align="center" valign="middle" />
     </style>
     <style id="timeline_closed_padlock:active">
       <icon part="timeline_closed_padlock_active" />
     </style>
+    <style id="timeline_closed_padlock:disabled">
+      <icon color="disabled" />
+    </style>
 
     <!-- timeline_continuous -->
     <style id="timeline_continuous" base="timeline_box">
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 3e1854927..0f6a7f9fa 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -459,10 +459,10 @@ void SkinTheme::loadXml(const std::string& skinId)
         else if (ruleName == "icon") {
           if (align) (*style)[StyleSheet::iconAlignRule()] = css::Value(align);
           if (part_id) (*style)[StyleSheet::iconPartRule()] = css::Value(part_id);
+          if (color_id) (*style)[StyleSheet::iconColorRule()] = value_or_none(color_id);
 
           const char* x = xmlRule->Attribute("x");
           const char* y = xmlRule->Attribute("y");
-
           if (x) (*style)[StyleSheet::iconXRule()] = css::Value(strtol(x, NULL, 10));
           if (y) (*style)[StyleSheet::iconYRule()] = css::Value(strtol(y, NULL, 10));
         }
diff --git a/src/app/ui/skin/style.cpp b/src/app/ui/skin/style.cpp
index 2bbc28ceb..bb5d02269 100644
--- a/src/app/ui/skin/style.cpp
+++ b/src/app/ui/skin/style.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -23,6 +23,7 @@ namespace skin {
 css::State Style::m_hoverState("hover");
 css::State Style::m_activeState("active");
 css::State Style::m_clickedState("clicked");
+css::State Style::m_disabledState("disabled");
 
 Rule::~Rule()
 {
@@ -110,7 +111,10 @@ void IconRule::onPaint(ui::Graphics* g, const gfx::Rect& bounds, const char* tex
   x += m_x;
   y += m_y;
 
-  g->drawRgbaSurface(bmp, x, y);
+  if (m_color == gfx::ColorNone)
+    g->drawRgbaSurface(bmp, x, y);
+  else
+    g->drawColoredRgbaSurface(bmp, m_color, x, y);
 }
 
 Rules::Rules(const css::Query& query) :
@@ -125,6 +129,7 @@ Rules::Rules(const css::Query& query) :
   css::Value iconPart = query[StyleSheet::iconPartRule()];
   css::Value iconX = query[StyleSheet::iconXRule()];
   css::Value iconY = query[StyleSheet::iconYRule()];
+  css::Value iconColor = query[StyleSheet::iconColorRule()];
   css::Value textAlign = query[StyleSheet::textAlignRule()];
   css::Value textColor = query[StyleSheet::textColorRule()];
   css::Value paddingLeft = query[StyleSheet::paddingLeftRule()];
@@ -145,12 +150,14 @@ Rules::Rules(const css::Query& query) :
   if (iconAlign != none
     || iconPart != none
     || iconX != none
-    || iconY != none) {
+    || iconY != none
+    || iconColor != none) {
     m_icon = new IconRule();
     m_icon->setAlign((int)iconAlign.number());
     m_icon->setPart(StyleSheet::convertPart(iconPart));
     m_icon->setX((int)iconX.number()*ui::guiscale());
     m_icon->setY((int)iconY.number()*ui::guiscale());
+    m_icon->setColor(StyleSheet::convertColor(iconColor));
   }
 
   if (textAlign != none
diff --git a/src/app/ui/skin/style.h b/src/app/ui/skin/style.h
index ce677ecbe..af52034ab 100644
--- a/src/app/ui/skin/style.h
+++ b/src/app/ui/skin/style.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -84,12 +84,14 @@ namespace app {
 
     class IconRule : public Rule {
     public:
-      explicit IconRule() : m_align(0) { }
+      explicit IconRule() : m_align(0),
+                            m_color(gfx::ColorNone) { }
 
       void setAlign(int align) { m_align = align; }
       void setPart(const SkinPartPtr& part) { m_part = part; }
       void setX(int x) { m_x = x; }
       void setY(int y) { m_y = y; }
+      void setColor(gfx::Color color) { m_color = color; }
 
       SkinPartPtr getPart() { return m_part; }
 
@@ -100,6 +102,7 @@ namespace app {
       int m_align;
       SkinPartPtr m_part;
       int m_x, m_y;
+      gfx::Color m_color;
     };
 
     class Rules {
@@ -128,6 +131,7 @@ namespace app {
       static const css::State& hover() { return m_hoverState; }
       static const css::State& active() { return m_activeState; }
       static const css::State& clicked() { return m_clickedState; }
+      static const css::State& disabled() { return m_disabledState; }
 
       Style(css::Sheet& sheet, const std::string& id);
       ~Style();
@@ -156,6 +160,7 @@ namespace app {
       static css::State m_hoverState;
       static css::State m_activeState;
       static css::State m_clickedState;
+      static css::State m_disabledState;
     };
 
   } // namespace skin
diff --git a/src/app/ui/skin/style_sheet.cpp b/src/app/ui/skin/style_sheet.cpp
index 63d3c5dcd..c99323f39 100644
--- a/src/app/ui/skin/style_sheet.cpp
+++ b/src/app/ui/skin/style_sheet.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -28,6 +28,7 @@ css::Rule StyleSheet::m_iconAlignRule("icon-align");
 css::Rule StyleSheet::m_iconPartRule("icon-part");
 css::Rule StyleSheet::m_iconXRule("icon-x");
 css::Rule StyleSheet::m_iconYRule("icon-y");
+css::Rule StyleSheet::m_iconColorRule("icon-color");
 css::Rule StyleSheet::m_textAlignRule("text-align");
 css::Rule StyleSheet::m_textColorRule("text-color");
 css::Rule StyleSheet::m_paddingLeftRule("padding-left");
@@ -45,6 +46,7 @@ StyleSheet::StyleSheet()
   m_sheet->addRule(&m_iconPartRule);
   m_sheet->addRule(&m_iconXRule);
   m_sheet->addRule(&m_iconYRule);
+  m_sheet->addRule(&m_iconColorRule);
   m_sheet->addRule(&m_textAlignRule);
   m_sheet->addRule(&m_textColorRule);
   m_sheet->addRule(&m_paddingLeftRule);
diff --git a/src/app/ui/skin/style_sheet.h b/src/app/ui/skin/style_sheet.h
index 01bfc6926..e6cfaa39d 100644
--- a/src/app/ui/skin/style_sheet.h
+++ b/src/app/ui/skin/style_sheet.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -43,6 +43,7 @@ namespace app {
       static css::Rule& iconPartRule() { return m_iconPartRule; }
       static css::Rule& iconXRule() { return m_iconXRule; }
       static css::Rule& iconYRule() { return m_iconYRule; }
+      static css::Rule& iconColorRule() { return m_iconColorRule; }
       static css::Rule& textAlignRule() { return m_textAlignRule; }
       static css::Rule& textColorRule() { return m_textColorRule; }
       static css::Rule& paddingLeftRule() { return m_paddingLeftRule; }
@@ -69,6 +70,7 @@ namespace app {
       static css::Rule m_iconPartRule;
       static css::Rule m_iconXRule;
       static css::Rule m_iconYRule;
+      static css::Rule m_iconColorRule;
       static css::Rule m_textAlignRule;
       static css::Rule m_textColorRule;
       static css::Rule m_paddingLeftRule;
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 7f422c515..f1867baed 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -121,12 +121,27 @@ struct Timeline::DrawCelData {
 namespace {
 
   template<typename Pred>
-  void for_each_expanded_layer(LayerGroup* group, Pred&& pred, int level = 0) {
+  void for_each_expanded_layer(LayerGroup* group,
+                               Pred&& pred,
+                               int level = 0,
+                               LayerFlags flags =
+                                 LayerFlags(int(LayerFlags::Visible) |
+                                            int(LayerFlags::Editable))) {
+    if (!group->isVisible())
+      flags = static_cast<LayerFlags>(int(flags) & ~int(LayerFlags::Visible));
+
+    if (!group->isEditable())
+      flags = static_cast<LayerFlags>(int(flags) & ~int(LayerFlags::Editable));
+
     for (Layer* child : group->layers()) {
       if (child->isGroup() && !child->isCollapsed())
-        for_each_expanded_layer<Pred>(static_cast<LayerGroup*>(child),
-                                      std::forward<Pred>(pred), level+1);
-      pred(child, level);
+        for_each_expanded_layer<Pred>(
+          static_cast<LayerGroup*>(child),
+          std::forward<Pred>(pred),
+          level+1,
+          flags);
+
+      pred(child, level, flags);
     }
   }
 
@@ -592,6 +607,8 @@ bool Timeline::onProcessMessage(Message* msg)
           return true;
         }
 
+        bool regenLayers = false;
+
         switch (m_hot.part) {
 
           case PART_NOTHING:
@@ -602,8 +619,11 @@ bool Timeline::onProcessMessage(Message* msg)
 
           case PART_HEADER_EYE: {
             bool newVisibleState = !allLayersVisible();
-            for (size_t i=0; i<m_layers.size(); i++)
+            for (size_t i=0; i<m_layers.size(); i++) {
               m_layers[i].layer->setVisible(newVisibleState);
+              if (m_layers[i].layer->isGroup())
+                regenLayers = true;
+            }
 
             // Redraw all views.
             m_document->notifyGeneralUpdate();
@@ -612,8 +632,11 @@ bool Timeline::onProcessMessage(Message* msg)
 
           case PART_HEADER_PADLOCK: {
             bool newEditableState = !allLayersUnlocked();
-            for (size_t i=0; i<m_layers.size(); i++)
+            for (size_t i=0; i<m_layers.size(); i++) {
               m_layers[i].layer->setEditable(newEditableState);
+              if (m_layers[i].layer->isGroup())
+                regenLayers = true;
+            }
             break;
           }
 
@@ -680,9 +703,12 @@ bool Timeline::onProcessMessage(Message* msg)
             // Hide/show layer.
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
               Layer* layer = m_layers[m_clk.layer].layer;
-              ASSERT(layer != NULL);
+              ASSERT(layer);
               layer->setVisible(!layer->isVisible());
 
+              if (layer->isGroup())
+                regenLayers = true;
+
               // Redraw all views.
               m_document->notifyGeneralUpdate();
             }
@@ -692,8 +718,10 @@ bool Timeline::onProcessMessage(Message* msg)
             // Lock/unlock layer.
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
               Layer* layer = m_layers[m_clk.layer].layer;
-              ASSERT(layer != NULL);
+              ASSERT(layer);
               layer->setEditable(!layer->isEditable());
+              if (layer->isGroup())
+                regenLayers = true;
             }
             break;
 
@@ -763,6 +791,11 @@ bool Timeline::onProcessMessage(Message* msg)
 
         }
 
+        if (regenLayers) {
+          regenerateLayers();
+          invalidate();
+        }
+
         if (mouseMsg->left() &&
             m_state == STATE_MOVING_RANGE &&
             m_dropRange.type() != Range::kNone) {
@@ -1282,8 +1315,11 @@ void Timeline::getDrawableFrames(ui::Graphics* g, frame_t* first_frame, frame_t*
 }
 
 void Timeline::drawPart(ui::Graphics* g, const gfx::Rect& bounds,
-  const char* text, Style* style,
-  bool is_active, bool is_hover, bool is_clicked)
+                        const char* text, Style* style,
+                        bool is_active,
+                        bool is_hover,
+                        bool is_clicked,
+                        bool is_disabled)
 {
   IntersectClip clip(g, bounds);
   if (!clip)
@@ -1293,6 +1329,7 @@ void Timeline::drawPart(ui::Graphics* g, const gfx::Rect& bounds,
   if (is_active) state += Style::active();
   if (is_hover) state += Style::hover();
   if (is_clicked) state += Style::clicked();
+  if (is_disabled) state += Style::disabled();
 
   style->paint(g, bounds, text, state);
 }
@@ -1391,6 +1428,8 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
   Layer* layer = m_layers[layerIdx].layer;
+  bool parentVisible = ((int(m_layers[layerIdx].inheritedFlags) & int(LayerFlags::Visible)) != 0);
+  bool parentEditable = ((int(m_layers[layerIdx].inheritedFlags) & int(LayerFlags::Editable)) != 0);
   bool is_active = isLayerActive(layerIdx);
   bool hotlayer = (m_hot.layer == layerIdx);
   bool clklayer = (m_clk.layer == layerIdx);
@@ -1401,32 +1440,40 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
 
   // Draw the eye (visible flag).
   bounds = getPartBounds(Hit(PART_LAYER_EYE_ICON, layerIdx));
-  drawPart(g, bounds, NULL,
-    layer->isVisible() ? styles.timelineOpenEye(): styles.timelineClosedEye(),
+  drawPart(
+    g, bounds, nullptr,
+    (layer->isVisible() ? styles.timelineOpenEye():
+                          styles.timelineClosedEye()),
     is_active,
     (hotlayer && m_hot.part == PART_LAYER_EYE_ICON),
-    (clklayer && m_clk.part == PART_LAYER_EYE_ICON));
+    (clklayer && m_clk.part == PART_LAYER_EYE_ICON),
+    !parentVisible);
 
   // Draw the padlock (editable flag).
   bounds = getPartBounds(Hit(PART_LAYER_PADLOCK_ICON, layerIdx));
-  drawPart(g, bounds, NULL,
-    layer->isEditable() ? styles.timelineOpenPadlock(): styles.timelineClosedPadlock(),
+  drawPart(
+    g, bounds, nullptr,
+    (layer->isEditable() ? styles.timelineOpenPadlock():
+                           styles.timelineClosedPadlock()),
     is_active,
     (hotlayer && m_hot.part == PART_LAYER_PADLOCK_ICON),
-    (clklayer && m_clk.part == PART_LAYER_PADLOCK_ICON));
+    (clklayer && m_clk.part == PART_LAYER_PADLOCK_ICON),
+    !parentEditable);
 
   // Draw the continuous flag/group icon.
   bounds = getPartBounds(Hit(PART_LAYER_CONTINUOUS_ICON, layerIdx));
   if (layer->isImage()) {
     drawPart(g, bounds, NULL,
-             layer->isContinuous() ? styles.timelineContinuous(): styles.timelineDiscontinuous(),
+             layer->isContinuous() ? styles.timelineContinuous():
+                                     styles.timelineDiscontinuous(),
              is_active,
              (hotlayer && m_hot.part == PART_LAYER_CONTINUOUS_ICON),
              (clklayer && m_clk.part == PART_LAYER_CONTINUOUS_ICON));
   }
   else if (layer->isGroup()) {
     drawPart(g, bounds, NULL,
-             layer->isCollapsed() ? styles.timelineClosedGroup(): styles.timelineOpenGroup(),
+             layer->isCollapsed() ? styles.timelineClosedGroup():
+                                    styles.timelineOpenGroup(),
              is_active,
              (hotlayer && m_hot.part == PART_LAYER_CONTINUOUS_ICON),
              (clklayer && m_clk.part == PART_LAYER_CONTINUOUS_ICON));
@@ -1963,7 +2010,7 @@ void Timeline::regenerateLayers()
   size_t nlayers = 0;
   for_each_expanded_layer(
     m_sprite->root(),
-    [&nlayers](Layer* layer, int level){
+    [&nlayers](Layer* layer, int level, LayerFlags flags) {
       ++nlayers;
     });
 
@@ -1977,8 +2024,8 @@ void Timeline::regenerateLayers()
   size_t i = 0;
   for_each_expanded_layer(
     m_sprite->root(),
-    [&i, this](Layer* layer, int level){
-      m_layers[i++] = LayerInfo(layer, level);
+    [&i, this](Layer* layer, int level, LayerFlags flags) {
+      m_layers[i++] = LayerInfo(layer, level, flags);
     });
 
   updateScrollBars();
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 2c59f8ce5..35c72c2f1 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -200,8 +200,9 @@ namespace app {
     void getDrawableLayers(ui::Graphics* g, LayerIndex* first_layer, LayerIndex* last_layer);
     void getDrawableFrames(ui::Graphics* g, frame_t* first_frame, frame_t* last_frame);
     void drawPart(ui::Graphics* g, const gfx::Rect& bounds,
-      const char* text, skin::Style* style,
-      bool is_active = false, bool is_hover = false, bool is_clicked = false);
+                  const char* text, skin::Style* style,
+                  bool is_active = false, bool is_hover = false,
+                  bool is_clicked = false, bool is_disabled = false);
     void drawTop(ui::Graphics* g);
     void drawHeader(ui::Graphics* g);
     void drawHeaderFrame(ui::Graphics* g, frame_t frame);
@@ -262,13 +263,18 @@ namespace app {
     struct LayerInfo {
       Layer* layer;
       int level;
+      LayerFlags inheritedFlags;
 
       LayerInfo()
-        : layer(nullptr), level(0) {
+        : layer(nullptr),
+          level(0),
+          inheritedFlags(LayerFlags::None) {
       }
 
-      LayerInfo(Layer* layer, int level)
-        : layer(layer), level(level) {
+      LayerInfo(Layer* layer, int level, LayerFlags inheritedFlags)
+        : layer(layer),
+          level(level),
+          inheritedFlags(inheritedFlags) {
       }
     };
 
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 3449f116d..2ab70f5a8 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -30,6 +30,7 @@ namespace doc {
   // Layer class
 
   enum class LayerFlags {
+    None       = 0,
     Visible    = 1,             // Can be read
     Editable   = 2,             // Can be written
     LockMove   = 4,             // Cannot be moved

From 25da52b3727fabccad0f570953557b1f49ae3727 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 12:08:19 -0300
Subject: [PATCH 40/86] Add LayerInfo::parentVisible/Editable()

---
 src/app/ui/timeline.cpp | 6 ++----
 src/app/ui/timeline.h   | 8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index f1867baed..d6092d1b1 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -1428,8 +1428,6 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
   Layer* layer = m_layers[layerIdx].layer;
-  bool parentVisible = ((int(m_layers[layerIdx].inheritedFlags) & int(LayerFlags::Visible)) != 0);
-  bool parentEditable = ((int(m_layers[layerIdx].inheritedFlags) & int(LayerFlags::Editable)) != 0);
   bool is_active = isLayerActive(layerIdx);
   bool hotlayer = (m_hot.layer == layerIdx);
   bool clklayer = (m_clk.layer == layerIdx);
@@ -1447,7 +1445,7 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
     is_active,
     (hotlayer && m_hot.part == PART_LAYER_EYE_ICON),
     (clklayer && m_clk.part == PART_LAYER_EYE_ICON),
-    !parentVisible);
+    !m_layers[layerIdx].parentVisible());
 
   // Draw the padlock (editable flag).
   bounds = getPartBounds(Hit(PART_LAYER_PADLOCK_ICON, layerIdx));
@@ -1458,7 +1456,7 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
     is_active,
     (hotlayer && m_hot.part == PART_LAYER_PADLOCK_ICON),
     (clklayer && m_clk.part == PART_LAYER_PADLOCK_ICON),
-    !parentEditable);
+    !m_layers[layerIdx].parentEditable());
 
   // Draw the continuous flag/group icon.
   bounds = getPartBounds(Hit(PART_LAYER_CONTINUOUS_ICON, layerIdx));
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 35c72c2f1..0fbb8dcd7 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -276,6 +276,14 @@ namespace app {
           level(level),
           inheritedFlags(inheritedFlags) {
       }
+
+      bool parentVisible() const {
+        return ((int(inheritedFlags) & int(LayerFlags::Visible)) != 0);
+      }
+
+      bool parentEditable() const {
+        return ((int(inheritedFlags) & int(LayerFlags::Editable)) != 0);
+      }
     };
 
     ui::ScrollBar m_hbar;

From b65bd4cd552b7614dee531b295758c7cda893877 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 12:16:23 -0300
Subject: [PATCH 41/86] Timeline: Add support to show/unlock children in a
 hidden/locked group

---
 src/app/ui/timeline.cpp | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index d6092d1b1..e224e3831 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -702,13 +702,27 @@ bool Timeline::onProcessMessage(Message* msg)
           case PART_LAYER_EYE_ICON:
             // Hide/show layer.
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
-              Layer* layer = m_layers[m_clk.layer].layer;
+              LayerInfo& info = m_layers[m_clk.layer];
+              Layer* layer = info.layer;
               ASSERT(layer);
-              layer->setVisible(!layer->isVisible());
 
-              if (layer->isGroup())
+              // Show parents
+              if (!info.parentVisible()) {
                 regenLayers = true;
 
+                layer = layer->parent();
+                while (layer) {
+                  if (!layer->isVisible())
+                    layer->setVisible(true);
+                  layer = layer->parent();
+                }
+              }
+              else {
+                layer->setVisible(!layer->isVisible());
+                if (layer->isGroup())
+                  regenLayers = true;
+              }
+
               // Redraw all views.
               m_document->notifyGeneralUpdate();
             }
@@ -717,11 +731,26 @@ bool Timeline::onProcessMessage(Message* msg)
           case PART_LAYER_PADLOCK_ICON:
             // Lock/unlock layer.
             if (m_hot.layer == m_clk.layer && validLayer(m_hot.layer)) {
-              Layer* layer = m_layers[m_clk.layer].layer;
+              LayerInfo& info = m_layers[m_clk.layer];
+              Layer* layer = info.layer;
               ASSERT(layer);
-              layer->setEditable(!layer->isEditable());
-              if (layer->isGroup())
+
+              // Unlock parents
+              if (!info.parentEditable()) {
                 regenLayers = true;
+
+                layer = layer->parent();
+                while (layer) {
+                  if (!layer->isEditable())
+                    layer->setEditable(true);
+                  layer = layer->parent();
+                }
+              }
+              else {
+                layer->setEditable(!layer->isEditable());
+                if (layer->isGroup())
+                  regenLayers = true;
+              }
             }
             break;
 

From 7a19167d6164951e23b34319158c1df8a149e2a1 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 12:29:10 -0300
Subject: [PATCH 42/86] Fix click behavior in PART_HEADER_EYE/PADLOCK in
 Timeline

We have to switch the visible/editable status only in the top level of
layers.
---
 src/app/ui/timeline.cpp | 44 ++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index e224e3831..64fec6511 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -618,11 +618,17 @@ bool Timeline::onProcessMessage(Message* msg)
             break;
 
           case PART_HEADER_EYE: {
+            ASSERT(m_sprite);
+            if (!m_sprite)
+              break;
+
             bool newVisibleState = !allLayersVisible();
-            for (size_t i=0; i<m_layers.size(); i++) {
-              m_layers[i].layer->setVisible(newVisibleState);
-              if (m_layers[i].layer->isGroup())
-                regenLayers = true;
+            for (Layer* topLayer : m_sprite->root()->layers()) {
+              if (topLayer->isVisible() != newVisibleState) {
+                topLayer->setVisible(newVisibleState);
+                if (topLayer->isGroup())
+                  regenLayers = true;
+              }
             }
 
             // Redraw all views.
@@ -631,11 +637,17 @@ bool Timeline::onProcessMessage(Message* msg)
           }
 
           case PART_HEADER_PADLOCK: {
+            ASSERT(m_sprite);
+            if (!m_sprite)
+              break;
+
             bool newEditableState = !allLayersUnlocked();
-            for (size_t i=0; i<m_layers.size(); i++) {
-              m_layers[i].layer->setEditable(newEditableState);
-              if (m_layers[i].layer->isGroup())
-                regenLayers = true;
+            for (Layer* topLayer : m_sprite->root()->layers()) {
+              if (topLayer->isEditable() != newEditableState) {
+                topLayer->setEditable(newEditableState);
+                if (topLayer->isGroup())
+                  regenLayers = true;
+              }
             }
             break;
           }
@@ -2462,8 +2474,8 @@ gfx::Point Timeline::getMaxScrollablePos() const
 
 bool Timeline::allLayersVisible()
 {
-  for (size_t i=0; i<m_layers.size(); i++)
-    if (!m_layers[i].layer->isVisible())
+  for (Layer* topLayer : m_sprite->root()->layers())
+    if (!topLayer->isVisible())
       return false;
 
   return true;
@@ -2471,8 +2483,8 @@ bool Timeline::allLayersVisible()
 
 bool Timeline::allLayersInvisible()
 {
-  for (size_t i=0; i<m_layers.size(); i++)
-    if (m_layers[i].layer->isVisible())
+  for (Layer* topLayer : m_sprite->root()->layers())
+    if (topLayer->isVisible())
       return false;
 
   return true;
@@ -2480,8 +2492,8 @@ bool Timeline::allLayersInvisible()
 
 bool Timeline::allLayersLocked()
 {
-  for (size_t i=0; i<m_layers.size(); i++)
-    if (m_layers[i].layer->isEditable())
+  for (Layer* topLayer : m_sprite->root()->layers())
+    if (topLayer->isEditable())
       return false;
 
   return true;
@@ -2489,8 +2501,8 @@ bool Timeline::allLayersLocked()
 
 bool Timeline::allLayersUnlocked()
 {
-  for (size_t i=0; i<m_layers.size(); i++)
-    if (!m_layers[i].layer->isEditable())
+  for (Layer* topLayer : m_sprite->root()->layers())
+    if (!topLayer->isEditable())
       return false;
 
   return true;

From e0b2893661c33de9dd244ba24b320af13efedaa1 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 12:36:49 -0300
Subject: [PATCH 43/86] Make visible/editable when we click in a disable child

---
 src/app/ui/timeline.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 64fec6511..370167742 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -722,6 +722,7 @@ bool Timeline::onProcessMessage(Message* msg)
               if (!info.parentVisible()) {
                 regenLayers = true;
 
+                layer->setVisible(true);
                 layer = layer->parent();
                 while (layer) {
                   if (!layer->isVisible())
@@ -751,6 +752,7 @@ bool Timeline::onProcessMessage(Message* msg)
               if (!info.parentEditable()) {
                 regenLayers = true;
 
+                layer->setEditable(true);
                 layer = layer->parent();
                 while (layer) {
                   if (!layer->isEditable())

From 32faa3335331d68ec5e1b842e09f9ff75e924c8d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 12:37:59 -0300
Subject: [PATCH 44/86] No need to regenerate layers if a group is collapsed

---
 src/app/ui/timeline.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 370167742..0e32fa5ae 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -732,7 +732,7 @@ bool Timeline::onProcessMessage(Message* msg)
               }
               else {
                 layer->setVisible(!layer->isVisible());
-                if (layer->isGroup())
+                if (layer->isGroup() && layer->isExpanded())
                   regenLayers = true;
               }
 
@@ -762,7 +762,7 @@ bool Timeline::onProcessMessage(Message* msg)
               }
               else {
                 layer->setEditable(!layer->isEditable());
-                if (layer->isGroup())
+                if (layer->isGroup() && layer->isExpanded())
                   regenLayers = true;
               }
             }

From ac20d1edfc322dd8737eb5f2f98f16f4ec8271a6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 15:27:38 -0300
Subject: [PATCH 45/86] Fix some commands/editor states to check parent group
 editable/visible state too

---
 src/app/commands/cmd_clear_cel.cpp   | 15 ++++++++-------
 src/app/commands/cmd_link_cels.cpp   |  3 +--
 src/app/commands/cmd_unlink_cel.cpp  | 15 ++++++++-------
 src/app/context_flags.cpp            |  6 +++---
 src/app/ui/editor/editor.cpp         |  4 ++--
 src/app/ui/editor/standby_state.cpp  |  8 ++++----
 src/app/ui/editor/tool_loop_impl.cpp |  8 ++++----
 src/doc/layer.cpp                    | 22 ++++++++++++++++++++++
 src/doc/layer.h                      |  3 +++
 9 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/src/app/commands/cmd_clear_cel.cpp b/src/app/commands/cmd_clear_cel.cpp
index cd46df728..f58e532cb 100644
--- a/src/app/commands/cmd_clear_cel.cpp
+++ b/src/app/commands/cmd_clear_cel.cpp
@@ -60,20 +60,21 @@ void ClearCelCommand::onExecute(Context* context)
         if (!layer->isImage())
           continue;
 
+        if (!layer->isEditableHierarchy()) {
+          nonEditableLayers = true;
+          continue;
+        }
+
         LayerImage* layerImage = static_cast<LayerImage*>(layer);
 
         for (frame_t frame : site->selectedFrames().reversed()) {
-          if (layerImage->cel(frame)) {
-            if (layerImage->isEditable())
-              document->getApi(transaction).clearCel(layerImage, frame);
-            else
-              nonEditableLayers = true;
-          }
+          if (layerImage->cel(frame))
+            document->getApi(transaction).clearCel(layerImage, frame);
         }
       }
     }
     else if (writer.cel()) {
-      if (writer.layer()->isEditable())
+      if (writer.layer()->isEditableHierarchy())
         document->getApi(transaction).clearCel(writer.cel());
       else
         nonEditableLayers = true;
diff --git a/src/app/commands/cmd_link_cels.cpp b/src/app/commands/cmd_link_cels.cpp
index d4b9b7905..ebf2709a1 100644
--- a/src/app/commands/cmd_link_cels.cpp
+++ b/src/app/commands/cmd_link_cels.cpp
@@ -61,13 +61,12 @@ void LinkCelsCommand::onExecute(Context* context)
       return;
 
     Transaction transaction(writer.context(), friendlyName());
-    Sprite* sprite = writer.sprite();
 
     for (Layer* layer : site.selectedLayers()) {
       if (!layer->isImage())
         continue;
 
-      if (!layer->isEditable()) {
+      if (!layer->isEditableHierarchy()) {
         nonEditableLayers = true;
         continue;
       }
diff --git a/src/app/commands/cmd_unlink_cel.cpp b/src/app/commands/cmd_unlink_cel.cpp
index 5a126bee8..ea6b981a0 100644
--- a/src/app/commands/cmd_unlink_cel.cpp
+++ b/src/app/commands/cmd_unlink_cel.cpp
@@ -59,23 +59,24 @@ void UnlinkCelCommand::onExecute(Context* context)
         if (!layer->isImage())
           continue;
 
+        if (!layer->isEditableHierarchy()) {
+          nonEditableLayers = true;
+          continue;
+        }
+
         LayerImage* layerImage = static_cast<LayerImage*>(layer);
 
         for (frame_t frame : site->selectedFrames().reversed()) {
           Cel* cel = layerImage->cel(frame);
-          if (cel && cel->links()) {
-            if (layerImage->isEditable())
-              transaction.execute(new cmd::UnlinkCel(cel));
-            else
-              nonEditableLayers = true;
-          }
+          if (cel && cel->links())
+            transaction.execute(new cmd::UnlinkCel(cel));
         }
       }
     }
     else {
       Cel* cel = writer.cel();
       if (cel && cel->links()) {
-        if (cel->layer()->isEditable())
+        if (cel->layer()->isEditableHierarchy())
           transaction.execute(new cmd::UnlinkCel(writer.cel()));
         else
           nonEditableLayers = true;
diff --git a/src/app/context_flags.cpp b/src/app/context_flags.cpp
index 36acd9c9d..8f5f65ece 100644
--- a/src/app/context_flags.cpp
+++ b/src/app/context_flags.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -88,10 +88,10 @@ void ContextFlags::updateFlagsFromSite(const Site& site)
   if (layer->isBackground())
     m_flags |= ActiveLayerIsBackground;
 
-  if (layer->isVisible())
+  if (layer->isVisibleHierarchy())
     m_flags |= ActiveLayerIsVisible;
 
-  if (layer->isEditable())
+  if (layer->isEditableHierarchy())
     m_flags |= ActiveLayerIsEditable;
 
   if (layer->isImage()) {
diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index e07a773fb..59e12be37 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -1442,8 +1442,8 @@ bool Editor::canDraw()
 {
   return (m_layer != NULL &&
           m_layer->isImage() &&
-          m_layer->isVisible() &&
-          m_layer->isEditable());
+          m_layer->isVisibleHierarchy() &&
+          m_layer->isEditableHierarchy());
 }
 
 bool Editor::isInsideSelection()
diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index 951c3d1b2..16d103600 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -209,11 +209,11 @@ bool StandbyState::onMouseDown(Editor* editor, MouseMessage* msg)
         StatusBar::instance()->showTip(1000,
           "The background layer cannot be moved");
       }
-      else if (!layer->isVisible()) {
+      else if (!layer->isVisibleHierarchy()) {
         StatusBar::instance()->showTip(1000,
           "Layer '%s' is hidden", layer->name().c_str());
       }
-      else if (!layer->isMovable() || !layer->isEditable()) {
+      else if (!layer->isMovable() || !layer->isEditableHierarchy()) {
         StatusBar::instance()->showTip(1000,
           "Layer '%s' is locked", layer->name().c_str());
       }
@@ -253,7 +253,7 @@ bool StandbyState::onMouseDown(Editor* editor, MouseMessage* msg)
         int x, y, opacity;
         Image* image = site.image(&x, &y, &opacity);
         if (layer && image) {
-          if (!layer->isEditable()) {
+          if (!layer->isEditableHierarchy()) {
             StatusBar::instance()->showTip(1000,
               "Layer '%s' is locked", layer->name().c_str());
             return true;
@@ -268,7 +268,7 @@ bool StandbyState::onMouseDown(Editor* editor, MouseMessage* msg)
 
     // Move selected pixels
     if (layer && editor->isInsideSelection() && msg->left()) {
-      if (!layer->isEditable()) {
+      if (!layer->isEditableHierarchy()) {
         StatusBar::instance()->showTip(1000,
           "Layer '%s' is locked", layer->name().c_str());
         return true;
diff --git a/src/app/ui/editor/tool_loop_impl.cpp b/src/app/ui/editor/tool_loop_impl.cpp
index b637bb37f..cf26c2bfe 100644
--- a/src/app/ui/editor/tool_loop_impl.cpp
+++ b/src/app/ui/editor/tool_loop_impl.cpp
@@ -497,13 +497,13 @@ tools::ToolLoop* create_tool_loop(Editor* editor, Context* context)
         1000, "There is no active layer");
       return nullptr;
     }
-    else if (!layer->isVisible()) {
+    else if (!layer->isVisibleHierarchy()) {
       StatusBar::instance()->showTip(
         1000, "Layer '%s' is hidden", layer->name().c_str());
       return nullptr;
     }
     // If the active layer is read-only.
-    else if (!layer->isEditable()) {
+    else if (!layer->isEditableHierarchy()) {
       StatusBar::instance()->showTip(
         1000, "Layer '%s' is locked", layer->name().c_str());
       return nullptr;
@@ -615,8 +615,8 @@ tools::ToolLoop* create_tool_loop_preview(
 
   Layer* layer = editor->layer();
   if (!layer ||
-      !layer->isVisible() ||
-      !layer->isEditable()) {
+      !layer->isVisibleHierarchy() ||
+      !layer->isEditableHierarchy()) {
     return nullptr;
   }
 
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index cca4ea4d9..368e37b4f 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -109,6 +109,28 @@ Layer* Layer::getNextInWholeHierarchy() const
   return nullptr;
 }
 
+bool Layer::isVisibleHierarchy() const
+{
+  const Layer* layer = this;
+  while (layer) {
+    if (!layer->isVisible())
+      return false;
+    layer = layer->parent();
+  }
+  return true;
+}
+
+bool Layer::isEditableHierarchy() const
+{
+  const Layer* layer = this;
+  while (layer) {
+    if (!layer->isEditable())
+      return false;
+    layer = layer->parent();
+  }
+  return true;
+}
+
 Cel* Layer::cel(frame_t frame) const
 {
   return nullptr;
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 2ab70f5a8..370dbfbf3 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -76,6 +76,9 @@ namespace doc {
     bool isCollapsed() const   { return hasFlags(LayerFlags::Collapsed); }
     bool isExpanded() const    { return !hasFlags(LayerFlags::Collapsed); }
 
+    bool isVisibleHierarchy() const;
+    bool isEditableHierarchy() const;
+
     void setBackground(bool state) { switchFlags(LayerFlags::Background, state); }
     void setVisible   (bool state) { switchFlags(LayerFlags::Visible, state); }
     void setEditable  (bool state) { switchFlags(LayerFlags::Editable, state); }

From ebb6825b87e19f3955860d03853b56b180cf5bf9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 15:49:39 -0300
Subject: [PATCH 46/86] Don't enter in collapsed groups with GotoNext/PrevLayer

---
 src/doc/layer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index 368e37b4f..a755ca7f1 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -77,7 +77,7 @@ Layer* Layer::getNext() const
 Layer* Layer::getPreviousInWholeHierarchy() const
 {
   // Go to children
-  if (isGroup())
+  if (isGroup() && isExpanded())
     return static_cast<const LayerGroup*>(this)->lastLayer();
 
   // Go to previous layer
@@ -93,7 +93,7 @@ Layer* Layer::getNextInWholeHierarchy() const
   // Go to next layer
   if (Layer* next = getNext()) {
     // Go to children
-    while (next->isGroup()) {
+    while (next->isGroup() && next->isExpanded()) {
       Layer* firstChild = static_cast<const LayerGroup*>(next)->firstLayer();
       if (!firstChild)
         break;

From 1b5bfe0ae084d9adfa3db085411efccebe928baa Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 16:13:12 -0300
Subject: [PATCH 47/86] Fix crash editing a LayerGroup properties

---
 src/app/commands/cmd_layer_properties.cpp | 45 ++++++++++++++---------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/app/commands/cmd_layer_properties.cpp b/src/app/commands/cmd_layer_properties.cpp
index 34817356d..fdbc4838d 100644
--- a/src/app/commands/cmd_layer_properties.cpp
+++ b/src/app/commands/cmd_layer_properties.cpp
@@ -96,14 +96,14 @@ public:
     UIContext::instance()->removeObserver(this);
   }
 
-  void setLayer(LayerImage* layer) {
+  void setLayer(Layer* layer) {
     if (m_layer) {
       document()->removeObserver(this);
       m_layer = nullptr;
     }
 
     m_timer.stop();
-    m_layer = const_cast<LayerImage*>(layer);
+    m_layer = layer;
 
     if (m_layer)
       document()->addObserver(this);
@@ -178,9 +178,10 @@ private:
     BlendMode newBlendMode = blendModeValue();
 
     if (newName != m_layer->name() ||
-        newOpacity != m_layer->opacity() ||
-        newBlendMode != m_layer->blendMode() ||
-        m_userData != m_layer->userData()) {
+        m_userData != m_layer->userData() ||
+        (m_layer->isImage() &&
+         (newOpacity != static_cast<LayerImage*>(m_layer)->opacity() ||
+          newBlendMode != static_cast<LayerImage*>(m_layer)->blendMode()))) {
       try {
         ContextWriter writer(UIContext::instance());
         Transaction transaction(writer.context(), "Set Layer Properties");
@@ -188,15 +189,17 @@ private:
         if (newName != m_layer->name())
           transaction.execute(new cmd::SetLayerName(writer.layer(), newName));
 
-        if (newOpacity != m_layer->opacity())
-          transaction.execute(new cmd::SetLayerOpacity(static_cast<LayerImage*>(writer.layer()), newOpacity));
-
-        if (newBlendMode != m_layer->blendMode())
-          transaction.execute(new cmd::SetLayerBlendMode(static_cast<LayerImage*>(writer.layer()), newBlendMode));
-
         if (m_userData != m_layer->userData()) {
           transaction.execute(new cmd::SetUserData(writer.layer(), m_userData));
 
+        if (m_layer->isImage()) {
+          if (newOpacity != static_cast<LayerImage*>(m_layer)->opacity())
+            transaction.execute(new cmd::SetLayerOpacity(static_cast<LayerImage*>(writer.layer()), newOpacity));
+
+          if (newBlendMode != static_cast<LayerImage*>(m_layer)->blendMode())
+            transaction.execute(new cmd::SetLayerBlendMode(static_cast<LayerImage*>(writer.layer()), newBlendMode));
+        }
+
           // Redraw timeline because the layer's user data/color
           // might have changed.
           App::instance()->timeline()->invalidate();
@@ -215,7 +218,7 @@ private:
   // ContextObserver impl
   void onActiveSiteChange(const Site& site) override {
     if (isVisible())
-      setLayer(dynamic_cast<LayerImage*>(const_cast<Layer*>(site.layer())));
+      setLayer(const_cast<Layer*>(site.layer()));
     else if (m_layer)
       setLayer(nullptr);
   }
@@ -256,10 +259,18 @@ private:
     if (m_layer) {
       name()->setText(m_layer->name().c_str());
       name()->setEnabled(true);
-      mode()->setSelectedItemIndex((int)m_layer->blendMode());
-      mode()->setEnabled(!m_layer->isBackground());
-      opacity()->setValue(m_layer->opacity());
-      opacity()->setEnabled(!m_layer->isBackground());
+
+      if (m_layer->isImage()) {
+        mode()->setSelectedItemIndex((int)static_cast<LayerImage*>(m_layer)->blendMode());
+        mode()->setEnabled(!m_layer->isBackground());
+        opacity()->setValue(static_cast<LayerImage*>(m_layer)->opacity());
+        opacity()->setEnabled(!m_layer->isBackground());
+      }
+      else {
+        mode()->setEnabled(false);
+        opacity()->setEnabled(false);
+      }
+
       m_userData = m_layer->userData();
     }
     else {
@@ -272,7 +283,7 @@ private:
   }
 
   Timer m_timer;
-  LayerImage* m_layer;
+  Layer* m_layer;
   bool m_selfUpdate;
   UserData m_userData;
 };

From 6a66e660a76f4a6fdaf18b7cfde8ad380a56d66c Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 15 Jun 2016 16:33:39 -0300
Subject: [PATCH 48/86] Update doc library copyright year

---
 src/doc/LICENSE.txt | 2 +-
 src/doc/README.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/doc/LICENSE.txt b/src/doc/LICENSE.txt
index 7ed8f201a..0d2d81fd4 100644
--- a/src/doc/LICENSE.txt
+++ b/src/doc/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2015 David Capello
+Copyright (c) 2001-2016 David Capello
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/src/doc/README.md b/src/doc/README.md
index e32066553..6c5409397 100644
--- a/src/doc/README.md
+++ b/src/doc/README.md
@@ -1,4 +1,4 @@
 # Aseprite Document Library
-*Copyright (C) 2001-2015 David Capello*
+*Copyright (C) 2001-2016 David Capello*
 
 > Distributed under [MIT license](LICENSE.txt)

From 139b8f6d7486eddffe40920249b0f3ac495b2b27 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 20 Jun 2016 21:15:35 -0300
Subject: [PATCH 49/86] Fix goto next/previous layer for multiple group levels

---
 src/app/commands/cmd_goto_layer.cpp | 11 ++++++-----
 src/doc/layer.cpp                   | 13 +++++++++----
 src/doc/layer.h                     |  5 +++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/app/commands/cmd_goto_layer.cpp b/src/app/commands/cmd_goto_layer.cpp
index c34b2a5b7..47b1057e0 100644
--- a/src/app/commands/cmd_goto_layer.cpp
+++ b/src/app/commands/cmd_goto_layer.cpp
@@ -50,9 +50,11 @@ protected:
       int i = m_offset;
       while (i-- > 0) {
         layer = layer->getNextInWholeHierarchy();
-        if (!layer)
-          layer = site.sprite()->indexToLayer(
-            site.sprite()->firstLayer());
+        if (!layer) {
+          layer = site.sprite()->root()->firstLayer();
+          while (layer->isBrowsable())
+            layer = static_cast<LayerGroup*>(layer)->firstLayer();
+        }
       }
     }
     else if (m_offset < 0) {
@@ -60,8 +62,7 @@ protected:
       while (i++ < 0) {
         layer = layer->getPreviousInWholeHierarchy();
         if (!layer)
-          layer = site.sprite()->indexToLayer(
-            site.sprite()->lastLayer());
+          layer = site.sprite()->root()->lastLayer();
       }
     }
 
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index a755ca7f1..767a49d8c 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -77,7 +77,7 @@ Layer* Layer::getNext() const
 Layer* Layer::getPreviousInWholeHierarchy() const
 {
   // Go to children
-  if (isGroup() && isExpanded())
+  if (isBrowsable())
     return static_cast<const LayerGroup*>(this)->lastLayer();
 
   // Go to previous layer
@@ -85,7 +85,12 @@ Layer* Layer::getPreviousInWholeHierarchy() const
     return prev;
 
   // Go to previous layer in the parent
-  return parent()->getPrevious();
+  LayerGroup* parent = this->parent();
+  while (parent != sprite()->root() &&
+         !parent->getPrevious()) {
+    parent = parent->parent();
+  }
+  return parent->getPrevious();
 }
 
 Layer* Layer::getNextInWholeHierarchy() const
@@ -93,7 +98,7 @@ Layer* Layer::getNextInWholeHierarchy() const
   // Go to next layer
   if (Layer* next = getNext()) {
     // Go to children
-    while (next->isGroup() && next->isExpanded()) {
+    while (next->isBrowsable()) {
       Layer* firstChild = static_cast<const LayerGroup*>(next)->firstLayer();
       if (!firstChild)
         break;
@@ -370,7 +375,7 @@ void LayerGroup::removeLayer(Layer* layer)
   ASSERT(it != m_layers.end());
   m_layers.erase(it);
 
-  layer->setParent(NULL);
+  layer->setParent(nullptr);
 }
 
 void LayerGroup::stackLayer(Layer* layer, Layer* after)
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 370dbfbf3..62f659176 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -66,6 +66,7 @@ namespace doc {
 
     bool isImage() const { return type() == ObjectType::LayerImage; }
     bool isGroup() const { return type() == ObjectType::LayerGroup; }
+    virtual bool isBrowsable() const { return false; }
 
     bool isBackground() const  { return hasFlags(LayerFlags::Background); }
     bool isTransparent() const { return !hasFlags(LayerFlags::Background); }
@@ -187,6 +188,10 @@ namespace doc {
     void getCels(CelList& cels) const override;
     void displaceFrames(frame_t fromThis, frame_t delta) override;
 
+    bool isBrowsable() const override {
+      return isGroup() && isExpanded() && !m_layers.empty();
+    }
+
   private:
     void destroyAllLayers();
 

From 0f77bf0712a22bc1e8f1dd73bdad504b4829f7c0 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 21 Jun 2016 00:02:13 -0300
Subject: [PATCH 50/86] Move selected layers into the new group

If the Timeline has an active selected range of layers and the user
creates a new layer group, the selected layers will be be grouped as
children of the new layer 'group'.
---
 src/app/cmd/add_layer.cpp            |  3 +-
 src/app/cmd/configure_background.cpp |  5 ++--
 src/app/cmd/move_layer.cpp           | 44 +++++++++++++++++++++-------
 src/app/cmd/move_layer.h             | 10 ++++---
 src/app/commands/cmd_goto_layer.cpp  |  7 ++---
 src/app/commands/cmd_new_layer.cpp   | 28 +++++++++++++++++-
 src/app/document_api.cpp             |  2 +-
 src/doc/layer.cpp                    | 22 ++++++++------
 src/doc/layer.h                      |  1 +
 src/doc/selected_layers.cpp          | 19 ++++++++++++
 src/doc/selected_layers.h            |  2 ++
 src/doc/sprite.cpp                   |  8 +++++
 src/doc/sprite.h                     |  1 +
 13 files changed, 117 insertions(+), 35 deletions(-)

diff --git a/src/app/cmd/add_layer.cpp b/src/app/cmd/add_layer.cpp
index 5b5fd51ba..cd512b808 100644
--- a/src/app/cmd/add_layer.cpp
+++ b/src/app/cmd/add_layer.cpp
@@ -66,8 +66,7 @@ void AddLayer::onRedo()
 
 void AddLayer::addLayer(Layer* group, Layer* newLayer, Layer* afterThis)
 {
-  static_cast<LayerGroup*>(group)->addLayer(newLayer);
-  static_cast<LayerGroup*>(group)->stackLayer(newLayer, afterThis);
+  static_cast<LayerGroup*>(group)->insertLayer(newLayer, afterThis);
   group->incrementVersion();
 
   Document* doc = group->sprite()->document();
diff --git a/src/app/cmd/configure_background.cpp b/src/app/cmd/configure_background.cpp
index 4f835d471..190fa1c06 100644
--- a/src/app/cmd/configure_background.cpp
+++ b/src/app/cmd/configure_background.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -15,6 +15,7 @@
 #include "app/cmd/set_layer_flags.h"
 #include "app/cmd/set_layer_name.h"
 #include "app/cmd/set_layer_opacity.h"
+#include "doc/sprite.h"
 
 namespace app {
 namespace cmd {
@@ -33,7 +34,7 @@ ConfigureBackground::ConfigureBackground(Layer* layer)
     add(new cmd::SetLayerOpacity(static_cast<LayerImage*>(layer), 255));
   }
 
-  add(new cmd::MoveLayer(layer, nullptr));
+  add(new cmd::MoveLayer(layer, layer->sprite()->root(), nullptr));
 }
 
 } // namespace cmd
diff --git a/src/app/cmd/move_layer.cpp b/src/app/cmd/move_layer.cpp
index e0f62fd32..820bc4117 100644
--- a/src/app/cmd/move_layer.cpp
+++ b/src/app/cmd/move_layer.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -21,29 +21,51 @@ namespace cmd {
 
 using namespace doc;
 
-MoveLayer::MoveLayer(Layer* layer, Layer* afterThis)
+MoveLayer::MoveLayer(Layer* layer,
+                     Layer* newParent,
+                     Layer* afterThis)
   : m_layer(layer)
+  , m_oldParent(layer->parent())
   , m_oldAfterThis(layer->getPrevious())
-  , m_newAfterThis(afterThis)
+  , m_newParent(newParent)
+  , m_newAfterThis(afterThis == layer ? afterThis->getPrevious(): afterThis)
 {
 }
 
 void MoveLayer::onExecute()
 {
-  m_layer.layer()->parent()->stackLayer(
-    m_layer.layer(),
-    m_newAfterThis.layer());
+  Layer* layer = m_layer.layer();
+  Layer* afterThis = m_newAfterThis.layer();
+  LayerGroup* oldParent = static_cast<LayerGroup*>(m_oldParent.layer());
+  LayerGroup* newParent = static_cast<LayerGroup*>(m_newParent.layer());
+  ASSERT(layer);
+  ASSERT(oldParent);
+  ASSERT(newParent);
 
-  m_layer.layer()->parent()->incrementVersion();
+  oldParent->removeLayer(layer);
+  newParent->insertLayer(layer, afterThis);
+
+  if (oldParent != newParent)
+    oldParent->incrementVersion();
+  newParent->incrementVersion();
 }
 
 void MoveLayer::onUndo()
 {
-  m_layer.layer()->parent()->stackLayer(
-    m_layer.layer(),
-    m_oldAfterThis.layer());
+  Layer* layer = m_layer.layer();
+  Layer* afterThis = m_oldAfterThis.layer();
+  LayerGroup* oldParent = static_cast<LayerGroup*>(m_oldParent.layer());
+  LayerGroup* newParent = static_cast<LayerGroup*>(m_newParent.layer());
+  ASSERT(layer);
+  ASSERT(oldParent);
+  ASSERT(newParent);
 
-  m_layer.layer()->parent()->incrementVersion();
+  newParent->removeLayer(layer);
+  oldParent->insertLayer(layer, afterThis);
+
+  if (oldParent != newParent)
+    oldParent->incrementVersion();
+  newParent->incrementVersion();
 }
 
 void MoveLayer::onFireNotifications()
diff --git a/src/app/cmd/move_layer.h b/src/app/cmd/move_layer.h
index 6f73fc903..716828ad6 100644
--- a/src/app/cmd/move_layer.h
+++ b/src/app/cmd/move_layer.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -18,7 +18,9 @@ namespace cmd {
 
   class MoveLayer : public Cmd {
   public:
-    MoveLayer(Layer* layer, Layer* afterThis);
+    MoveLayer(Layer* layer,
+              Layer* newParent,
+              Layer* afterThis);
 
   protected:
     void onExecute() override;
@@ -30,8 +32,8 @@ namespace cmd {
 
   private:
     WithLayer m_layer;
-    WithLayer m_oldAfterThis;
-    WithLayer m_newAfterThis;
+    WithLayer m_oldParent, m_oldAfterThis;
+    WithLayer m_newParent, m_newAfterThis;
   };
 
 } // namespace cmd
diff --git a/src/app/commands/cmd_goto_layer.cpp b/src/app/commands/cmd_goto_layer.cpp
index 47b1057e0..2ec052698 100644
--- a/src/app/commands/cmd_goto_layer.cpp
+++ b/src/app/commands/cmd_goto_layer.cpp
@@ -50,11 +50,8 @@ protected:
       int i = m_offset;
       while (i-- > 0) {
         layer = layer->getNextInWholeHierarchy();
-        if (!layer) {
-          layer = site.sprite()->root()->firstLayer();
-          while (layer->isBrowsable())
-            layer = static_cast<LayerGroup*>(layer)->firstLayer();
-        }
+        if (!layer)
+          layer = site.sprite()->firstBrowsableLayer();
       }
     }
     else if (m_offset < 0) {
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 8896e8963..7136370ba 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -10,6 +10,7 @@
 #endif
 
 #include "app/app.h"
+#include "app/cmd/move_layer.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
 #include "app/context_access.h"
@@ -107,6 +108,7 @@ void NewLayerCommand::onExecute(Context* context)
 
   LayerGroup* parent = sprite->root();
   Layer* activeLayer = writer.layer();
+  SelectedLayers selLayers = writer.site()->selectedLayers();
   if (activeLayer) {
     if (activeLayer->isGroup() &&
         activeLayer->isExpanded() &&
@@ -131,11 +133,35 @@ void NewLayerCommand::onExecute(Context* context)
     else
       layer = api.newLayer(parent, name);
 
+    ASSERT(layer->parent());
+
     // If "top" parameter is false, create the layer above the active
     // one.
-    if (activeLayer && !m_top)
+    if (activeLayer && !m_top) {
       api.restackLayerAfter(layer, activeLayer);
 
+      // Put all selected layers inside the group
+      if (m_group && writer.site()->inTimeline()) {
+        LayerGroup* commonParent = nullptr;
+        std::size_t sameParents = 0;
+        for (Layer* l : selLayers) {
+          if (!commonParent ||
+              commonParent == l->parent()) {
+            commonParent = l->parent();
+            ++sameParents;
+          }
+        }
+
+        if (sameParents == selLayers.size()) {
+          for (Layer* newChild : convert_selected_layers_into_layer_list(selLayers)) {
+            transaction.execute(
+              new cmd::MoveLayer(newChild, layer,
+                                 static_cast<LayerGroup*>(layer)->lastLayer()));
+          }
+        }
+      }
+    }
+
     transaction.commit();
   }
   update_screen_for_document(document);
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 89448647d..ff9879824 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -425,7 +425,7 @@ void DocumentApi::removeLayer(Layer* layer)
 
 void DocumentApi::restackLayerAfter(Layer* layer, Layer* afterThis)
 {
-  m_transaction.execute(new cmd::MoveLayer(layer, afterThis));
+  m_transaction.execute(new cmd::MoveLayer(layer, layer->parent(), afterThis));
 }
 
 void DocumentApi::restackLayerBefore(Layer* layer, Layer* beforeThis)
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index 767a49d8c..c4b84cf31 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -378,16 +378,8 @@ void LayerGroup::removeLayer(Layer* layer)
   layer->setParent(nullptr);
 }
 
-void LayerGroup::stackLayer(Layer* layer, Layer* after)
+void LayerGroup::insertLayer(Layer* layer, Layer* after)
 {
-  ASSERT(layer != after);
-  if (layer == after)
-    return;
-
-  auto it = std::find(m_layers.begin(), m_layers.end(), layer);
-  ASSERT(it != m_layers.end());
-  m_layers.erase(it);
-
   if (after) {
     auto after_it = std::find(m_layers.begin(), m_layers.end(), after);
     ASSERT(after_it != m_layers.end());
@@ -396,6 +388,18 @@ void LayerGroup::stackLayer(Layer* layer, Layer* after)
   }
   else
     m_layers.insert(m_layers.begin(), layer);
+
+  layer->setParent(this);
+}
+
+void LayerGroup::stackLayer(Layer* layer, Layer* after)
+{
+  ASSERT(layer != after);
+  if (layer == after)
+    return;
+
+  removeLayer(layer);
+  insertLayer(layer, after);
 }
 
 void LayerGroup::displaceFrames(frame_t fromThis, frame_t delta)
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 62f659176..e10966514 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -180,6 +180,7 @@ namespace doc {
 
     void addLayer(Layer* layer);
     void removeLayer(Layer* layer);
+    void insertLayer(Layer* layer, Layer* after);
     void stackLayer(Layer* layer, Layer* after);
 
     Layer* firstLayer() const { return (m_layers.empty() ? nullptr: m_layers.front()); }
diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
index f2f7ce763..cf38bc300 100644
--- a/src/doc/selected_layers.cpp
+++ b/src/doc/selected_layers.cpp
@@ -11,6 +11,7 @@
 #include "doc/selected_layers.h"
 
 #include "doc/layer.h"
+#include "doc/sprite.h"
 
 namespace doc {
 
@@ -43,4 +44,22 @@ void select_all_layers(LayerGroup* group, SelectedLayers& layers)
   }
 }
 
+LayerList convert_selected_layers_into_layer_list(const SelectedLayers& layers)
+{
+  LayerList output;
+
+  if (layers.empty())
+    return output;
+
+  for (Layer* layer = (*layers.begin())->sprite()->firstBrowsableLayer();
+       layer != nullptr;
+       layer = layer->getNextInWholeHierarchy()) {
+    if (layers.find(layer) != layers.end()) {
+      output.push_back(layer);
+    }
+  }
+
+  return output;
+}
+
 } // namespace doc
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
index 32ccc1c6d..4958d610d 100644
--- a/src/doc/selected_layers.h
+++ b/src/doc/selected_layers.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <set>
+#include "layer_list.h"
 
 namespace doc {
 
@@ -19,6 +20,7 @@ namespace doc {
 
   void remove_children_if_parent_is_selected(SelectedLayers& layers);
   void select_all_layers(LayerGroup* group, SelectedLayers& layers);
+  LayerList convert_selected_layers_into_layer_list(const SelectedLayers& layers);
 
 } // namespace doc
 
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index c08c7b6b3..77a8ac196 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -223,6 +223,14 @@ LayerIndex Sprite::firstLayer() const
   return LayerIndex(0);
 }
 
+Layer* Sprite::firstBrowsableLayer() const
+{
+  Layer* layer = root()->firstLayer();
+  while (layer->isBrowsable())
+    layer = static_cast<LayerGroup*>(layer)->firstLayer();
+  return layer;
+}
+
 LayerIndex Sprite::lastLayer() const
 {
   return LayerIndex(root()->layersCount()-1);
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index 8147a6525..dc0d6dad4 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -95,6 +95,7 @@ namespace doc {
 
     LayerIndex countLayers() const;
     LayerIndex firstLayer() const;
+    Layer* firstBrowsableLayer() const;
     LayerIndex lastLayer() const;
 
     Layer* layer(int layerIndex) const;

From 7b55037abb13ccd8cab87d1003a6381072921a25 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 21 Jun 2016 12:02:31 -0300
Subject: [PATCH 51/86] Replace LayersRange with Sprite::all*Layers() members

---
 src/app/cli/cli_processor.cpp        | 24 +++++------
 src/app/cli/default_cli_delegate.cpp |  7 +---
 src/doc/CMakeLists.txt               |  1 -
 src/doc/layer.cpp                    | 33 +++++++++++++++
 src/doc/layer.h                      |  4 ++
 src/doc/layers_range.cpp             | 56 -------------------------
 src/doc/layers_range.h               | 55 ------------------------
 src/doc/sprite.cpp                   | 21 ++++++++--
 src/doc/sprite.h                     |  6 ++-
 src/doc/sprite_tests.cpp             | 62 ++++++++++++++++++++++++++++
 10 files changed, 134 insertions(+), 135 deletions(-)
 delete mode 100644 src/doc/layers_range.cpp
 delete mode 100644 src/doc/layers_range.h

diff --git a/src/app/cli/cli_processor.cpp b/src/app/cli/cli_processor.cpp
index ae162793a..bb5d97ee7 100644
--- a/src/app/cli/cli_processor.cpp
+++ b/src/app/cli/cli_processor.cpp
@@ -29,7 +29,6 @@
 #include "doc/frame_tag.h"
 #include "doc/frame_tags.h"
 #include "doc/layer.h"
-#include "doc/layers_range.h"
 
 namespace app {
 
@@ -332,7 +331,7 @@ bool CliProcessor::openFile(CliOpenFile& cof)
   if (doc) {
     // Show all layers
     if (cof.allLayers) {
-      for (doc::Layer* layer : doc->sprite()->layers())
+      for (doc::Layer* layer : doc->sprite()->allLayers())
         layer->setVisible(true);
     }
 
@@ -360,7 +359,7 @@ bool CliProcessor::openFile(CliOpenFile& cof)
 
       if (!cof.importLayer.empty()) {
         Layer* foundLayer = nullptr;
-        for (Layer* layer : doc->sprite()->layers()) {
+        for (Layer* layer : doc->sprite()->allLayers()) {
           if (layer->name() == cof.importLayer) {
             foundLayer = layer;
             break;
@@ -370,10 +369,8 @@ bool CliProcessor::openFile(CliOpenFile& cof)
           m_exporter->addDocument(doc, foundLayer, frameTag, isTemporalTag);
       }
       else if (cof.splitLayers) {
-        for (auto layer : doc->sprite()->layers()) {
-          if (layer->isVisible())
-            m_exporter->addDocument(doc, layer, frameTag, isTemporalTag);
-        }
+        for (auto layer : doc->sprite()->allVisibleLayers())
+          m_exporter->addDocument(doc, layer, frameTag, isTemporalTag);
       }
       else {
         m_exporter->addDocument(doc, nullptr, frameTag, isTemporalTag);
@@ -407,9 +404,10 @@ void CliProcessor::saveFile(const CliOpenFile& cof)
   }
 
   // Store in "visibility" the original "visible" state of every layer.
-  std::vector<bool> visibility(doc->sprite()->countLayers());
+  LayerList allLayers = doc->sprite()->allLayers();
+  std::vector<bool> visibility(allLayers.size());
   int i = 0;
-  for (doc::Layer* layer : doc->sprite()->layers())
+  for (doc::Layer* layer : allLayers)
     visibility[i++] = layer->isVisible();
 
   std::string fn = cof.filename;
@@ -427,13 +425,13 @@ void CliProcessor::saveFile(const CliOpenFile& cof)
   std::vector<doc::Layer*> layers;
   // --save-as with --split-layers or --split-tags
   if (cof.splitLayers) {
-    for (doc::Layer* layer : doc->sprite()->layers())
+    for (doc::Layer* layer : doc->sprite()->allVisibleLayers())
       layers.push_back(layer);
   }
   else {
     // Show only one layer
     if (!cof.importLayer.empty()) {
-      for (Layer* layer : doc->sprite()->layers()) {
+      for (Layer* layer : allLayers) {
         if (layer->name() == cof.importLayer) {
           layer->setVisible(true);
           layers.push_back(layer);
@@ -481,7 +479,7 @@ void CliProcessor::saveFile(const CliOpenFile& cof)
           continue;     // Just ignore this layer.
 
         // Make this layer ("show") the only one visible.
-        for (doc::Layer* hide : doc->sprite()->layers())
+        for (doc::Layer* hide : allLayers)
           hide->setVisible(hide == layer);
       }
 
@@ -521,7 +519,7 @@ void CliProcessor::saveFile(const CliOpenFile& cof)
 
   // Restore layer visibility
   i = 0;
-  for (Layer* layer : doc->sprite()->layers())
+  for (Layer* layer : allLayers)
     layer->setVisible(visibility[i++]);
 
   // Undo crop
diff --git a/src/app/cli/default_cli_delegate.cpp b/src/app/cli/default_cli_delegate.cpp
index 533ddcf5c..1f8b3e292 100644
--- a/src/app/cli/default_cli_delegate.cpp
+++ b/src/app/cli/default_cli_delegate.cpp
@@ -22,7 +22,6 @@
 #include "base/convert_to.h"
 #include "doc/frame_tag.h"
 #include "doc/layer.h"
-#include "doc/layers_range.h"
 #include "doc/sprite.h"
 #include "script/engine_delegate.h"
 
@@ -53,10 +52,8 @@ void DefaultCliDelegate::afterOpenFile(const CliOpenFile& cof)
     return;
 
   if (cof.listLayers) {
-    for (doc::Layer* layer : cof.document->sprite()->layers()) {
-      if (layer->isVisible())
-        std::cout << layer->name() << "\n";
-    }
+    for (doc::Layer* layer : cof.document->sprite()->allVisibleLayers())
+      std::cout << layer->name() << "\n";
   }
 
   if (cof.listTags) {
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 268bf26c0..fb831e96f 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -44,7 +44,6 @@ add_library(doc-lib
   layer.cpp
   layer_index.cpp
   layer_io.cpp
-  layers_range.cpp
   mask.cpp
   mask_boundaries.cpp
   mask_io.cpp
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index c4b84cf31..aca2d44eb 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -357,6 +357,39 @@ int LayerGroup::getMemSize() const
   return size;
 }
 
+void LayerGroup::allLayers(LayerList& list) const
+{
+  for (Layer* child : m_layers) {
+    if (child->isGroup())
+      static_cast<LayerGroup*>(child)->allLayers(list);
+
+    list.push_back(child);
+  }
+}
+
+void LayerGroup::allVisibleLayers(LayerList& list) const
+{
+  for (Layer* child : m_layers) {
+    if (!child->isVisible())
+      continue;
+
+    if (child->isGroup())
+      static_cast<LayerGroup*>(child)->allVisibleLayers(list);
+
+    list.push_back(child);
+  }
+}
+
+void LayerGroup::allBrowsableLayers(LayerList& list) const
+{
+  for (Layer* child : m_layers) {
+    if (child->isBrowsable())
+      static_cast<LayerGroup*>(child)->allBrowsableLayers(list);
+
+    list.push_back(child);
+  }
+}
+
 void LayerGroup::getCels(CelList& cels) const
 {
   for (const Layer* layer : m_layers)
diff --git a/src/doc/layer.h b/src/doc/layer.h
index e10966514..38c0bc4da 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -186,6 +186,10 @@ namespace doc {
     Layer* firstLayer() const { return (m_layers.empty() ? nullptr: m_layers.front()); }
     Layer* lastLayer() const { return (m_layers.empty() ? nullptr: m_layers.back()); }
 
+    void allLayers(LayerList& list) const;
+    void allVisibleLayers(LayerList& list) const;
+    void allBrowsableLayers(LayerList& list) const;
+
     void getCels(CelList& cels) const override;
     void displaceFrames(frame_t fromThis, frame_t delta) override;
 
diff --git a/src/doc/layers_range.cpp b/src/doc/layers_range.cpp
deleted file mode 100644
index a2f310494..000000000
--- a/src/doc/layers_range.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "doc/layers_range.h"
-
-#include "doc/cel.h"
-#include "doc/layer.h"
-#include "doc/sprite.h"
-
-namespace doc {
-
-LayersRange::LayersRange(const Sprite* sprite,
-                         LayerIndex first, LayerIndex last)
-  : m_begin(sprite, first, last)
-  , m_end()
-{
-}
-
-LayersRange::iterator::iterator()
-  : m_layer(nullptr)
-  , m_cur(-1)
-  , m_last(-1)
-{
-}
-
-LayersRange::iterator::iterator(const Sprite* sprite,
-                                LayerIndex first, LayerIndex last)
-  : m_layer(nullptr)
-  , m_cur(first)
-  , m_last(last)
-{
-  m_layer = sprite->layer(first);
-}
-
-LayersRange::iterator& LayersRange::iterator::operator++()
-{
-  if (!m_layer)
-    return *this;
-
-  ++m_cur;
-  if (m_cur > m_last)
-    m_layer = nullptr;
-  else
-    m_layer = m_layer->getNext();
-
-  return *this;
-}
-
-} // namespace doc
diff --git a/src/doc/layers_range.h b/src/doc/layers_range.h
deleted file mode 100644
index 9f67cb0b8..000000000
--- a/src/doc/layers_range.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Aseprite Document Library
-// Copyright (c) 2001-2016 David Capello
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#ifndef DOC_LAYERS_RANGE_H_INCLUDED
-#define DOC_LAYERS_RANGE_H_INCLUDED
-#pragma once
-
-#include "doc/layer_index.h"
-#include "doc/object_id.h"
-
-namespace doc {
-  class Layer;
-  class Sprite;
-
-  class LayersRange {
-  public:
-    LayersRange(const Sprite* sprite, LayerIndex first, LayerIndex last);
-
-    class iterator {
-    public:
-      iterator();
-      iterator(const Sprite* sprite, LayerIndex first, LayerIndex last);
-
-      bool operator==(const iterator& other) const {
-        return m_layer == other.m_layer;
-      }
-
-      bool operator!=(const iterator& other) const {
-        return !operator==(other);
-      }
-
-      Layer* operator*() const {
-        return m_layer;
-      }
-
-      iterator& operator++();
-
-    private:
-      Layer* m_layer;
-      LayerIndex m_cur, m_last;
-    };
-
-    iterator begin() { return m_begin; }
-    iterator end() { return m_end; }
-
-  private:
-    iterator m_begin, m_end;
-  };
-
-} // namespace doc
-
-#endif
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index 77a8ac196..0d58a79f8 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -19,7 +19,6 @@
 #include "doc/frame_tag.h"
 #include "doc/image_impl.h"
 #include "doc/layer.h"
-#include "doc/layers_range.h"
 #include "doc/palette.h"
 #include "doc/primitives.h"
 #include "doc/remap.h"
@@ -541,9 +540,25 @@ void Sprite::pickCels(int x, int y, frame_t frame, int opacityThreshold, CelList
 //////////////////////////////////////////////////////////////////////
 // Iterators
 
-LayersRange Sprite::layers() const
+LayerList Sprite::allLayers() const
 {
-  return LayersRange(this, LayerIndex(0), LayerIndex(countLayers()-1));
+  LayerList list;
+  m_root->allLayers(list);
+  return list;
+}
+
+LayerList Sprite::allVisibleLayers() const
+{
+  LayerList list;
+  m_root->allVisibleLayers(list);
+  return list;
+}
+
+LayerList Sprite::allBrowsableLayers() const
+{
+  LayerList list;
+  m_root->allBrowsableLayers(list);
+  return list;
 }
 
 CelsRange Sprite::cels() const
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index dc0d6dad4..bb5b8efd3 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -33,7 +33,6 @@ namespace doc {
   class Layer;
   class LayerGroup;
   class LayerImage;
-  class LayersRange;
   class Mask;
   class Palette;
   class Remap;
@@ -155,7 +154,10 @@ namespace doc {
     ////////////////////////////////////////
     // Iterators
 
-    LayersRange layers() const;
+    LayerList allLayers() const;
+    LayerList allVisibleLayers() const;
+    LayerList allBrowsableLayers() const;
+
     CelsRange cels() const;
     CelsRange cels(frame_t frame) const;
     CelsRange uniqueCels() const;
diff --git a/src/doc/sprite_tests.cpp b/src/doc/sprite_tests.cpp
index 0712a20b3..e741ccf97 100644
--- a/src/doc/sprite_tests.cpp
+++ b/src/doc/sprite_tests.cpp
@@ -18,6 +18,68 @@
 
 using namespace doc;
 
+TEST(Sprite, Layers)
+{
+  Sprite* spr = new Sprite(IMAGE_RGB, 32, 32, 256);
+
+  LayerImage* lay1 = new LayerImage(spr);
+  LayerImage* lay2 = new LayerImage(spr);
+  LayerImage* lay3 = new LayerImage(spr);
+  LayerImage* lay4 = new LayerImage(spr);
+  LayerImage* lay5 = new LayerImage(spr);
+  LayerImage* lay6 = new LayerImage(spr);
+  LayerImage* lay7 = new LayerImage(spr);
+  LayerGroup* grp1 = new LayerGroup(spr);
+  LayerGroup* grp2 = new LayerGroup(spr);
+  LayerGroup* grp3 = new LayerGroup(spr);
+
+  grp1->setVisible(false);
+  lay5->setVisible(false);
+  grp2->setCollapsed(true);
+
+  ;; grp2->addLayer(lay5);
+  ;;;; grp3->addLayer(lay7);
+  ;;;; grp3->addLayer(lay6);
+  ;; grp2->addLayer(grp3);
+  spr->root()->addLayer(grp2);
+  spr->root()->addLayer(lay2);
+  ;; grp1->addLayer(lay4);
+  ;; grp1->addLayer(lay3);
+  spr->root()->addLayer(grp1);
+  spr->root()->addLayer(lay1);
+
+  auto all = spr->allLayers();
+  ASSERT_EQ(10, all.size());
+  EXPECT_EQ(lay5, all[0]);
+  EXPECT_EQ(lay7, all[1]);
+  EXPECT_EQ(lay6, all[2]);
+  EXPECT_EQ(grp3, all[3]);
+  EXPECT_EQ(grp2, all[4]);
+  EXPECT_EQ(lay2, all[5]);
+  EXPECT_EQ(lay4, all[6]);
+  EXPECT_EQ(lay3, all[7]);
+  EXPECT_EQ(grp1, all[8]);
+  EXPECT_EQ(lay1, all[9]);
+
+  auto vis = spr->allVisibleLayers();
+  ASSERT_EQ(6, vis.size());
+  EXPECT_EQ(lay7, vis[0]);
+  EXPECT_EQ(lay6, vis[1]);
+  EXPECT_EQ(grp3, vis[2]);
+  EXPECT_EQ(grp2, vis[3]);
+  EXPECT_EQ(lay2, vis[4]);
+  EXPECT_EQ(lay1, vis[5]);
+
+  auto bro = spr->allBrowsableLayers();
+  ASSERT_EQ(6, bro.size());
+  EXPECT_EQ(grp2, bro[0]);
+  EXPECT_EQ(lay2, bro[1]);
+  EXPECT_EQ(lay4, bro[2]);
+  EXPECT_EQ(lay3, bro[3]);
+  EXPECT_EQ(grp1, bro[4]);
+  EXPECT_EQ(lay1, bro[5]);
+}
+
 //            frames
 //            0 1 2
 // root

From 7f4fbb0e85325d6c745da6d311a98fb9a34b5f53 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 21 Jun 2016 12:17:18 -0300
Subject: [PATCH 52/86] Fix 'auto select layer' in Move tool for groups

---
 src/doc/sprite.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index 0d58a79f8..9498ac0b1 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -492,12 +492,11 @@ void Sprite::remapImages(frame_t frameFrom, frame_t frameTo, const Remap& remap)
 
 void Sprite::pickCels(int x, int y, frame_t frame, int opacityThreshold, CelList& cels) const
 {
-  std::vector<Layer*> layers;
-  getLayersList(layers);
+  LayerList layers = allVisibleLayers();
 
   for (int i=(int)layers.size()-1; i>=0; --i) {
     Layer* layer = layers[i];
-    if (!layer->isImage() || !layer->isVisible())
+    if (!layer->isImage())
       continue;
 
     Cel* cel = layer->cel(frame);

From 2d6412357c49f16835832b1bdf55c71216a1d7e6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Wed, 29 Jun 2016 10:59:37 -0300
Subject: [PATCH 53/86] Remove Sprite::getLayersList() member

---
 src/app/commands/cmd_export_sprite_sheet.cpp |  9 +++------
 src/app/crash/write_document.cpp             |  8 +++-----
 src/app/document_api.cpp                     |  3 +--
 src/app/document_exporter.cpp                |  5 +----
 src/app/document_range_ops.cpp               | 18 ++++++++++--------
 src/app/file/gif_format.cpp                  |  4 +---
 src/app/util/clipboard.cpp                   |  6 ++----
 src/doc/sprite.cpp                           |  8 --------
 src/doc/sprite.h                             |  2 --
 9 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp
index 78c7a01a6..99699e72c 100644
--- a/src/app/commands/cmd_export_sprite_sheet.cpp
+++ b/src/app/commands/cmd_export_sprite_sheet.cpp
@@ -227,8 +227,7 @@ namespace {
           return;
       }
 
-      std::vector<Layer*> layers;
-      sprite->getLayersList(layers);
+      LayerList layers = sprite->allLayers();
       for (int i=0; i<int(layers.size()); ++i) {
         Layer* layer = layers[i];
         bool selected = range.inRange(LayerIndex(i));
@@ -297,8 +296,7 @@ public:
     if (m_docPref.spriteSheet.layer() == kSelectedLayers)
       layers()->setSelectedItemIndex(i);
     {
-      std::vector<Layer*> layersList;
-      m_sprite->getLayersList(layersList);
+      LayerList layersList = m_sprite->allLayers();
       for (Layer* layer : layersList) {
         i = layers()->addItem(new LayerItem(layer));
         if (m_docPref.spriteSheet.layer() == layer->name())
@@ -837,8 +835,7 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
   }
   else {
     // TODO add a getLayerByName
-    std::vector<Layer*> layers;
-    sprite->getLayersList(layers);
+    LayerList layers = sprite->allLayers();
     for (Layer* l : layers) {
       if (l->name() == layerName) {
         layer = l;
diff --git a/src/app/crash/write_document.cpp b/src/app/crash/write_document.cpp
index d7bc06daf..945ecad3e 100644
--- a/src/app/crash/write_document.cpp
+++ b/src/app/crash/write_document.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -76,8 +76,7 @@ public:
     for (Cel* cel : spr->cels())
       saveObject("cel", cel, &Writer::writeCel);
 
-    std::vector<Layer*> layers;
-    spr->getLayersList(layers);
+    LayerList layers = spr->allLayers();
     for (Layer* lay : layers)
       saveObject("lay", lay, &Writer::writeLayerStructure);
 
@@ -104,8 +103,7 @@ private:
       write32(s, spr->frameDuration(fr));
 
     // IDs of all main layers
-    std::vector<Layer*> layers;
-    spr->getLayersList(layers);
+    LayerList layers = spr->allLayers();
     write32(s, layers.size());
     for (Layer* lay : layers)
       write32(s, lay->id());
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index ff9879824..75f7b33c7 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -82,8 +82,7 @@ void DocumentApi::cropSprite(Sprite* sprite, const gfx::Rect& bounds)
   setSpriteSize(sprite, bounds.w, bounds.h);
 
   app::Document* doc = static_cast<app::Document*>(sprite->document());
-  std::vector<Layer*> layers;
-  sprite->getLayersList(layers);
+  LayerList layers = sprite->allLayers();
   for (Layer* layer : layers) {
     if (!layer->isImage())
       continue;
diff --git a/src/app/document_exporter.cpp b/src/app/document_exporter.cpp
index 013b56dd9..0f1ee1f3b 100644
--- a/src/app/document_exporter.cpp
+++ b/src/app/document_exporter.cpp
@@ -758,10 +758,7 @@ void DocumentExporter::createDataFile(const Samples& samples, std::ostream& os,
       Document* doc = item.doc;
       Sprite* sprite = doc->sprite();
 
-      std::vector<Layer*> layers;
-      sprite->getLayersList(layers);
-
-      for (Layer* layer : layers) {
+      for (Layer* layer : sprite->allVisibleLayers()) {
         if (firstLayer)
           firstLayer = false;
         else
diff --git a/src/app/document_range_ops.cpp b/src/app/document_range_ops.cpp
index b79d58d9e..030423307 100644
--- a/src/app/document_range_ops.cpp
+++ b/src/app/document_range_ops.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -99,9 +99,7 @@ static DocumentRange drop_range_op(
 
       case DocumentRange::kCels:
         {
-          std::vector<Layer*> layers;
-          sprite->getLayersList(layers);
-
+          LayerList layers = sprite->allBrowsableLayers();
           int srcLayerBegin, srcLayerStep, srcLayerEnd;
           int dstLayerBegin, dstLayerStep;
           frame_t srcFrameBegin, srcFrameStep, srcFrameEnd;
@@ -145,6 +143,9 @@ static DocumentRange drop_range_op(
                   srcLayerIdx < 0 || srcLayerIdx >= int(layers.size()))
                 break;
 
+              ASSERT(layers[srcLayerIdx]->isImage());
+              ASSERT(layers[dstLayerIdx]->isImage());
+
               LayerImage* srcLayer = static_cast<LayerImage*>(layers[srcLayerIdx]);
               LayerImage* dstLayer = static_cast<LayerImage*>(layers[dstLayerIdx]);
 
@@ -268,8 +269,7 @@ static DocumentRange drop_range_op(
 
       case DocumentRange::kLayers:
         {
-          std::vector<Layer*> layers;
-          sprite->getLayersList(layers);
+          LayerList layers = sprite->allBrowsableLayers();
 
           if (layers.empty())
             break;
@@ -382,10 +382,12 @@ void reverse_frames(Document* doc, const DocumentRange& range)
     }
   }
   else {
-    std::vector<Layer*> layers;
-    sprite->getLayersList(layers);
+    LayerList layers = sprite->allBrowsableLayers();
 
     for (int layerIdx = layerBegin; layerIdx != layerEnd; ++layerIdx) {
+      if (!layers[layerIdx]->isImage())
+        continue;
+
       for (frame_t frame = frameBegin,
              frameRev = frameEnd;
            frame != (frameBegin+frameEnd)/2+1;
diff --git a/src/app/file/gif_format.cpp b/src/app/file/gif_format.cpp
index 7f244f82c..99e1ef506 100644
--- a/src/app/file/gif_format.cpp
+++ b/src/app/file/gif_format.cpp
@@ -838,9 +838,7 @@ public:
         m_sprite->getPalettes().size() == 1) {
       // If some layer has opacity < 255 or a different blend mode, we
       // need to create color palettes.
-      std::vector<Layer*> layers;
-      m_sprite->getLayersList(layers);
-      for (const Layer* layer : layers) {
+      for (const Layer* layer : m_sprite->allVisibleLayers()) {
         if (layer->isVisible() && layer->isImage()) {
           const LayerImage* imageLayer = static_cast<const LayerImage*>(layer);
           if (imageLayer->opacity() < 255 ||
diff --git a/src/app/util/clipboard.cpp b/src/app/util/clipboard.cpp
index 897cae6c1..59c37f938 100644
--- a/src/app/util/clipboard.cpp
+++ b/src/app/util/clipboard.cpp
@@ -347,10 +347,8 @@ void paste()
       DocumentRange srcRange = clipboard_range.range();
       Document* srcDoc = clipboard_range.document();
       Sprite* srcSpr = srcDoc->sprite();
-      std::vector<Layer*> srcLayers;
-      std::vector<Layer*> dstLayers;
-      srcSpr->getLayersList(srcLayers);
-      dstSpr->getLayersList(dstLayers);
+      LayerList srcLayers = srcSpr->allBrowsableLayers();
+      LayerList dstLayers = dstSpr->allBrowsableLayers();
 
       switch (srcRange.type()) {
 
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index 9498ac0b1..299526712 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -255,14 +255,6 @@ LayerIndex Sprite::layerToIndex(const Layer* layer) const
   return layer2index(root(), layer, &index_count);
 }
 
-void Sprite::getLayersList(std::vector<Layer*>& layers) const
-{
-  // TODO support subgroups
-  for (Layer* child : m_root->layers()) {
-    layers.push_back(child);
-  }
-}
-
 //////////////////////////////////////////////////////////////////////
 // Palettes
 
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index bb5b8efd3..36af26fe8 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -101,8 +101,6 @@ namespace doc {
     Layer* indexToLayer(LayerIndex index) const;
     LayerIndex layerToIndex(const Layer* layer) const;
 
-    void getLayersList(std::vector<Layer*>& layers) const;
-
     ////////////////////////////////////////
     // Palettes
 

From 5950bd7df1d9e7000d83e021df5c540fc4fee946 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 13:45:50 -0300
Subject: [PATCH 54/86] Add SelectedFrames::clear()

---
 src/doc/selected_frames.cpp | 5 +++++
 src/doc/selected_frames.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/doc/selected_frames.cpp b/src/doc/selected_frames.cpp
index 3c0d11a49..214bc866a 100644
--- a/src/doc/selected_frames.cpp
+++ b/src/doc/selected_frames.cpp
@@ -22,6 +22,11 @@ std::size_t SelectedFrames::size() const
   return size;
 }
 
+void SelectedFrames::clear()
+{
+  m_ranges.clear();
+}
+
 void SelectedFrames::insert(frame_t frame)
 {
   if (m_ranges.empty()) {
diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index caaa08733..5ab9658d9 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -121,6 +121,7 @@ namespace doc {
     std::size_t ranges() const { return m_ranges.size(); }
     bool empty() const { return m_ranges.empty(); }
 
+    void clear();
     void insert(frame_t frame);
     void insert(frame_t fromFrame, frame_t toFrame);
 

From 63a7a477fffbccd20080173f021309164f5ef9b1 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 14:11:48 -0300
Subject: [PATCH 55/86] Fix SelectedFrames::insert() when from > to

---
 src/doc/selected_frames.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/doc/selected_frames.cpp b/src/doc/selected_frames.cpp
index 214bc866a..1a32d0755 100644
--- a/src/doc/selected_frames.cpp
+++ b/src/doc/selected_frames.cpp
@@ -65,6 +65,9 @@ void SelectedFrames::insert(frame_t frame)
 
 void SelectedFrames::insert(frame_t fromFrame, frame_t toFrame)
 {
+  if (fromFrame > toFrame)
+    std::swap(fromFrame, toFrame);
+
   // TODO improve this
   for (frame_t frame = fromFrame; frame <= toFrame; ++frame) {
     insert(frame);

From 866385fe4b7d189ac53b8acb4d572bcd9175d162 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 14:22:45 -0300
Subject: [PATCH 56/86] Add new layer_t type as a replacement for the old
 LayerIndex

---
 src/doc/layer_list.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/doc/layer_list.h b/src/doc/layer_list.h
index aebee54dc..0c9248fb5 100644
--- a/src/doc/layer_list.h
+++ b/src/doc/layer_list.h
@@ -15,6 +15,7 @@ namespace doc {
   class Layer;
 
   typedef std::vector<Layer*> LayerList;
+  typedef int layer_t;
 
 } // namespace doc
 

From 9fd340751f4bd2b1c65102cc1734df316f160a83 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 14:24:23 -0300
Subject: [PATCH 57/86] Add doc::displace_selected_layers() function

This function would be useful for the Timeline to displace the set of
selected layers range when the user drag-and-drop it.
---
 src/doc/selected_layers.cpp | 23 +++++++++++++++++++++++
 src/doc/selected_layers.h   |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
index cf38bc300..d243983e2 100644
--- a/src/doc/selected_layers.cpp
+++ b/src/doc/selected_layers.cpp
@@ -62,4 +62,27 @@ LayerList convert_selected_layers_into_layer_list(const SelectedLayers& layers)
   return output;
 }
 
+void displace_selected_layers(SelectedLayers& layers, layer_t layerDelta)
+{
+  const SelectedLayers original = layers;
+  layers.clear();
+
+  for (auto it : original) {
+    Layer* layer = it;
+
+    if (layerDelta > 0) {
+      for (layer_t i=0; layer && i<layerDelta; ++i)
+        layer = layer->getNextInWholeHierarchy();
+    }
+    else if (layerDelta < 0) {
+      for (layer_t i=0; layer && i>layerDelta; --i) {
+        layer = layer->getPreviousInWholeHierarchy();
+      }
+    }
+
+    if (layer)
+      layers.insert(layer);
+  }
+}
+
 } // namespace doc
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
index 4958d610d..2925fb69a 100644
--- a/src/doc/selected_layers.h
+++ b/src/doc/selected_layers.h
@@ -16,11 +16,13 @@ namespace doc {
   class Layer;
   class LayerGroup;
 
+  // TODO convert this into a new class
   typedef std::set<Layer*> SelectedLayers;
 
   void remove_children_if_parent_is_selected(SelectedLayers& layers);
   void select_all_layers(LayerGroup* group, SelectedLayers& layers);
   LayerList convert_selected_layers_into_layer_list(const SelectedLayers& layers);
+  void displace_selected_layers(SelectedLayers& layers, layer_t layerDelta);
 
 } // namespace doc
 

From ae91c3d15b25e2d1f97c7032207d99c24d385e9b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 14:30:44 -0300
Subject: [PATCH 58/86] Add doc::find_layer_index()

It'll be useful to known the index of a layer inside a list (e.g. a list
of all layers, or a list of all browsable layers, etc.).
---
 src/doc/CMakeLists.txt |  1 +
 src/doc/layer_list.cpp | 27 +++++++++++++++++++++++++++
 src/doc/layer_list.h   |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 src/doc/layer_list.cpp

diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index fb831e96f..847e4170f 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -44,6 +44,7 @@ add_library(doc-lib
   layer.cpp
   layer_index.cpp
   layer_io.cpp
+  layer_list.cpp
   mask.cpp
   mask_boundaries.cpp
   mask_io.cpp
diff --git a/src/doc/layer_list.cpp b/src/doc/layer_list.cpp
new file mode 100644
index 000000000..9a1b199dd
--- /dev/null
+++ b/src/doc/layer_list.cpp
@@ -0,0 +1,27 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "doc/layer.h"
+#include "doc/layer_list.h"
+
+#include <algorithm>
+
+namespace doc {
+
+layer_t find_layer_index(const LayerList& layers, const Layer* layer)
+{
+  auto it = std::find(layers.begin(), layers.end(), layer);
+  if (it != layers.end())
+    return it - layers.begin();
+  else
+    return 0;
+}
+
+} // namespace doc
diff --git a/src/doc/layer_list.h b/src/doc/layer_list.h
index 0c9248fb5..4e3da2a6f 100644
--- a/src/doc/layer_list.h
+++ b/src/doc/layer_list.h
@@ -17,6 +17,8 @@ namespace doc {
   typedef std::vector<Layer*> LayerList;
   typedef int layer_t;
 
+  layer_t find_layer_index(const LayerList& layers, const Layer* layer);
+
 } // namespace doc
 
 #endif  // DOC_LAYER_LIST_H_INCLUDED

From e5ef4be54a0addd6244fc01413b99f54e2db71f6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 14:53:51 -0300
Subject: [PATCH 59/86] Add allLayersCount() to LayerGroup and Sprite

This will give us the total number of layers + children.
---
 src/doc/layer.cpp  | 11 +++++++++++
 src/doc/layer.h    |  1 +
 src/doc/sprite.cpp |  5 +++++
 src/doc/sprite.h   |  1 +
 4 files changed, 18 insertions(+)

diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index aca2d44eb..9c6ba8ff3 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -367,6 +367,17 @@ void LayerGroup::allLayers(LayerList& list) const
   }
 }
 
+layer_t LayerGroup::allLayersCount() const
+{
+  layer_t count = 0;
+  for (Layer* child : m_layers) {
+    if (child->isGroup())
+      count += static_cast<LayerGroup*>(child)->allLayersCount();
+    ++count;
+  }
+  return count;
+}
+
 void LayerGroup::allVisibleLayers(LayerList& list) const
 {
   for (Layer* child : m_layers) {
diff --git a/src/doc/layer.h b/src/doc/layer.h
index 38c0bc4da..72db1079c 100644
--- a/src/doc/layer.h
+++ b/src/doc/layer.h
@@ -187,6 +187,7 @@ namespace doc {
     Layer* lastLayer() const { return (m_layers.empty() ? nullptr: m_layers.back()); }
 
     void allLayers(LayerList& list) const;
+    layer_t allLayersCount() const;
     void allVisibleLayers(LayerList& list) const;
     void allBrowsableLayers(LayerList& list) const;
 
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index 299526712..e85d6f9cc 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -255,6 +255,11 @@ LayerIndex Sprite::layerToIndex(const Layer* layer) const
   return layer2index(root(), layer, &index_count);
 }
 
+layer_t Sprite::allLayersCount() const
+{
+  return root()->allLayersCount();
+}
+
 //////////////////////////////////////////////////////////////////////
 // Palettes
 
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index 36af26fe8..b2c3e1241 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -100,6 +100,7 @@ namespace doc {
     Layer* layer(int layerIndex) const;
     Layer* indexToLayer(LayerIndex index) const;
     LayerIndex layerToIndex(const Layer* layer) const;
+    layer_t allLayersCount() const;
 
     ////////////////////////////////////////
     // Palettes

From b4c63a82e199f0a85f02deece8b63686d904e033 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 14:55:18 -0300
Subject: [PATCH 60/86] Add doc::have_layers_same_parent()

---
 src/doc/selected_layers.cpp | 14 ++++++++++++++
 src/doc/selected_layers.h   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
index d243983e2..7af4fd653 100644
--- a/src/doc/selected_layers.cpp
+++ b/src/doc/selected_layers.cpp
@@ -85,4 +85,18 @@ void displace_selected_layers(SelectedLayers& layers, layer_t layerDelta)
   }
 }
 
+bool have_layers_same_parent(const SelectedLayers& layers)
+{
+  Layer* parent = nullptr;
+  for (auto layer : layers) {
+    if (parent) {
+      if (layer->parent() != parent)
+        return false;
+    }
+    else
+      parent = layer->parent();
+  }
+  return true;
+}
+
 } // namespace doc
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
index 2925fb69a..91067cd31 100644
--- a/src/doc/selected_layers.h
+++ b/src/doc/selected_layers.h
@@ -23,6 +23,7 @@ namespace doc {
   void select_all_layers(LayerGroup* group, SelectedLayers& layers);
   LayerList convert_selected_layers_into_layer_list(const SelectedLayers& layers);
   void displace_selected_layers(SelectedLayers& layers, layer_t layerDelta);
+  bool have_layers_same_parent(const SelectedLayers& layers);
 
 } // namespace doc
 

From 13e88400144607f24856f8ae18d554bb0bd0e6ec Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 15:04:15 -0300
Subject: [PATCH 61/86] Replace document.site.layer preference with a layer_t

Now we save the previously selected layer of each document on its
preferences using the browsable set of layers.
---
 data/pref.xml                |  2 +-
 src/app/pref/preferences.h   |  2 +-
 src/app/ui/editor/editor.cpp | 21 ++++++++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 49c5889ca..f2aaadb37 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -228,7 +228,7 @@
   <document>
     <section id="site">
       <option id="frame" type="doc::frame_t" default="doc::frame_t(0)" />
-      <option id="layer" type="doc::LayerIndex" />
+      <option id="layer" type="doc::layer_t" default="doc::layer_t(0)" />
     </section>
     <section id="tiled">
       <option id="mode" type="filters::TiledMode" default="filters::TiledMode::NONE" migrate="Tools.Tiled" />
diff --git a/src/app/pref/preferences.h b/src/app/pref/preferences.h
index 944809ce4..7e154383c 100644
--- a/src/app/pref/preferences.h
+++ b/src/app/pref/preferences.h
@@ -21,7 +21,7 @@
 #include "doc/brush_pattern.h"
 #include "doc/documents_observer.h"
 #include "doc/frame.h"
-#include "doc/layer_index.h"
+#include "doc/layer_list.h"
 #include "filters/tiled_mode.h"
 #include "gfx/rect.h"
 #include "render/onionskin_position.h"
diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index 59e12be37..868f32feb 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -186,12 +186,16 @@ Editor::Editor(Document* document, EditorFlags flags)
       base::Bind<void>(&Editor::onContextBarBrushChange, this));
 
   // Restore last site in preferences
-  frame_t preferredFrame = m_docPref.site.frame();
-  Layer* preferredLayer = m_sprite->indexToLayer(m_docPref.site.layer());
-  if (preferredFrame >= 0 && preferredFrame <= m_sprite->lastFrame())
-    setFrame(preferredFrame);
-  if (preferredLayer)
-    setLayer(preferredLayer);
+  {
+    frame_t preferredFrame = m_docPref.site.frame();
+    if (preferredFrame >= 0 && preferredFrame <= m_sprite->lastFrame())
+      setFrame(preferredFrame);
+
+    LayerList layers = m_sprite->allBrowsableLayers();
+    layer_t layerIndex = m_docPref.site.layer();
+    if (layerIndex >= 0 && layerIndex <= int(layers.size()))
+      setLayer(layers[layerIndex]);
+  }
 
   m_tiledConn = m_docPref.tiled.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this));
   m_gridConn = m_docPref.grid.AfterChange.connect(base::Bind<void>(&Editor::invalidate, this));
@@ -211,8 +215,11 @@ Editor::Editor(Document* document, EditorFlags flags)
 Editor::~Editor()
 {
   if (m_document && m_sprite) {
+    LayerList layers = m_sprite->allBrowsableLayers();
+    layer_t layerIndex = doc::find_layer_index(layers, layer());
+
     m_docPref.site.frame(frame());
-    m_docPref.site.layer(m_sprite->layerToIndex(layer()));
+    m_docPref.site.layer(layerIndex);
   }
 
   m_observers.notifyDestroyEditor(this);

From fbc8d72f1f52bce12daa5ff4d8db0235ff24c49f Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 15:15:53 -0300
Subject: [PATCH 62/86] Add doc::are_layers_adjacent() function

It'll be useful to know if a range operation (e.g. restack layers) will
be applied to adjacent layers (i.e. a range of layers like in previous
Aseprite versions), or to a non-adjacent set of layers.
---
 src/doc/layer_list.cpp       | 27 +++++++++++++++
 src/doc/layer_list.h         |  1 +
 src/doc/layer_list_tests.cpp | 65 ++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 src/doc/layer_list_tests.cpp

diff --git a/src/doc/layer_list.cpp b/src/doc/layer_list.cpp
index 9a1b199dd..584936f8d 100644
--- a/src/doc/layer_list.cpp
+++ b/src/doc/layer_list.cpp
@@ -24,4 +24,31 @@ layer_t find_layer_index(const LayerList& layers, const Layer* layer)
     return 0;
 }
 
+bool are_layers_adjacent(const LayerList& layers)
+{
+  layer_t count = 0;
+  Layer* prev = nullptr;
+  for (auto layer : layers) {
+    if (prev && prev != layer->getPrevious())
+      break;
+    prev = layer;
+    ++count;
+  }
+  if (count == layers.size())
+    return true;
+
+  count = 0;
+  prev = nullptr;
+  for (auto layer : layers) {
+    if (prev && prev != layer->getNext())
+      break;
+    prev = layer;
+    ++count;
+  }
+  if (count == layers.size())
+    return true;
+
+  return false;
+}
+
 } // namespace doc
diff --git a/src/doc/layer_list.h b/src/doc/layer_list.h
index 4e3da2a6f..88adc8793 100644
--- a/src/doc/layer_list.h
+++ b/src/doc/layer_list.h
@@ -18,6 +18,7 @@ namespace doc {
   typedef int layer_t;
 
   layer_t find_layer_index(const LayerList& layers, const Layer* layer);
+  bool are_layers_adjacent(const LayerList& layers);
 
 } // namespace doc
 
diff --git a/src/doc/layer_list_tests.cpp b/src/doc/layer_list_tests.cpp
new file mode 100644
index 000000000..5081d8b9f
--- /dev/null
+++ b/src/doc/layer_list_tests.cpp
@@ -0,0 +1,65 @@
+// Aseprite Document Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gtest/gtest.h>
+
+#include "base/unique_ptr.h"
+#include "doc/layer.h"
+#include "doc/layer_list.h"
+#include "doc/sprite.h"
+
+#include <algorithm>
+
+using namespace doc;
+
+TEST(LayerList, AreLayersAdjacent)
+{
+  base::UniquePtr<Sprite> spr(new Sprite(IMAGE_RGB, 32, 32, 256));
+  LayerGroup* root = spr->root();
+  Layer* layer1 = new LayerImage(spr);
+  Layer* layer2 = new LayerImage(spr);
+  Layer* layer3 = new LayerImage(spr);
+  Layer* layer4 = new LayerImage(spr);
+  root->addLayer(layer1);
+  root->addLayer(layer2);
+  root->addLayer(layer3);
+  root->addLayer(layer4);
+
+  LayerList layers;
+  root->allLayers(layers);
+  EXPECT_EQ(4, layers.size());
+  EXPECT_TRUE(are_layers_adjacent(layers));
+
+  std::reverse(layers.begin(), layers.end());
+  EXPECT_EQ(4, layers.size());
+  EXPECT_TRUE(are_layers_adjacent(layers));
+
+  layers.erase(layers.begin());
+  EXPECT_EQ(3, layers.size());
+  EXPECT_TRUE(are_layers_adjacent(layers));
+
+  layers.erase(layers.begin()+1);
+  EXPECT_EQ(2, layers.size());
+  EXPECT_FALSE(are_layers_adjacent(layers));
+
+  std::reverse(layers.begin(), layers.end());
+  EXPECT_EQ(2, layers.size());
+  EXPECT_FALSE(are_layers_adjacent(layers));
+
+  layers.erase(layers.begin());
+  EXPECT_EQ(1, layers.size());
+  EXPECT_TRUE(are_layers_adjacent(layers));
+}
+
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}

From 22203fb4d32a96454580d0c3d4dd9c82044adde4 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 15:39:57 -0300
Subject: [PATCH 63/86] Add SelectedFrames::operator== and !=

---
 src/doc/frame_range.h     | 8 ++++++++
 src/doc/selected_frames.h | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/doc/frame_range.h b/src/doc/frame_range.h
index 16f4f8dc6..ce1b3b935 100644
--- a/src/doc/frame_range.h
+++ b/src/doc/frame_range.h
@@ -25,6 +25,14 @@ namespace doc {
     FrameRange(frame_t fromFrame, frame_t toFrame)
       : fromFrame(fromFrame), toFrame(toFrame) {
     }
+
+    bool operator==(const FrameRange& o) const {
+      return (fromFrame == o.fromFrame && toFrame == o.toFrame);
+    }
+
+    bool operator!=(const FrameRange& o) const {
+      return !operator==(o);
+    }
   };
 
 } // namespace doc
diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index 5ab9658d9..7516217a4 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -132,6 +132,14 @@ namespace doc {
 
     Reversed reversed() const { return Reversed(*this); }
 
+    bool operator==(const SelectedFrames& o) const {
+      return m_ranges == o.m_ranges;
+    }
+
+    bool operator!=(const SelectedFrames& o) const {
+      return !operator==(o);
+    }
+
   private:
     Ranges m_ranges;
   };

From e35a26fdeba67eb64783a7cb6c27c9afd82be2e6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 20:51:14 -0300
Subject: [PATCH 64/86] Replace access to the first sprite layer with
 Sprite::root()->firstLayer()

---
 src/app/file/pixly_format.cpp |  9 +++------
 src/app/ui_context.cpp        |  2 +-
 src/doc/cels_range.cpp        |  2 +-
 src/render/render_tests.cpp   | 12 ++++++------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/app/file/pixly_format.cpp b/src/app/file/pixly_format.cpp
index 27f861233..9ffc8980c 100644
--- a/src/app/file/pixly_format.cpp
+++ b/src/app/file/pixly_format.cpp
@@ -15,8 +15,8 @@
 #include "app/file/file.h"
 #include "app/file/file_format.h"
 #include "app/xml_document.h"
-#include "base/file_handle.h"
 #include "base/convert_to.h"
+#include "base/file_handle.h"
 #include "base/path.h"
 #include "doc/doc.h"
 #include "doc/algorithm/shrink_bounds.h"
@@ -85,7 +85,6 @@ template<typename Number> static Number check_number(const char* c_str) {
   }
 }
 
-
 bool PixlyFormat::onLoad(FileOp* fop)
 {
   try {
@@ -131,11 +130,9 @@ bool PixlyFormat::onLoad(FileOp* fop)
       throw Exception("Pixly loader requires a valid PNG file");
     }
 
-    Image* sheet = sheet_doc->sprite()->layer(0)->cel(0)->image();
-
-    if (sheet->pixelFormat() != IMAGE_RGB) {
+    Image* sheet = sheet_doc->sprite()->root()->firstLayer()->cel(0)->image();
+    if (sheet->pixelFormat() != IMAGE_RGB)
       throw Exception("Pixly loader requires a RGBA PNG");
-    }
 
     int sheetWidth = sheet->width();
     int sheetHeight = sheet->height();
diff --git a/src/app/ui_context.cpp b/src/app/ui_context.cpp
index 737b81094..5407dac4b 100644
--- a/src/app/ui_context.cpp
+++ b/src/app/ui_context.cpp
@@ -252,7 +252,7 @@ void UIContext::onGetActiveSite(Site* site) const
     if (Document* doc = m_lastSelectedDoc) {
       site->document(doc);
       site->sprite(doc->sprite());
-      site->layer(doc->sprite()->indexToLayer(LayerIndex(0)));
+      site->layer(doc->sprite()->root()->firstLayer());
       site->frame(0);
     }
   }
diff --git a/src/doc/cels_range.cpp b/src/doc/cels_range.cpp
index 9a8152ad7..d2a0d41e6 100644
--- a/src/doc/cels_range.cpp
+++ b/src/doc/cels_range.cpp
@@ -35,7 +35,7 @@ CelsRange::iterator::iterator(const Sprite* sprite, frame_t first, frame_t last,
   , m_flags(flags)
 {
   // Get first cel
-  Layer* layer = sprite->layer(sprite->firstLayer());
+  Layer* layer = sprite->root()->firstLayer();
   while (layer && !m_cel) {
     if (layer->isImage()) {
       for (frame_t f=first; f<=last; ++f) {
diff --git a/src/render/render_tests.cpp b/src/render/render_tests.cpp
index 42d8f3a80..94345802c 100644
--- a/src/render/render_tests.cpp
+++ b/src/render/render_tests.cpp
@@ -68,7 +68,7 @@ TEST(Render, Basic)
   Context ctx;
   Document* doc = ctx.documents().add(2, 2, ColorMode::RGB);
 
-  Image* src = doc->sprite()->layer(0)->cel(0)->image();
+  Image* src = doc->sprite()->root()->firstLayer()->cel(0)->image();
   clear_image(src, 2);
 
   base::UniquePtr<Image> dst(Image::create(IMAGE_RGB, 2, 2));
@@ -88,8 +88,8 @@ TYPED_TEST(RenderAllModes, CheckDefaultBackgroundMode)
   Document* doc = ctx.documents().add(2, 2,
     ColorMode(ImageTraits::pixel_format));
 
-  EXPECT_TRUE(!doc->sprite()->layer(0)->isBackground());
-  Image* src = doc->sprite()->layer(0)->cel(0)->image();
+  EXPECT_TRUE(!doc->sprite()->root()->firstLayer()->isBackground());
+  Image* src = doc->sprite()->root()->firstLayer()->cel(0)->image();
   clear_image(src, 0);
   put_pixel(src, 1, 1, 1);
 
@@ -109,8 +109,8 @@ TEST(Render, DefaultBackgroundModeWithNonzeroTransparentIndex)
   Document* doc = ctx.documents().add(2, 2, ColorMode::INDEXED);
   doc->sprite()->setTransparentColor(2); // Transparent color is index 2
 
-  EXPECT_TRUE(!doc->sprite()->layer(0)->isBackground());
-  Image* src = doc->sprite()->layer(0)->cel(0)->image();
+  EXPECT_TRUE(!doc->sprite()->root()->firstLayer()->isBackground());
+  Image* src = doc->sprite()->root()->firstLayer()->cel(0)->image();
   clear_image(src, 2);
   put_pixel(src, 1, 1, 1);
 
@@ -188,7 +188,7 @@ TEST(Render, ZoomAndDstBounds)
   // 0 4 4
   // 0 4 4
   Document* doc = ctx.documents().add(3, 3, ColorMode::RGB);
-  Image* src = doc->sprite()->layer(0)->cel(0)->image();
+  Image* src = doc->sprite()->root()->firstLayer()->cel(0)->image();
   clear_image(src, 0);
   fill_rect(src, 1, 1, 2, 2, 4);
 

From f4b9f3c32270de33f916acf8b95275bfae9b6ce7 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 11 Aug 2016 21:28:45 -0300
Subject: [PATCH 65/86] Use Sprite::allLayersCount/allLayers() when possible

---
 src/app/cmd/copy_frame.cpp            |  5 ++--
 src/app/commands/cmd_remove_layer.cpp |  2 +-
 src/app/document_range_tests.cpp      | 36 +++++++++++++++++----------
 src/app/file/pixly_format.cpp         | 13 +++++-----
 src/render/quantization.cpp           |  2 +-
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/app/cmd/copy_frame.cpp b/src/app/cmd/copy_frame.cpp
index 531063129..ba3f33465 100644
--- a/src/app/cmd/copy_frame.cpp
+++ b/src/app/cmd/copy_frame.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -41,8 +41,7 @@ void CopyFrame::onExecute()
   if (fromFrame >= m_newFrame)
     ++fromFrame;
 
-  for (int i=0; i<sprite->countLayers(); ++i) {
-    Layer* layer = sprite->layer(i);
+  for (Layer* layer : sprite->allLayers()) {
     if (layer->isImage())  {
       executeAndAdd(new cmd::CopyCel(
           static_cast<LayerImage*>(layer), fromFrame,
diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp
index 17d97ab10..3bba17ccc 100644
--- a/src/app/commands/cmd_remove_layer.cpp
+++ b/src/app/commands/cmd_remove_layer.cpp
@@ -81,7 +81,7 @@ void RemoveLayerCommand::onExecute(Context* context)
       }
     }
     else {
-      if (sprite->countLayers() == 1) {
+      if (sprite->allLayersCount() == 1) {
         ui::Alert::show("Error<<You cannot delete the last layer.||&OK");
         return;
       }
diff --git a/src/app/document_range_tests.cpp b/src/app/document_range_tests.cpp
index f355318a9..48e23364b 100644
--- a/src/app/document_range_tests.cpp
+++ b/src/app/document_range_tests.cpp
@@ -102,8 +102,10 @@ public:
     sprite->setFrameDuration(frame_t(2), 3);
     sprite->setFrameDuration(frame_t(3), 4);
 
+    LayerList layers = sprite->allLayers();
+
     for (int i=0; i<4; i++) {
-      LayerImage* layer = static_cast<LayerImage*>(sprite->indexToLayer(LayerIndex(i)));
+      LayerImage* layer = static_cast<LayerImage*>(layers[i]);
 
       for (int j=0; j<4; j++) {
         Cel* cel = layer->cel(frame_t(j));
@@ -127,19 +129,23 @@ public:
   }
 
 protected:
-  bool expect_layer(Layer* expected_layer, int layer) {
-    return expect_layer_frame(sprite->layerToIndex(expected_layer), -1, layer, -1);
+  bool expect_layer(Layer* expected_layer, layer_t layer) {
+    LayerList layers = sprite->allLayers();
+    return expect_layer_frame(
+      find_layer_index(layers, expected_layer), -1, layer, -1);
   }
 
-  bool expect_frame(int expected_frame, frame_t frame) {
-    for (int i=0; i<(int)sprite->countLayers(); ++i) {
+  bool expect_frame(layer_t expected_frame, frame_t frame) {
+    LayerList layers = sprite->allLayers();
+    for (int i=0; i<(int)layers.size(); ++i) {
       if (!expect_layer_frame(i, expected_frame, i, frame))
         return false;
     }
     return true;
   }
 
-  bool expect_layer_frame(int expected_layer, int expected_frame, int layer, frame_t frame) {
+  bool expect_layer_frame(layer_t expected_layer, frame_t expected_frame,
+                          layer_t layer, frame_t frame) {
     if (frame >= 0) {
       if (!expect_cel(expected_layer, expected_frame, layer, frame))
         return false;
@@ -149,9 +155,10 @@ protected:
     }
 
     if (layer >= 0) {
-      Layer* a = sprite->indexToLayer(LayerIndex(expected_layer));
-      Layer* b = sprite->indexToLayer(LayerIndex(layer));
-      EXPECT_EQ(a, b);
+      LayerList layers = sprite->allLayers();
+      Layer* a = layers[expected_layer];
+      Layer* b = layers[layer];
+      EXPECT_EQ(a->name(), b->name());
       if (a != b)
         return false;
     }
@@ -159,10 +166,12 @@ protected:
     return true;
   }
 
-  bool expect_cel(int expected_layer, int expected_frame, int layer, frame_t frame) {
+  bool expect_cel(layer_t expected_layer, frame_t expected_frame,
+                  layer_t layer, frame_t frame) {
     color_t expected_color = white;
 
-    Cel* cel = sprite->indexToLayer(LayerIndex(layer))->cel(frame);
+    LayerList layers = sprite->allLayers();
+    Cel* cel = layers[layer]->cel(frame);
     if (!cel)
       return false;
 
@@ -175,8 +184,9 @@ protected:
     return (expected_color == color);
   }
 
-  bool expect_empty_cel(int layer, frame_t frame) {
-    Cel* cel = sprite->indexToLayer(LayerIndex(layer))->cel(frame);
+  bool expect_empty_cel(layer_t layer, frame_t frame) {
+    LayerList layers = sprite->allLayers();
+    Cel* cel = layers[layer]->cel(frame);
 
     EXPECT_EQ(NULL, cel);
     return (cel == NULL);
diff --git a/src/app/file/pixly_format.cpp b/src/app/file/pixly_format.cpp
index 9ffc8980c..226c7ce19 100644
--- a/src/app/file/pixly_format.cpp
+++ b/src/app/file/pixly_format.cpp
@@ -138,6 +138,7 @@ bool PixlyFormat::onLoad(FileOp* fop)
     int sheetHeight = sheet->height();
 
     // slice cels from sheet
+    LayerList layers = sprite->allLayers();
     std::vector<int> visible(layerCount, 0);
 
     TiXmlElement* xmlFrame = check(xmlFrames->FirstChild("Frame"))->ToElement();
@@ -147,8 +148,8 @@ bool PixlyFormat::onLoad(FileOp* fop)
 
       int index = check_number<int>(xmlIndex->Attribute("linear"));
       frame_t frame(index / layerCount);
-      LayerIndex layer_index(index % layerCount);
-      Layer *layer = sprite->indexToLayer(layer_index);
+      layer_t layer_index(index % layerCount);
+      Layer* layer = layers[layer_index];
 
       const char * duration = xmlFrame->Attribute("duration");
       if (duration) {
@@ -212,16 +213,14 @@ bool PixlyFormat::onLoad(FileOp* fop)
       fop->setProgress(0.5 + 0.5 * ((float)(index+1) / (float)imageCount));
     }
 
-    for (int i=0; i<layerCount; i++) {
-      LayerIndex layer_index(i);
-      Layer *layer = sprite->indexToLayer(layer_index);
-      layer->setVisible(visible[i] > frameCount/2);
+    for (layer_t i=0; i<layerCount; i++) {
+      layers[i]->setVisible(visible[i] > frameCount/2);
     }
 
     fop->createDocument(sprite);
     sprite.release();
   }
-  catch(Exception &e) {
+  catch(Exception& e) {
     fop->setError((std::string("Pixly file format: ")+std::string(e.what())+"\n").c_str());
     return false;
   }
diff --git a/src/render/quantization.cpp b/src/render/quantization.cpp
index 9c7787d47..aa4299f28 100644
--- a/src/render/quantization.cpp
+++ b/src/render/quantization.cpp
@@ -71,7 +71,7 @@ Palette* create_palette_from_sprite(
     palette,
     // Transparent color is needed if we have transparent layers
     (sprite->backgroundLayer() &&
-     sprite->countLayers() == 1 ? -1: sprite->transparentColor()),
+     sprite->allLayersCount() == 1 ? -1: sprite->transparentColor()),
     delegate);
 
   return palette;

From b0c168a047bd2b25642d3299d67288cd4fd5b367 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 12 Aug 2016 11:27:15 -0300
Subject: [PATCH 66/86] Modify .ase encoder/decoder to avoid LayerIndexes

With this patch we avoid using Sprite::layerToIndex/indexToLayer()
member functions in AseFormat.
---
 src/app/file/ase_format.cpp | 122 +++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 57 deletions(-)

diff --git a/src/app/file/ase_format.cpp b/src/app/file/ase_format.cpp
index fde057835..b611a2b1c 100644
--- a/src/app/file/ase_format.cpp
+++ b/src/app/file/ase_format.cpp
@@ -100,11 +100,12 @@ static void ase_file_read_frame_header(FILE* f, ASE_FrameHeader* frame_header);
 static void ase_file_prepare_frame_header(FILE* f, ASE_FrameHeader* frame_header);
 static void ase_file_write_frame_header(FILE* f, ASE_FrameHeader* frame_header);
 
-static void ase_file_write_layers(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer);
-static void ase_file_write_cels(FILE* f, ASE_FrameHeader* frame_header,
-                                const Sprite* sprite, const Layer* layer,
-                                const frame_t frame,
-                                const frame_t firstFrame);
+static void ase_file_write_layers(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer, int child_level);
+static layer_t ase_file_write_cels(FILE* f, ASE_FrameHeader* frame_header,
+                                   const Sprite* sprite, const Layer* layer,
+                                   layer_t layer_index,
+                                   const frame_t frame,
+                                   const frame_t firstFrame);
 
 static void ase_file_read_padding(FILE* f, int bytes);
 static void ase_file_write_padding(FILE* f, int bytes);
@@ -120,10 +121,12 @@ static Palette* ase_file_read_palette_chunk(FILE* f, Palette* prevPal, frame_t f
 static void ase_file_write_color2_chunk(FILE* f, ASE_FrameHeader* frame_header, const Palette* pal);
 static void ase_file_write_palette_chunk(FILE* f, ASE_FrameHeader* frame_header, const Palette* pal, int from, int to);
 static Layer* ase_file_read_layer_chunk(FILE* f, ASE_Header* header, Sprite* sprite, Layer** previous_layer, int* current_level);
-static void ase_file_write_layer_chunk(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer);
-static Cel* ase_file_read_cel_chunk(FILE* f, Sprite* sprite, frame_t frame, PixelFormat pixelFormat, FileOp* fop, ASE_Header* header, size_t chunk_end);
+static void ase_file_write_layer_chunk(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer, int child_level);
+static Cel* ase_file_read_cel_chunk(FILE* f, Sprite* sprite, LayerList& allLayers, frame_t frame, PixelFormat pixelFormat, FileOp* fop, ASE_Header* header, size_t chunk_end);
 static void ase_file_write_cel_chunk(FILE* f, ASE_FrameHeader* frame_header,
-                                     const Cel* cel, const LayerImage* layer,
+                                     const Cel* cel,
+                                     const LayerImage* layer,
+                                     const layer_t layer_index,
                                      const Sprite* sprite,
                                      const frame_t firstFrame);
 static Mask* ase_file_read_mask_chunk(FILE* f);
@@ -216,6 +219,7 @@ bool AseFormat::onLoad(FileOp* fop)
   Layer* last_layer = sprite->root();
   WithUserData* last_object_with_user_data = nullptr;
   int current_level = -1;
+  LayerList allLayers;
 
   // Read frame by frame to end-of-file
   for (frame_t frame(0); frame<sprite->totalFrames(); ++frame) {
@@ -235,7 +239,7 @@ bool AseFormat::onLoad(FileOp* fop)
 
       // Read chunks
       for (int c=0; c<frame_header.chunks; c++) {
-        /* start chunk position */
+        // Start chunk position
         int chunk_pos = ftell(f);
         fop->setProgress((float)chunk_pos / (float)header.size);
 
@@ -270,16 +274,20 @@ bool AseFormat::onLoad(FileOp* fop)
           }
 
           case ASE_FILE_CHUNK_LAYER: {
-            last_object_with_user_data =
+            Layer* newLayer =
               ase_file_read_layer_chunk(f, &header, sprite,
                                         &last_layer,
                                         &current_level);
+            if (newLayer) {
+              allLayers.push_back(newLayer);
+              last_object_with_user_data = newLayer;
+            }
             break;
           }
 
           case ASE_FILE_CHUNK_CEL: {
             Cel* cel =
-              ase_file_read_cel_chunk(f, sprite, frame,
+              ase_file_read_cel_chunk(f, sprite, allLayers, frame,
                                       sprite->pixelFormat(), fop, &header,
                                       chunk_pos+chunk_size);
             if (cel) {
@@ -428,7 +436,7 @@ bool AseFormat::onSave(FileOp* fop)
     if (frame == fop->roi().fromFrame()) {
       // Write layer chunks
       for (Layer* child : sprite->root()->layers())
-        ase_file_write_layers(f, &frame_header, child);
+        ase_file_write_layers(f, &frame_header, child, 0);
 
       // Writer frame tags
       if (sprite->frameTags().size() > 0)
@@ -440,7 +448,7 @@ bool AseFormat::onSave(FileOp* fop)
     // Write cel chunks
     ase_file_write_cels(f, &frame_header,
                         sprite, sprite->root(),
-                        frame, fop->roi().fromFrame());
+                        0, frame, fop->roi().fromFrame());
 
     // Write the frame header
     ase_file_write_frame_header(f, &frame_header);
@@ -605,32 +613,30 @@ static void ase_file_write_frame_header(FILE* f, ASE_FrameHeader* frame_header)
   fseek(f, end, SEEK_SET);
 }
 
-static void ase_file_write_layers(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer)
+static void ase_file_write_layers(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer, int child_index)
 {
-  ase_file_write_layer_chunk(f, frame_header, layer);
+  ase_file_write_layer_chunk(f, frame_header, layer, child_index);
   if (!layer->userData().isEmpty())
     ase_file_write_user_data_chunk(f, frame_header, &layer->userData());
 
   if (layer->isGroup()) {
     for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers())
-      ase_file_write_layers(f, frame_header, child);
+      ase_file_write_layers(f, frame_header, child, child_index+1);
   }
 }
 
-static void ase_file_write_cels(FILE* f, ASE_FrameHeader* frame_header,
-                                const Sprite* sprite, const Layer* layer,
-                                const frame_t frame,
-                                const frame_t firstFrame)
+static layer_t ase_file_write_cels(FILE* f, ASE_FrameHeader* frame_header,
+                                   const Sprite* sprite, const Layer* layer,
+                                   layer_t layer_index,
+                                   const frame_t frame,
+                                   const frame_t firstFrame)
 {
   if (layer->isImage()) {
     const Cel* cel = layer->cel(frame);
     if (cel) {
-/*       fop->setError("New cel in frame %d, in layer %d\n", */
-/*                   frame, sprite_layer2index(sprite, layer)); */
-
       ase_file_write_cel_chunk(f, frame_header, cel,
                                static_cast<const LayerImage*>(layer),
-                               sprite, firstFrame);
+                               layer_index, sprite, firstFrame);
 
       if (!cel->link() &&
           !cel->data()->userData().isEmpty()) {
@@ -640,10 +646,18 @@ static void ase_file_write_cels(FILE* f, ASE_FrameHeader* frame_header,
     }
   }
 
+  if (layer != sprite->root())
+    ++layer_index;
+
   if (layer->isGroup()) {
-    for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers())
-      ase_file_write_cels(f, frame_header, sprite, child, frame, firstFrame);
+    for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
+      layer_index =
+        ase_file_write_cels(f, frame_header, sprite, child,
+                            layer_index, frame, firstFrame);
+    }
   }
+
+  return layer_index;
 }
 
 static void ase_file_read_padding(FILE* f, int bytes)
@@ -826,25 +840,19 @@ static void ase_file_write_palette_chunk(FILE* f, ASE_FrameHeader* frame_header,
 
 static Layer* ase_file_read_layer_chunk(FILE* f, ASE_Header* header, Sprite* sprite, Layer** previous_layer, int* current_level)
 {
-  std::string name;
-  Layer* layer = NULL;
-  /* read chunk data */
-  int flags;
-  int layer_type;
-  int child_level;
-
-  flags = fgetw(f);
-  layer_type = fgetw(f);
-  child_level = fgetw(f);
+  // Read chunk data
+  int flags = fgetw(f);
+  int layer_type = fgetw(f);
+  int child_level = fgetw(f);
   fgetw(f);                     // default width
   fgetw(f);                     // default height
   int blendmode = fgetw(f);     // blend mode
   int opacity = fgetc(f);       // opacity
-
   ase_file_read_padding(f, 3);
-  name = ase_file_read_string(f);
+  std::string name = ase_file_read_string(f);
 
   // Image layer
+  Layer* layer;
   if (layer_type == 0) {
     layer = new LayerImage(sprite);
 
@@ -859,6 +867,9 @@ static Layer* ase_file_read_layer_chunk(FILE* f, ASE_Header* header, Sprite* spr
   else if (layer_type == 1) {
     layer = new LayerGroup(sprite);
   }
+  else {
+    layer = nullptr;
+  }
 
   if (layer) {
     // flags
@@ -882,7 +893,7 @@ static Layer* ase_file_read_layer_chunk(FILE* f, ASE_Header* header, Sprite* spr
   return layer;
 }
 
-static void ase_file_write_layer_chunk(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer)
+static void ase_file_write_layer_chunk(FILE* f, ASE_FrameHeader* frame_header, const Layer* layer, int child_level)
 {
   ChunkWriter chunk(f, frame_header, ASE_FILE_CHUNK_LAYER);
 
@@ -893,12 +904,6 @@ static void ase_file_write_layer_chunk(FILE* f, ASE_FrameHeader* frame_header, c
   fputw(layer->isImage() ? 0: (layer->isGroup() ? 1: -1), f);
 
   // Layer child level
-  LayerGroup* parent = layer->parent();
-  int child_level = -1;
-  while (parent != NULL) {
-    child_level++;
-    parent = parent->parent();
-  }
   fputw(child_level, f);
 
   // Default width & height, and blend mode
@@ -907,13 +912,11 @@ static void ase_file_write_layer_chunk(FILE* f, ASE_FrameHeader* frame_header, c
   fputw(layer->isImage() ? (int)static_cast<const LayerImage*>(layer)->blendMode(): 0, f);
   fputc(layer->isImage() ? (int)static_cast<const LayerImage*>(layer)->opacity(): 0, f);
 
-  // padding
+  // Padding
   ase_file_write_padding(f, 3);
 
-  /* layer name */
+  // Layer name
   ase_file_write_string(f, layer->name());
-
-  /* fop->setError("Layer name \"%s\" child level: %d\n", layer->name, child_level); */
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -1180,21 +1183,25 @@ static void write_compressed_image(FILE* f, const Image* image)
 // Cel Chunk
 //////////////////////////////////////////////////////////////////////
 
-static Cel* ase_file_read_cel_chunk(FILE* f, Sprite* sprite, frame_t frame,
+static Cel* ase_file_read_cel_chunk(FILE* f,
+                                    Sprite* sprite,
+                                    LayerList& allLayers,
+                                    frame_t frame,
                                     PixelFormat pixelFormat,
                                     FileOp* fop, ASE_Header* header, size_t chunk_end)
 {
-  /* read chunk data */
-  LayerIndex layer_index = LayerIndex(fgetw(f));
+  // Read chunk data
+  layer_t layer_index = fgetw(f);
   int x = ((short)fgetw(f));
   int y = ((short)fgetw(f));
   int opacity = fgetc(f);
   int cel_type = fgetw(f);
-  Layer* layer;
-
   ase_file_read_padding(f, 7);
 
-  layer = sprite->indexToLayer(layer_index);
+  Layer* layer = nullptr;
+  if (layer_index >= 0 && layer_index < layer_t(allLayers.size()))
+    layer = allLayers[layer_index];
+
   if (!layer) {
     fop->setError("Frame %d didn't found layer with index %d\n",
                   (int)frame, (int)layer_index);
@@ -1317,13 +1324,14 @@ static Cel* ase_file_read_cel_chunk(FILE* f, Sprite* sprite, frame_t frame,
 }
 
 static void ase_file_write_cel_chunk(FILE* f, ASE_FrameHeader* frame_header,
-                                     const Cel* cel, const LayerImage* layer,
+                                     const Cel* cel,
+                                     const LayerImage* layer,
+                                     const layer_t layer_index,
                                      const Sprite* sprite,
                                      const frame_t firstFrame)
 {
   ChunkWriter chunk(f, frame_header, ASE_FILE_CHUNK_CEL);
 
-  int layer_index = sprite->layerToIndex(layer);
   const Cel* link = cel->link();
 
   // In case the original link is outside the ROI, we've to find the

From 906d76ad4161c7925db2a03b70e82cf8efd3ccd3 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 12 Aug 2016 13:08:22 -0300
Subject: [PATCH 67/86] Add SelectedFrames::displace() member function

We have plans to include a SelectedFrames in DocumentRange to select
non-adjacent frames. This member function will be useful to displace
those frames.
---
 src/doc/selected_frames.cpp | 11 +++++++++++
 src/doc/selected_frames.h   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/doc/selected_frames.cpp b/src/doc/selected_frames.cpp
index 1a32d0755..c3d1c4341 100644
--- a/src/doc/selected_frames.cpp
+++ b/src/doc/selected_frames.cpp
@@ -86,4 +86,15 @@ bool SelectedFrames::contains(frame_t frame) const
     });
 }
 
+void SelectedFrames::displace(frame_t frameDelta)
+{
+  for (auto& range : m_ranges) {
+    range.fromFrame += frameDelta;
+    range.toFrame += frameDelta;
+
+    ASSERT(range.fromFrame >= 0);
+    ASSERT(range.toFrame >= 0);
+  }
+}
+
 } // namespace doc
diff --git a/src/doc/selected_frames.h b/src/doc/selected_frames.h
index 7516217a4..56967c76f 100644
--- a/src/doc/selected_frames.h
+++ b/src/doc/selected_frames.h
@@ -130,6 +130,7 @@ namespace doc {
     frame_t firstFrame() const { return (!m_ranges.empty() ? m_ranges.front().fromFrame: -1); }
     frame_t lastFrame() const { return (!m_ranges.empty() ? m_ranges.back().toFrame: -1); }
 
+    void displace(frame_t frameDelta);
     Reversed reversed() const { return Reversed(*this); }
 
     bool operator==(const SelectedFrames& o) const {

From 5a2ee4fe1b3aaf0154eed9dec4275c8f2cbbc0e9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 12 Aug 2016 13:11:37 -0300
Subject: [PATCH 68/86] Avoid layerToIndex/indexToLayer() in DocumentApi + some
 tests

---
 src/app/document_api.cpp       |  21 +++++--
 src/app/document_api_tests.cpp | 104 ++++++++++++++++++++++++++++++---
 2 files changed, 111 insertions(+), 14 deletions(-)

diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 75f7b33c7..776749925 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -424,15 +424,25 @@ void DocumentApi::removeLayer(Layer* layer)
 
 void DocumentApi::restackLayerAfter(Layer* layer, Layer* afterThis)
 {
+  if (layer == afterThis)
+    return;
+
   m_transaction.execute(new cmd::MoveLayer(layer, layer->parent(), afterThis));
 }
 
 void DocumentApi::restackLayerBefore(Layer* layer, Layer* beforeThis)
 {
-  LayerIndex beforeThisIdx = layer->sprite()->layerToIndex(beforeThis);
-  LayerIndex afterThisIdx = beforeThisIdx.previous();
+  if (layer == beforeThis)
+    return;
 
-  restackLayerAfter(layer, layer->sprite()->indexToLayer(afterThisIdx));
+  Layer* afterThis;
+
+  if (beforeThis)
+    afterThis = beforeThis->getPrevious();
+  else
+    afterThis = layer->sprite()->root()->lastLayer();
+
+  restackLayerAfter(layer, afterThis);
 }
 
 void DocumentApi::backgroundFromLayer(Layer* layer)
@@ -466,10 +476,9 @@ void DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
 
 void DocumentApi::duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer)
 {
-  LayerIndex beforeThisIdx = sourceLayer->sprite()->layerToIndex(beforeLayer);
-  LayerIndex afterThisIdx = beforeThisIdx.previous();
+  Layer* afterThis = (beforeLayer ? beforeLayer->getPreviousInWholeHierarchy(): nullptr);
 
-  duplicateLayerAfter(sourceLayer, sourceLayer->sprite()->indexToLayer(afterThisIdx));
+  duplicateLayerAfter(sourceLayer, afterThis);
 }
 
 Cel* DocumentApi::addCel(LayerImage* layer, frame_t frameNumber, const ImageRef& image)
diff --git a/src/app/document_api_tests.cpp b/src/app/document_api_tests.cpp
index 5902ac2ac..7e4269ed6 100644
--- a/src/app/document_api_tests.cpp
+++ b/src/app/document_api_tests.cpp
@@ -22,13 +22,103 @@ using namespace doc;
 
 typedef base::UniquePtr<app::Document> DocumentPtr;
 
-TEST(DocumentApi, MoveCel) {
-  TestContextT<app::Context> ctx;
-  DocumentPtr doc(static_cast<app::Document*>(ctx.documents().add(32, 16)));
-  Sprite* sprite = doc->sprite();
-  LayerImage* layer1 = dynamic_cast<LayerImage*>(sprite->root()->firstLayer());
-  LayerImage* layer2 = new LayerImage(sprite);
+class BasicDocApiTest : public ::testing::Test {
+public:
+  BasicDocApiTest() :
+    doc((static_cast<app::Document*>(ctx.documents().add(32, 16)))),
+    sprite(doc->sprite()),
+    root(sprite->root()),
+    layer1(dynamic_cast<LayerImage*>(sprite->root()->firstLayer())),
+    layer2(new LayerImage(sprite)),
+    layer3(new LayerImage(sprite))
+  {
+    root->addLayer(layer2);
+    root->addLayer(layer3);
+  }
 
+  ~BasicDocApiTest() {
+    doc->close();
+  }
+
+  TestContextT<app::Context> ctx;
+  DocumentPtr doc;
+  Sprite* sprite;
+  LayerGroup* root;
+  LayerImage* layer1;
+  LayerImage* layer2;
+  LayerImage* layer3;
+};
+
+TEST_F(BasicDocApiTest, RestackLayerBefore)
+{
+  EXPECT_EQ(layer1, root->firstLayer());
+  {
+    Transaction transaction(&ctx, "");
+    // Do nothing
+    doc->getApi(transaction).restackLayerBefore(layer1, layer1);
+    EXPECT_EQ(layer1, root->firstLayer());
+    EXPECT_EQ(layer2, root->firstLayer()->getNext());
+    EXPECT_EQ(layer3, root->firstLayer()->getNext()->getNext());
+    // Rollback
+  }
+
+  EXPECT_EQ(layer1, root->firstLayer());
+  {
+    Transaction transaction(&ctx, "");
+    doc->getApi(transaction).restackLayerBefore(layer1, layer3);
+    EXPECT_EQ(layer2, root->firstLayer());
+    EXPECT_EQ(layer1, root->firstLayer()->getNext());
+    EXPECT_EQ(layer3, root->firstLayer()->getNext()->getNext());
+    // Rollback
+  }
+
+  EXPECT_EQ(layer1, root->firstLayer());
+  {
+    Transaction transaction(&ctx, "");
+    doc->getApi(transaction).restackLayerBefore(layer1, nullptr);
+    EXPECT_EQ(layer2, root->firstLayer());
+    EXPECT_EQ(layer3, root->firstLayer()->getNext());
+    EXPECT_EQ(layer1, root->firstLayer()->getNext()->getNext());
+    // Rollback
+  }
+}
+
+TEST_F(BasicDocApiTest, RestackLayerAfter)
+{
+  EXPECT_EQ(layer1, root->firstLayer());
+  {
+    Transaction transaction(&ctx, "");
+    // Do nothing
+    doc->getApi(transaction).restackLayerAfter(layer1, layer1);
+    EXPECT_EQ(layer1, root->firstLayer());
+    EXPECT_EQ(layer2, root->firstLayer()->getNext());
+    EXPECT_EQ(layer3, root->firstLayer()->getNext()->getNext());
+    // Rollback
+  }
+
+  EXPECT_EQ(layer1, root->firstLayer());
+  {
+    Transaction transaction(&ctx, "");
+    doc->getApi(transaction).restackLayerAfter(layer1, layer3);
+    EXPECT_EQ(layer2, root->firstLayer());
+    EXPECT_EQ(layer3, root->firstLayer()->getNext());
+    EXPECT_EQ(layer1, root->firstLayer()->getNext()->getNext());
+    // Rollback
+  }
+
+  EXPECT_EQ(layer1, root->firstLayer());
+  {
+    Transaction transaction(&ctx, "");
+    doc->getApi(transaction).restackLayerAfter(layer3, nullptr);
+    EXPECT_EQ(layer3, root->firstLayer());
+    EXPECT_EQ(layer1, root->firstLayer()->getNext());
+    EXPECT_EQ(layer2, root->firstLayer()->getNext()->getNext());
+    // Rollback
+  }
+}
+
+TEST_F(BasicDocApiTest, MoveCel)
+{
   Cel* cel1 = layer1->cel(frame_t(0));
   cel1->setPosition(2, -2);
   cel1->setOpacity(128);
@@ -61,6 +151,4 @@ TEST(DocumentApi, MoveCel) {
   EXPECT_EQ(2, cel2->x());
   EXPECT_EQ(-2, cel2->y());
   EXPECT_EQ(128, cel2->opacity());
-
-  doc->close();
 }

From 8971c8857a398054791d163a8a8aecbebeda73a9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 12 Aug 2016 14:21:15 -0300
Subject: [PATCH 69/86] Remove Sprite::countLayers() member function

---
 src/app/commands/cmd_remove_layer.cpp | 2 +-
 src/doc/sprite.cpp                    | 5 -----
 src/doc/sprite.h                      | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp
index 3bba17ccc..2c1723e7e 100644
--- a/src/app/commands/cmd_remove_layer.cpp
+++ b/src/app/commands/cmd_remove_layer.cpp
@@ -71,7 +71,7 @@ void RemoveLayerCommand::onExecute(Context* context)
           ++deletedTopLevelLayers;
       }
 
-      if (deletedTopLevelLayers == sprite->countLayers()) {
+      if (deletedTopLevelLayers == sprite->root()->layersCount()) {
         ui::Alert::show("Error<<You cannot delete all layers.||&OK");
         return;
       }
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index e85d6f9cc..d94034186 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -212,11 +212,6 @@ LayerImage* Sprite::backgroundLayer() const
   return NULL;
 }
 
-LayerIndex Sprite::countLayers() const
-{
-  return LayerIndex(root()->layersCount());
-}
-
 LayerIndex Sprite::firstLayer() const
 {
   return LayerIndex(0);
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index b2c3e1241..577c4b3bc 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -92,7 +92,6 @@ namespace doc {
     LayerGroup* root() const { return m_root; }
     LayerImage* backgroundLayer() const;
 
-    LayerIndex countLayers() const;
     LayerIndex firstLayer() const;
     Layer* firstBrowsableLayer() const;
     LayerIndex lastLayer() const;

From 36719da7b2c362a87d91638798190171193262c9 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 12 Aug 2016 17:59:33 -0300
Subject: [PATCH 70/86] Convert SelectedLayers into a class

---
 src/app/commands/cmd_new_frame.cpp    |  2 +-
 src/app/commands/cmd_new_layer.cpp    |  4 +-
 src/app/commands/cmd_remove_layer.cpp |  4 +-
 src/doc/selected_layers.cpp           | 93 ++++++++++++++-------------
 src/doc/selected_layers.h             | 43 +++++++++++--
 5 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/src/app/commands/cmd_new_frame.cpp b/src/app/commands/cmd_new_frame.cpp
index ed0f4cb68..70c277856 100644
--- a/src/app/commands/cmd_new_frame.cpp
+++ b/src/app/commands/cmd_new_frame.cpp
@@ -118,7 +118,7 @@ void NewFrameCommand::onExecute(Context* context)
 
           SelectedLayers selLayers;
           if (site->inFrames())
-            select_all_layers(writer.sprite()->root(), selLayers);
+            selLayers.selectAllLayers(writer.sprite()->root());
           else
             selLayers = site->selectedLayers();
 
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 7136370ba..03a8b1045 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -143,7 +143,7 @@ void NewLayerCommand::onExecute(Context* context)
       // Put all selected layers inside the group
       if (m_group && writer.site()->inTimeline()) {
         LayerGroup* commonParent = nullptr;
-        std::size_t sameParents = 0;
+        layer_t sameParents = 0;
         for (Layer* l : selLayers) {
           if (!commonParent ||
               commonParent == l->parent()) {
@@ -153,7 +153,7 @@ void NewLayerCommand::onExecute(Context* context)
         }
 
         if (sameParents == selLayers.size()) {
-          for (Layer* newChild : convert_selected_layers_into_layer_list(selLayers)) {
+          for (Layer* newChild : selLayers.toLayerList()) {
             transaction.execute(
               new cmd::MoveLayer(newChild, layer,
                                  static_cast<LayerGroup*>(layer)->lastLayer()));
diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp
index 2c1723e7e..9cb12d210 100644
--- a/src/app/commands/cmd_remove_layer.cpp
+++ b/src/app/commands/cmd_remove_layer.cpp
@@ -63,9 +63,9 @@ void RemoveLayerCommand::onExecute(Context* context)
     if (site->inTimeline() &&
         !site->selectedLayers().empty()) {
       SelectedLayers selLayers = site->selectedLayers();
-      remove_children_if_parent_is_selected(selLayers);
+      selLayers.removeChildrenIfParentIsSelected();
 
-      int deletedTopLevelLayers = 0;
+      layer_t deletedTopLevelLayers = 0;
       for (Layer* layer : selLayers) {
         if (layer->parent() == sprite->root())
           ++deletedTopLevelLayers;
diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
index 7af4fd653..5308f8a8e 100644
--- a/src/doc/selected_layers.cpp
+++ b/src/doc/selected_layers.cpp
@@ -15,14 +15,50 @@
 
 namespace doc {
 
-void remove_children_if_parent_is_selected(SelectedLayers& layers)
+bool SelectedLayers::contains(Layer* layer) const
+{
+  return m_set.find(layer) != m_set.end();
+}
+
+bool SelectedLayers::hasSameParent() const
+{
+  Layer* parent = nullptr;
+  for (auto layer : *this) {
+    if (parent) {
+      if (layer->parent() != parent)
+        return false;
+    }
+    else
+      parent = layer->parent();
+  }
+  return true;
+}
+
+LayerList SelectedLayers::toLayerList() const
+{
+  LayerList output;
+
+  if (empty())
+    return output;
+
+  for (Layer* layer = (*begin())->sprite()->firstBrowsableLayer();
+       layer != nullptr;
+       layer = layer->getNextInWholeHierarchy()) {
+    if (contains(layer))
+      output.push_back(layer);
+  }
+
+  return output;
+}
+
+void SelectedLayers::removeChildrenIfParentIsSelected()
 {
   SelectedLayers removeThese;
 
-  for (Layer* child : layers) {
+  for (Layer* child : *this) {
     Layer* parent = child->parent();
     while (parent) {
-      if (layers.find(parent) != layers.end()) {
+      if (contains(parent)) {
         removeThese.insert(child);
         break;
       }
@@ -30,42 +66,23 @@ void remove_children_if_parent_is_selected(SelectedLayers& layers)
     }
   }
 
-  for (Layer* child : removeThese) {
-    layers.erase(child);
-  }
+  for (Layer* child : removeThese)
+    erase(child);
 }
 
-void select_all_layers(LayerGroup* group, SelectedLayers& layers)
+void SelectedLayers::selectAllLayers(LayerGroup* group)
 {
   for (Layer* layer : group->layers()) {
     if (layer->isGroup())
-      select_all_layers(static_cast<LayerGroup*>(layer), layers);
-    layers.insert(layer);
+      selectAllLayers(static_cast<LayerGroup*>(layer));
+    insert(layer);
   }
 }
 
-LayerList convert_selected_layers_into_layer_list(const SelectedLayers& layers)
+void SelectedLayers::displace(layer_t layerDelta)
 {
-  LayerList output;
-
-  if (layers.empty())
-    return output;
-
-  for (Layer* layer = (*layers.begin())->sprite()->firstBrowsableLayer();
-       layer != nullptr;
-       layer = layer->getNextInWholeHierarchy()) {
-    if (layers.find(layer) != layers.end()) {
-      output.push_back(layer);
-    }
-  }
-
-  return output;
-}
-
-void displace_selected_layers(SelectedLayers& layers, layer_t layerDelta)
-{
-  const SelectedLayers original = layers;
-  layers.clear();
+  const SelectedLayers original = *this;
+  clear();
 
   for (auto it : original) {
     Layer* layer = it;
@@ -81,22 +98,8 @@ void displace_selected_layers(SelectedLayers& layers, layer_t layerDelta)
     }
 
     if (layer)
-      layers.insert(layer);
+      insert(layer);
   }
 }
 
-bool have_layers_same_parent(const SelectedLayers& layers)
-{
-  Layer* parent = nullptr;
-  for (auto layer : layers) {
-    if (parent) {
-      if (layer->parent() != parent)
-        return false;
-    }
-    else
-      parent = layer->parent();
-  }
-  return true;
-}
-
 } // namespace doc
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
index 91067cd31..f242363ec 100644
--- a/src/doc/selected_layers.h
+++ b/src/doc/selected_layers.h
@@ -16,14 +16,43 @@ namespace doc {
   class Layer;
   class LayerGroup;
 
-  // TODO convert this into a new class
-  typedef std::set<Layer*> SelectedLayers;
+  class SelectedLayers {
+  public:
+    typedef std::set<Layer*> Set;
+    typedef Set::iterator iterator;
+    typedef Set::const_iterator const_iterator;
 
-  void remove_children_if_parent_is_selected(SelectedLayers& layers);
-  void select_all_layers(LayerGroup* group, SelectedLayers& layers);
-  LayerList convert_selected_layers_into_layer_list(const SelectedLayers& layers);
-  void displace_selected_layers(SelectedLayers& layers, layer_t layerDelta);
-  bool have_layers_same_parent(const SelectedLayers& layers);
+    iterator begin() { return m_set.begin(); }
+    iterator end() { return m_set.end(); }
+    const_iterator begin() const { return m_set.begin(); }
+    const_iterator end() const { return m_set.end(); }
+
+    bool empty() const { return m_set.empty(); }
+    layer_t size() const { return m_set.size(); }
+
+    void clear() { m_set.clear(); }
+    void insert(Layer* layer) { m_set.insert(layer); }
+    void erase(Layer* layer) { m_set.erase(layer); }
+
+    bool contains(Layer* layer) const;
+    bool hasSameParent() const;
+    LayerList toLayerList() const;
+
+    void removeChildrenIfParentIsSelected();
+    void selectAllLayers(LayerGroup* group);
+    void displace(layer_t layerDelta);
+
+    bool operator==(const SelectedLayers& o) const {
+      return m_set == o.m_set;
+    }
+
+    bool operator!=(const SelectedLayers& o) const {
+      return !operator==(o);
+    }
+
+  private:
+    Set m_set;
+  };
 
 } // namespace doc
 

From eb43fa93bde879a0d1e7b60cbb97b6bf4c9c9516 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 19 Aug 2016 18:51:15 -0300
Subject: [PATCH 71/86] Fix crash if the last layer index saved in the doc
 preferences is out of bounds

---
 src/app/ui/editor/editor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index 868f32feb..75adcfddb 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -193,7 +193,7 @@ Editor::Editor(Document* document, EditorFlags flags)
 
     LayerList layers = m_sprite->allBrowsableLayers();
     layer_t layerIndex = m_docPref.site.layer();
-    if (layerIndex >= 0 && layerIndex <= int(layers.size()))
+    if (layerIndex >= 0 && layerIndex < int(layers.size()))
       setLayer(layers[layerIndex]);
   }
 

From b4d423051ee5104ae3c939bc0b175e594de37f7b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Sat, 20 Aug 2016 12:54:36 -0300
Subject: [PATCH 72/86] Improve error reporting on DocumentRange tests

---
 src/app/document_range_tests.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/app/document_range_tests.cpp b/src/app/document_range_tests.cpp
index 48e23364b..49fa6affb 100644
--- a/src/app/document_range_tests.cpp
+++ b/src/app/document_range_tests.cpp
@@ -39,10 +39,10 @@ typedef base::UniquePtr<app::Document> DocumentPtr;
   EXPECT_TRUE(expect_layer(d, 3));
 
 #define EXPECT_FRAME_ORDER(a, b, c, d) \
-  EXPECT_TRUE(expect_frame(a, 0));     \
-  EXPECT_TRUE(expect_frame(b, 1));     \
-  EXPECT_TRUE(expect_frame(c, 2));     \
-  EXPECT_TRUE(expect_frame(d, 3));
+  EXPECT_TRUE(expect_frame(a, 0) &&    \
+              expect_frame(b, 1) &&    \
+              expect_frame(c, 2) &&    \
+              expect_frame(d, 3));
 
 #define EXPECT_FRAME_COPY1(a, b, c, d, e) \
   EXPECT_TRUE(expect_frame(a, 0));        \
@@ -77,8 +77,7 @@ typedef base::UniquePtr<app::Document> DocumentPtr;
 class DocRangeOps : public ::testing::Test {
 public:
   DocRangeOps() {
-    black = rgba(0, 0, 0, 0);
-    white = rgba(255, 255, 255, 255);
+    expected_color = rgba(255, 255, 255, 255);
 
     doc.reset(static_cast<app::Document*>(ctx.documents().add(4, 4)));
     sprite = doc->sprite();
@@ -118,8 +117,8 @@ public:
           layer->addCel(cel);
         }
 
-        clear_image(image.get(), black);
-        put_pixel(image.get(), i, j, white);
+        clear_image(image.get(), i + j*100);
+        put_pixel(image.get(), i, j, expected_color);
       }
     }
   }
@@ -168,8 +167,6 @@ protected:
 
   bool expect_cel(layer_t expected_layer, frame_t expected_frame,
                   layer_t layer, frame_t frame) {
-    color_t expected_color = white;
-
     LayerList layers = sprite->allLayers();
     Cel* cel = layers[layer]->cel(frame);
     if (!cel)
@@ -179,7 +176,9 @@ protected:
       cel->image(),
       expected_layer, expected_frame);
 
-    EXPECT_EQ(expected_color, color);
+    EXPECT_EQ(expected_color, color)
+      << " - expecting layer " << expected_layer << " in " << layer << " and it is " << int(color%100) << "\n"
+      << " - expecting frame " << expected_frame << " in " << frame << " and it is " << int(color/100);
 
     return (expected_color == color);
   }
@@ -199,8 +198,7 @@ protected:
   LayerImage* layer2;
   LayerImage* layer3;
   LayerImage* layer4;
-  color_t black;
-  color_t white;
+  color_t expected_color;
 };
 
 inline DocumentRange range(Layer* fromLayer, frame_t fromFrNum, Layer* toLayer, frame_t toFrNum, DocumentRange::Type type) {

From 356d88b4130656393a6ee642a46d04d5d20aefc8 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 23 Aug 2016 13:50:35 -0300
Subject: [PATCH 73/86] Fix crash in SelectedLayers::displace() when layerDelta
 is out of bounds

---
 src/doc/selected_layers.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
index 5308f8a8e..ee0074e6f 100644
--- a/src/doc/selected_layers.cpp
+++ b/src/doc/selected_layers.cpp
@@ -81,7 +81,13 @@ void SelectedLayers::selectAllLayers(LayerGroup* group)
 
 void SelectedLayers::displace(layer_t layerDelta)
 {
+  // Do nothing case
+  if (layerDelta == 0)
+    return;
+
   const SelectedLayers original = *this;
+
+retry:;
   clear();
 
   for (auto it : original) {
@@ -97,8 +103,20 @@ void SelectedLayers::displace(layer_t layerDelta)
       }
     }
 
-    if (layer)
+    if (layer) {
       insert(layer);
+    }
+    // If some layer is outside the range it means that the delta is
+    // too big (out of bounds), we reduce the delta and try again the
+    // whole process.
+    else {
+      layerDelta -= SGN(layerDelta);
+      if (layerDelta == 0) {
+        m_set = original.m_set;
+        break;
+      }
+      goto retry;
+    }
   }
 }
 

From 01af7870adfde7f6bc7777e55bfa4630ac86c334 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 23 Aug 2016 13:54:49 -0300
Subject: [PATCH 74/86] Add TRACE_CMD to avoid trace output for each Cmd

---
 src/app/cmd.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/cmd.cpp b/src/app/cmd.cpp
index f44727755..00eecc2a3 100644
--- a/src/app/cmd.cpp
+++ b/src/app/cmd.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -13,6 +13,9 @@
 
 #include <typeinfo>
 
+// Uncomment this in case you want to check what Cmd is being executed on each step
+//#define TRACE_CMD
+
 namespace app {
 
 Cmd::Cmd()
@@ -28,7 +31,9 @@ Cmd::~Cmd()
 
 void Cmd::execute(Context* ctx)
 {
+#if TRACE_CMD
   TRACE("Cmd: Executing cmd '%s'\n", typeid(*this).name());
+#endif
   ASSERT(m_state == State::NotExecuted);
 
   m_ctx = ctx;
@@ -43,7 +48,9 @@ void Cmd::execute(Context* ctx)
 
 void Cmd::undo()
 {
+#if TRACE_CMD
   TRACE("Cmd: Undo cmd '%s'\n", typeid(*this).name());
+#endif
   ASSERT(m_state == State::Executed || m_state == State::Redone);
 
   onUndo();
@@ -56,7 +63,9 @@ void Cmd::undo()
 
 void Cmd::redo()
 {
+#if TRACE_CMD
   TRACE("Cmd: Redo cmd '%s'\n", typeid(*this).name());
+#endif
   ASSERT(m_state == State::Undone);
 
   onRedo();

From 8bc614979840d4aa65f441796efa497c2dac411a Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 23 Aug 2016 15:12:24 -0300
Subject: [PATCH 75/86] Add extra checks to SelectedLayers/Frames

---
 src/doc/selected_frames.cpp |  6 ++++++
 src/doc/selected_layers.cpp | 19 +++++++++++++++++++
 src/doc/selected_layers.h   |  6 +++---
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/doc/selected_frames.cpp b/src/doc/selected_frames.cpp
index c3d1c4341..64639bf8a 100644
--- a/src/doc/selected_frames.cpp
+++ b/src/doc/selected_frames.cpp
@@ -29,6 +29,8 @@ void SelectedFrames::clear()
 
 void SelectedFrames::insert(frame_t frame)
 {
+  ASSERT(frame >= 0);
+
   if (m_ranges.empty()) {
     m_ranges.push_back(FrameRange(frame));
     return;
@@ -88,6 +90,10 @@ bool SelectedFrames::contains(frame_t frame) const
 
 void SelectedFrames::displace(frame_t frameDelta)
 {
+  // Avoid setting negative numbers in frame ranges
+  if (firstFrame()+frameDelta < 0)
+    frameDelta = -firstFrame();
+
   for (auto& range : m_ranges) {
     range.fromFrame += frameDelta;
     range.toFrame += frameDelta;
diff --git a/src/doc/selected_layers.cpp b/src/doc/selected_layers.cpp
index ee0074e6f..c86f53e4c 100644
--- a/src/doc/selected_layers.cpp
+++ b/src/doc/selected_layers.cpp
@@ -15,6 +15,22 @@
 
 namespace doc {
 
+void SelectedLayers::clear()
+{
+  m_set.clear();
+}
+
+void SelectedLayers::insert(Layer* layer)
+{
+  ASSERT(layer);
+  m_set.insert(layer);
+}
+
+void SelectedLayers::erase(Layer* layer)
+{
+  m_set.erase(layer);
+}
+
 bool SelectedLayers::contains(Layer* layer) const
 {
   return m_set.find(layer) != m_set.end();
@@ -41,6 +57,9 @@ LayerList SelectedLayers::toLayerList() const
   if (empty())
     return output;
 
+  ASSERT(*begin());
+  ASSERT((*begin())->sprite());
+
   for (Layer* layer = (*begin())->sprite()->firstBrowsableLayer();
        layer != nullptr;
        layer = layer->getNextInWholeHierarchy()) {
diff --git a/src/doc/selected_layers.h b/src/doc/selected_layers.h
index f242363ec..7d2a4ed2f 100644
--- a/src/doc/selected_layers.h
+++ b/src/doc/selected_layers.h
@@ -30,9 +30,9 @@ namespace doc {
     bool empty() const { return m_set.empty(); }
     layer_t size() const { return m_set.size(); }
 
-    void clear() { m_set.clear(); }
-    void insert(Layer* layer) { m_set.insert(layer); }
-    void erase(Layer* layer) { m_set.erase(layer); }
+    void clear();
+    void insert(Layer* layer);
+    void erase(Layer* layer);
 
     bool contains(Layer* layer) const;
     bool hasSameParent() const;

From f2f1c1008b672e54c515b2fd19a52cecd5475b45 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 12:31:00 -0300
Subject: [PATCH 76/86] Add support to move/copy non-adjacent layers/frames

Changes:
* With this patch we finally removed the LayerIndex class and member
  functions to access layers by index (like Sprite::firstLayer/layerLayer
  /layer/indexToLayer/layerToIndex() etc.). As layer groups can be
  expanded/collapsed, it doesn't make sense to use layer index to
  access layers directly from sprite.
* Now we use a layer_t (int) to access a list of browsable layers each
  time we want to iterate visible layers in the timeline.
* Replaced CelsRange() and Sprite::uniqueCels() param with
  SelectedFrames to iterate non-adjacent cels.
* Updated clipboard operations (copy/paste) in timeline to support
  layer groups.
* Updated Timeline control to support selecting multiple layer/frame
  ranges with Ctrl+ or Alt+click (fix #1157)
* Added more test units for DocumentRange operations (mainly for
  non-adjacent ranges).
---
 src/app/commands/cmd_cel_properties.cpp      |  10 +-
 src/app/commands/cmd_export_sprite_sheet.cpp |  11 +-
 src/app/commands/cmd_new_frame_tag.cpp       |   4 +-
 src/app/commands/cmd_set_loop_section.cpp    |   4 +-
 src/app/document_api.cpp                     |  37 +-
 src/app/document_api.h                       |   4 +-
 src/app/document_range.cpp                   | 166 ++--
 src/app/document_range.h                     |  65 +-
 src/app/document_range_ops.cpp               | 528 ++++++------
 src/app/document_range_tests.cpp             | 854 +++++++++++++------
 src/app/ui/status_bar.h                      |   1 -
 src/app/ui/timeline.cpp                      | 363 ++++----
 src/app/ui/timeline.h                        | 162 ++--
 src/app/util/clipboard.cpp                   | 167 ++--
 src/app/util/range_utils.cpp                 |  10 +-
 src/doc/CMakeLists.txt                       |   1 -
 src/doc/cels_range.cpp                       |  41 +-
 src/doc/cels_range.h                         |  16 +-
 src/doc/layer.cpp                            |  11 +-
 src/doc/layer_index.cpp                      |  17 -
 src/doc/layer_index.h                        |  54 --
 src/doc/sprite.cpp                           |  91 +-
 src/doc/sprite.h                             |  11 +-
 23 files changed, 1471 insertions(+), 1157 deletions(-)
 delete mode 100644 src/doc/layer_index.cpp
 delete mode 100644 src/doc/layer_index.h

diff --git a/src/app/commands/cmd_cel_properties.cpp b/src/app/commands/cmd_cel_properties.cpp
index 533228810..7b9273497 100644
--- a/src/app/commands/cmd_cel_properties.cpp
+++ b/src/app/commands/cmd_cel_properties.cpp
@@ -108,9 +108,8 @@ private:
     else if (m_range.enabled()) {
       Sprite* sprite = m_document->sprite();
       int count = 0;
-      for (Cel* cel : sprite->uniqueCels(m_range.frameBegin(),
-                                         m_range.frameEnd())) {
-        if (m_range.inRange(sprite->layerToIndex(cel->layer()))) {
+      for (Cel* cel : sprite->uniqueCels(m_range.selectedFrames())) {
+        if (m_range.contains(cel->layer())) {
           if (backgroundCount && cel->layer()->isBackground())
             ++(*backgroundCount);
           ++count;
@@ -186,9 +185,8 @@ private:
         }
         else if (m_range.enabled()) {
           Sprite* sprite = m_document->sprite();
-          for (Cel* cel : sprite->uniqueCels(m_range.frameBegin(),
-                                             m_range.frameEnd())) {
-            if (m_range.inRange(sprite->layerToIndex(cel->layer()))) {
+          for (Cel* cel : sprite->uniqueCels(m_range.selectedFrames())) {
+            if (m_range.contains(cel->layer())) {
               if (!cel->layer()->isBackground() && newOpacity != cel->opacity()) {
                 transaction.execute(new cmd::SetCelOpacity(cel, newOpacity));
               }
diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp
index 99699e72c..6a200ac6a 100644
--- a/src/app/commands/cmd_export_sprite_sheet.cpp
+++ b/src/app/commands/cmd_export_sprite_sheet.cpp
@@ -164,7 +164,7 @@ namespace {
       // TODO the range of selected frames should be in doc::Site.
       auto range = App::instance()->timeline()->range();
       if (range.enabled()) {
-        return range.frameBegin();
+        return range.firstFrame();
       }
       else if (current_editor) {
         return current_editor->frame();
@@ -176,7 +176,7 @@ namespace {
     static frame_t To() {
       auto range = App::instance()->timeline()->range();
       if (range.enabled()) {
-        return range.frameEnd();
+        return range.lastFrame();
       }
       else if (current_editor) {
         return current_editor->frame();
@@ -218,9 +218,10 @@ namespace {
       if (!range.enabled()) {
         if (current_editor) {
           ASSERT(current_editor->sprite() == sprite);
-          range.startRange(sprite->layerToIndex(current_editor->layer()),
+          range.clearRange();
+          range.startRange(current_editor->layer(),
                            current_editor->frame(), DocumentRange::kCels);
-          range.endRange(sprite->layerToIndex(current_editor->layer()),
+          range.endRange(current_editor->layer(),
                          current_editor->frame());
         }
         else
@@ -230,7 +231,7 @@ namespace {
       LayerList layers = sprite->allLayers();
       for (int i=0; i<int(layers.size()); ++i) {
         Layer* layer = layers[i];
-        bool selected = range.inRange(LayerIndex(i));
+        bool selected = range.contains(layer);
 
         if (selected != layer->isVisible()) {
           m_restore.push_back(std::make_pair(layer, layer->isVisible()));
diff --git a/src/app/commands/cmd_new_frame_tag.cpp b/src/app/commands/cmd_new_frame_tag.cpp
index a7b5af3ee..386be462d 100644
--- a/src/app/commands/cmd_new_frame_tag.cpp
+++ b/src/app/commands/cmd_new_frame_tag.cpp
@@ -59,8 +59,8 @@ void NewFrameTagCommand::onExecute(Context* context)
   if (range.enabled() &&
       (range.type() == DocumentRange::kFrames ||
        range.type() == DocumentRange::kCels)) {
-    from = range.frameBegin();
-    to = range.frameEnd();
+    from = range.selectedFrames().firstFrame();
+    to = range.selectedFrames().lastFrame();
   }
 
   base::UniquePtr<FrameTag> frameTag(new FrameTag(from, to));
diff --git a/src/app/commands/cmd_set_loop_section.cpp b/src/app/commands/cmd_set_loop_section.cpp
index 9d20f81b1..f3266bec5 100644
--- a/src/app/commands/cmd_set_loop_section.cpp
+++ b/src/app/commands/cmd_set_loop_section.cpp
@@ -85,8 +85,8 @@ void SetLoopSectionCommand::onExecute(Context* ctx)
     case Action::Auto: {
       auto range = App::instance()->timeline()->range();
       if (range.enabled() && (range.frames() > 1)) {
-        begin = range.frameBegin();
-        end = range.frameEnd();
+        begin = range.selectedFrames().firstFrame();
+        end = range.selectedFrames().lastFrame();
         on = true;
       }
       else {
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 776749925..c7121fa88 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -427,7 +427,11 @@ void DocumentApi::restackLayerAfter(Layer* layer, Layer* afterThis)
   if (layer == afterThis)
     return;
 
-  m_transaction.execute(new cmd::MoveLayer(layer, layer->parent(), afterThis));
+  m_transaction.execute(
+    new cmd::MoveLayer(
+      layer,
+      (afterThis ? afterThis->parent(): layer->parent()),
+      afterThis));
 }
 
 void DocumentApi::restackLayerBefore(Layer* layer, Layer* beforeThis)
@@ -436,13 +440,23 @@ void DocumentApi::restackLayerBefore(Layer* layer, Layer* beforeThis)
     return;
 
   Layer* afterThis;
-
   if (beforeThis)
     afterThis = beforeThis->getPrevious();
   else
     afterThis = layer->sprite()->root()->lastLayer();
 
-  restackLayerAfter(layer, afterThis);
+  // The following code is similar to DocumentApi::restackLayerAfter()
+  // but we use the parent from "beforeThis" (as afterThis might be
+  // nullptr now).
+
+  if (layer == afterThis)
+    return;
+
+  m_transaction.execute(
+    new cmd::MoveLayer(
+      layer,
+      (beforeThis ? beforeThis->parent(): layer->parent()),
+      afterThis));
 }
 
 void DocumentApi::backgroundFromLayer(Layer* layer)
@@ -460,9 +474,16 @@ void DocumentApi::flattenLayers(Sprite* sprite)
   m_transaction.execute(new cmd::FlattenLayers(sprite));
 }
 
-void DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
+Layer* DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
 {
-  base::UniquePtr<LayerImage> newLayerPtr(new LayerImage(sourceLayer->sprite()));
+  base::UniquePtr<Layer> newLayerPtr;
+
+  if (sourceLayer->isImage())
+    newLayerPtr.reset(new LayerImage(sourceLayer->sprite()));
+  else if (sourceLayer->isGroup())
+    newLayerPtr.reset(new LayerGroup(sourceLayer->sprite()));
+  else
+    throw std::runtime_error("Invalid layer type");
 
   m_document->copyLayerContent(sourceLayer, m_document, newLayerPtr);
 
@@ -471,14 +492,14 @@ void DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
   addLayer(sourceLayer->parent(), newLayerPtr, afterLayer);
 
   // Release the pointer as it is owned by the sprite now.
-  newLayerPtr.release();
+  return newLayerPtr.release();
 }
 
-void DocumentApi::duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer)
+Layer* DocumentApi::duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer)
 {
   Layer* afterThis = (beforeLayer ? beforeLayer->getPreviousInWholeHierarchy(): nullptr);
 
-  duplicateLayerAfter(sourceLayer, afterThis);
+  return duplicateLayerAfter(sourceLayer, afterThis);
 }
 
 Cel* DocumentApi::addCel(LayerImage* layer, frame_t frameNumber, const ImageRef& image)
diff --git a/src/app/document_api.h b/src/app/document_api.h
index 8bfb999ac..9b53a97f2 100644
--- a/src/app/document_api.h
+++ b/src/app/document_api.h
@@ -89,8 +89,8 @@ namespace app {
     void backgroundFromLayer(Layer* layer);
     void layerFromBackground(Layer* layer);
     void flattenLayers(Sprite* sprite);
-    void duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer);
-    void duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer);
+    Layer* duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer);
+    Layer* duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer);
 
     // Images API
     void replaceImage(Sprite* sprite, const ImageRef& oldImage, const ImageRef& newImage);
diff --git a/src/app/document_range.cpp b/src/app/document_range.cpp
index 59ab7fba1..4ccfbf3bf 100644
--- a/src/app/document_range.cpp
+++ b/src/app/document_range.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -22,103 +22,139 @@ using namespace doc;
 
 DocumentRange::DocumentRange()
   : m_type(kNone)
-  , m_layerBegin(0)
-  , m_layerEnd(-1)
-  , m_frameBegin(0)
-  , m_frameEnd(-1)
+  , m_selectingFromLayer(nullptr)
+  , m_selectingFromFrame(-1)
 {
 }
 
 DocumentRange::DocumentRange(Cel* cel)
   : m_type(kCels)
-  , m_layerBegin(cel->sprite()->layerToIndex(cel->layer()))
-  , m_layerEnd(m_layerBegin)
-  , m_frameBegin(cel->frame())
-  , m_frameEnd(m_frameBegin)
+  , m_selectingFromLayer(nullptr)
+  , m_selectingFromFrame(-1)
 {
+  m_selectedLayers.insert(cel->layer());
+  m_selectedFrames.insert(cel->frame());
 }
 
-void DocumentRange::startRange(LayerIndex layer, frame_t frame, Type type)
-{
-  m_type = type;
-  m_layerBegin = m_layerEnd = layer;
-  m_frameBegin = m_frameEnd = frame;
-}
-
-void DocumentRange::endRange(LayerIndex layer, frame_t frame)
-{
-  ASSERT(enabled());
-  m_layerEnd = layer;
-  m_frameEnd = frame;
-}
-
-void DocumentRange::disableRange()
+void DocumentRange::clearRange()
 {
   m_type = kNone;
+  m_selectedLayers.clear();
+  m_selectedFrames.clear();
 }
 
-bool DocumentRange::inRange(LayerIndex layer) const
+void DocumentRange::startRange(Layer* fromLayer, frame_t fromFrame, Type type)
+{
+  m_type = type;
+  m_selectingFromLayer = fromLayer;
+  m_selectingFromFrame = fromFrame;
+
+  if (fromLayer)
+    m_selectedLayers.insert(fromLayer);
+  if (fromFrame >= 0)
+    m_selectedFrames.insert(fromFrame);
+}
+
+void DocumentRange::endRange(Layer* toLayer, frame_t toFrame)
+{
+  ASSERT(enabled());
+
+  if (m_selectingFromLayer && toLayer)
+    selectLayerRange(m_selectingFromLayer, toLayer);
+
+  if (m_selectingFromFrame >= 0)
+    selectFrameRange(m_selectingFromFrame, toFrame);
+}
+
+bool DocumentRange::contains(Layer* layer) const
 {
   if (enabled())
-    return (layer >= layerBegin() && layer <= layerEnd());
+    return m_selectedLayers.contains(layer);
   else
     return false;
 }
 
-bool DocumentRange::inRange(frame_t frame) const
+void DocumentRange::displace(layer_t layerDelta, frame_t frameDelta)
 {
-  if (enabled())
-    return (frame >= frameBegin() && frame <= frameEnd());
-  else
-    return false;
+  m_selectedLayers.displace(layerDelta);
+  m_selectedFrames.displace(frameDelta);
 }
 
-bool DocumentRange::inRange(LayerIndex layer, frame_t frame) const
-{
-  return inRange(layer) && inRange(frame);
-}
-
-void DocumentRange::setLayers(int layers)
-{
-  if (m_layerBegin <= m_layerEnd) m_layerEnd = m_layerBegin + LayerIndex(layers - 1);
-  else m_layerBegin = m_layerEnd + LayerIndex(layers - 1);
-}
-
-void DocumentRange::setFrames(frame_t frames)
-{
-  if (m_frameBegin <= m_frameEnd)
-    m_frameEnd = (m_frameBegin + frames) - 1;
-  else
-    m_frameBegin = (m_frameEnd + frames) - 1;
-}
-
-void DocumentRange::displace(int layerDelta, int frameDelta)
-{
-  m_layerBegin += LayerIndex(layerDelta);
-  m_layerEnd   += LayerIndex(layerDelta);
-  m_frameBegin += frame_t(frameDelta);
-  m_frameEnd   += frame_t(frameDelta);
-}
-
-bool DocumentRange::convertToCels(Sprite* sprite)
+bool DocumentRange::convertToCels(const Sprite* sprite)
 {
   switch (m_type) {
     case DocumentRange::kNone:
       return false;
     case DocumentRange::kCels:
       break;
-    case DocumentRange::kFrames:
-      m_layerBegin = sprite->firstLayer();
-      m_layerEnd = sprite->lastLayer();
-      m_type = DocumentRange::kCels;
+    case DocumentRange::kFrames: {
+      LayerList layers = sprite->allBrowsableLayers();
+      ASSERT(layers.empty());
+      if (!layers.empty()) {
+        selectLayerRange(layers.front(), layers.back());
+        m_type = DocumentRange::kCels;
+      }
+      else
+        return false;
       break;
+    }
     case DocumentRange::kLayers:
-      m_frameBegin = frame_t(0);
-      m_frameEnd = sprite->lastFrame();
+      selectFrameRange(0, sprite->lastFrame());
       m_type = DocumentRange::kCels;
       break;
   }
   return true;
 }
 
+void DocumentRange::selectLayerRange(Layer* fromLayer, Layer* toLayer)
+{
+  ASSERT(fromLayer);
+  ASSERT(toLayer);
+
+  bool goNext = false;
+  bool goPrev = false;
+  Layer* it;
+
+  if (fromLayer != toLayer) {
+    it = m_selectingFromLayer;
+    while (it) {
+      if (it == toLayer) {
+        goNext = true;
+        break;
+      }
+      it = it->getNextInWholeHierarchy();
+    }
+
+    if (!goNext) {
+      it = m_selectingFromLayer;
+      while (it) {
+        if (it == toLayer) {
+          goPrev = true;
+          break;
+        }
+        it = it->getPreviousInWholeHierarchy();
+      }
+    }
+  }
+
+  it = m_selectingFromLayer;
+  do {
+    m_selectedLayers.insert(it);
+    if (it == toLayer)
+      break;
+
+    if (goNext)
+      it = it->getNextInWholeHierarchy();
+    else if (goPrev)
+      it = it->getPreviousInWholeHierarchy();
+    else
+      break;
+  } while (it);
+}
+
+void DocumentRange::selectFrameRange(frame_t fromFrame, frame_t toFrame)
+{
+  m_selectedFrames.insert(fromFrame, toFrame);
+}
+
 } // namespace app
diff --git a/src/app/document_range.h b/src/app/document_range.h
index 989f8b2f2..66b4e94f8 100644
--- a/src/app/document_range.h
+++ b/src/app/document_range.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -10,9 +10,8 @@
 #pragma once
 
 #include "doc/frame.h"
-#include "doc/layer_index.h"
-
-#include <algorithm>
+#include "doc/selected_frames.h"
+#include "doc/selected_layers.h"
 
 namespace doc {
   class Cel;
@@ -31,39 +30,47 @@ namespace app {
 
     Type type() const { return m_type; }
     bool enabled() const { return m_type != kNone; }
-    LayerIndex layerBegin() const  { return std::min(m_layerBegin, m_layerEnd); }
-    LayerIndex layerEnd() const    { return std::max(m_layerBegin, m_layerEnd); }
-    frame_t frameBegin() const { return std::min(m_frameBegin, m_frameEnd); }
-    frame_t frameEnd() const   { return std::max(m_frameBegin, m_frameEnd); }
+    layer_t layers() const { return int(m_selectedLayers.size()); }
+    frame_t frames() const { return int(m_selectedFrames.size()); }
+    const SelectedLayers& selectedLayers() const  { return m_selectedLayers; }
+    const SelectedFrames& selectedFrames() const  { return m_selectedFrames; }
 
-    int layers() const { return layerEnd() - layerBegin() + 1; }
-    frame_t frames() const { return frameEnd() - frameBegin() + 1; }
-    void setLayers(int layers);
-    void setFrames(frame_t frames);
-    void displace(int layerDelta, int frameDelta);
+    void displace(layer_t layerDelta, frame_t frameDelta);
 
-    bool inRange(LayerIndex layer) const;
-    bool inRange(frame_t frame) const;
-    bool inRange(LayerIndex layer, frame_t frame) const;
+    bool contains(Layer* layer) const;
 
-    void startRange(LayerIndex layer, frame_t frame, Type type);
-    void endRange(LayerIndex layer, frame_t frame);
-    void disableRange();
-
-    bool operator==(const DocumentRange& o) const {
-      return m_type == o.m_type &&
-        layerBegin() == o.layerBegin() && layerEnd() == o.layerEnd() &&
-        frameBegin() == o.frameBegin() && frameEnd() == o.frameEnd();
+    bool contains(frame_t frame) const {
+      return m_selectedFrames.contains(frame);
     }
 
-    bool convertToCels(Sprite* sprite);
+    bool contains(Layer* layer, frame_t frame) const {
+      return contains(layer) && contains(frame);
+    }
+
+    void clearRange();
+    void startRange(Layer* fromLayer, frame_t fromFrame, Type type);
+    void endRange(Layer* toLayer, frame_t toFrame);
+
+    frame_t firstFrame() const { return m_selectedFrames.firstFrame(); }
+    frame_t lastFrame() const { return m_selectedFrames.lastFrame(); }
+
+    bool operator==(const DocumentRange& o) const {
+      return (m_type == o.m_type &&
+              m_selectedLayers == o.m_selectedLayers &&
+              m_selectedFrames == o.m_selectedFrames);
+    }
+
+    bool convertToCels(const Sprite* sprite);
 
   private:
+    void selectLayerRange(Layer* fromLayer, Layer* toLayer);
+    void selectFrameRange(frame_t fromFrame, frame_t toFrame);
+
     Type m_type;
-    LayerIndex m_layerBegin;
-    LayerIndex m_layerEnd;
-    frame_t m_frameBegin;
-    frame_t m_frameEnd;
+    SelectedLayers m_selectedLayers;
+    SelectedFrames m_selectedFrames;
+    Layer* m_selectingFromLayer;
+    frame_t m_selectingFromFrame;
   };
 
 } // namespace app
diff --git a/src/app/document_range_ops.cpp b/src/app/document_range_ops.cpp
index e741aefc0..1c9fec472 100644
--- a/src/app/document_range_ops.cpp
+++ b/src/app/document_range_ops.cpp
@@ -5,13 +5,15 @@
 // it under the terms of the GNU General Public License version 2 as
 // published by the Free Software Foundation.
 
+// Uncomment this in case you want to debug range ops
+//#define TRACE_RANGE_OPS
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "app/document_range_ops.h"
 
-#include "app/app.h"            // TODO remove this dependency
 #include "app/context_access.h"
 #include "app/document_api.h"
 #include "app/document_range.h"
@@ -21,10 +23,150 @@
 
 #include <stdexcept>
 
+#ifdef TRACE_RANGE_OPS
+#include <iostream>
+#endif
+
 namespace app {
 
 enum Op { Move, Copy };
 
+template<typename T>
+static void move_or_copy_cels(
+  DocumentApi& api, Op op,
+  LayerList& srcLayers,
+  LayerList& dstLayers,
+  T& srcFrames,
+  T& dstFrames)
+{
+  ASSERT(srcLayers.size() == dstLayers.size());
+
+  for (layer_t i=0; i<srcLayers.size(); ++i) {
+    auto srcFrame = srcFrames.begin();
+    auto dstFrame = dstFrames.begin();
+    auto srcFrameEnd = srcFrames.end();
+    auto dstFrameEnd = dstFrames.end();
+
+    for (; srcFrame != srcFrameEnd &&
+           dstFrame != dstFrameEnd; ++srcFrame, ++dstFrame) {
+      if (i >= 0 && i < srcLayers.size() && srcLayers[i]->isImage()) {
+        LayerImage* srcLayer = static_cast<LayerImage*>(srcLayers[i]);
+
+        if (i < dstLayers.size() && dstLayers[i]->isImage()) {
+          LayerImage* srcLayer = static_cast<LayerImage*>(srcLayers[i]);
+          LayerImage* dstLayer = static_cast<LayerImage*>(dstLayers[i]);
+
+#ifdef TRACE_RANGE_OPS
+          std::clog << (op == Move ? "Moving": "Copying")
+                    << " cel " << srcLayer->name() << "[" << *srcFrame << "]"
+                    << " into " << dstLayer->name() << "[" << *dstFrame << "]\n";
+#endif
+
+          switch (op) {
+            case Move: api.moveCel(srcLayer, *srcFrame, dstLayer, *dstFrame); break;
+            case Copy: api.copyCel(srcLayer, *srcFrame, dstLayer, *dstFrame); break;
+          }
+        }
+        else if (op == Move) {
+          api.clearCel(srcLayer, *srcFrame);
+        }
+      }
+    }
+  }
+}
+
+template<typename T>
+static DocumentRange move_or_copy_frames(
+  DocumentApi& api, Op op,
+  Sprite* sprite,
+  T& srcFrames,
+  frame_t dstFrame)
+{
+#ifdef TRACE_RANGE_OPS
+  std::clog << "move_or_copy_frames frames[";
+  for (auto srcFrame : srcFrames) {
+    std::clog << srcFrame << ", ";
+  }
+  std::clog << "] => " << dstFrame << "\n";
+#endif
+
+  auto srcFrame = srcFrames.begin();
+  auto srcFrameEnd = srcFrames.end();
+  frame_t srcDelta = 0;
+  frame_t firstCopiedBlock = 0;
+
+  for (; srcFrame != srcFrameEnd; ++srcFrame) {
+    frame_t fromFrame = (*srcFrame)+srcDelta;
+
+    switch (op) {
+
+      case Move:
+        if ((*srcFrame) >= dstFrame) {
+          srcDelta = 0;
+          fromFrame = *srcFrame;
+        }
+        break;
+
+      case Copy:
+        if (fromFrame >= dstFrame-1 && firstCopiedBlock) {
+          srcDelta += firstCopiedBlock;
+          fromFrame += firstCopiedBlock;
+          firstCopiedBlock = 0;
+        }
+        break;
+    }
+
+#ifdef TRACE_RANGE_OPS
+    std::clog << " [";
+    for (frame_t i=0; i<=sprite->lastFrame(); ++i) {
+      std::clog << (sprite->frameDuration(i)-1);
+    }
+    std::clog << "] => "
+              << (op == Move ? "Move": "Copy")
+              << " " << (*srcFrame) << "+" << (srcDelta) << " -> " << dstFrame << " => ";
+#endif
+
+    switch (op) {
+
+      case Move:
+        api.moveFrame(sprite, fromFrame, dstFrame);
+
+        if (fromFrame < dstFrame-1) {
+          --srcDelta;
+        }
+        else if (fromFrame > dstFrame-1) {
+          ++dstFrame;
+        }
+        break;
+
+      case Copy:
+        api.copyFrame(sprite, fromFrame, dstFrame);
+
+        if (fromFrame < dstFrame-1) {
+          ++firstCopiedBlock;
+        }
+        else if (fromFrame >= dstFrame-1) {
+          ++srcDelta;
+        }
+        ++dstFrame;
+        break;
+    }
+
+#ifdef TRACE_RANGE_OPS
+    std::clog << " [";
+    for (frame_t i=0; i<=sprite->lastFrame(); ++i) {
+      std::clog << (sprite->frameDuration(i)-1);
+    }
+    std::clog << "]\n";
+#endif
+  }
+
+  DocumentRange result;
+  result.startRange(nullptr, dstFrame-srcFrames.size(), DocumentRange::kFrames);
+  result.endRange(nullptr, dstFrame-1);
+  return result;
+}
+
 static DocumentRange drop_range_op(
   Document* doc, Op op, const DocumentRange& from,
   DocumentRangePlace place, const DocumentRange& to)
@@ -40,36 +182,64 @@ static DocumentRange drop_range_op(
   // Check noop/trivial/do nothing cases, i.e., move a range to the same place.
   // Also check invalid cases, like moving a Background layer.
   switch (from.type()) {
+
     case DocumentRange::kCels:
       if (from == to)
         return from;
       break;
+
     case DocumentRange::kFrames:
       if (op == Move) {
-        if ((to.frameBegin() >= from.frameBegin() && to.frameEnd() <= from.frameEnd()) ||
-            (place == kDocumentRangeBefore && to.frameBegin() == from.frameEnd()+1) ||
-            (place == kDocumentRangeAfter && to.frameEnd() == from.frameBegin()-1))
+        // Simple cases with one continuos range of frames that are a
+        // no-op.
+        if ((from.selectedFrames().ranges() == 1) &&
+            ((to.firstFrame() >= from.firstFrame() &&
+              to.lastFrame() <= from.lastFrame()) ||
+             (place == kDocumentRangeBefore && to.firstFrame() == from.lastFrame()+1) ||
+             (place == kDocumentRangeAfter && to.lastFrame() == from.firstFrame()-1)))
           return from;
       }
       break;
+
     case DocumentRange::kLayers:
       if (op == Move) {
-        if ((to.layerBegin() >= from.layerBegin() && to.layerEnd() <= from.layerEnd()) ||
-            (place == kDocumentRangeBefore && to.layerBegin() == from.layerEnd()+1) ||
-            (place == kDocumentRangeAfter && to.layerEnd() == from.layerBegin()-1))
-          return from;
+          SelectedLayers srcSelLayers = from.selectedLayers();
+          SelectedLayers dstSelLayers = to.selectedLayers();
+          LayerList srcLayers = srcSelLayers.toLayerList();
+          LayerList dstLayers = dstSelLayers.toLayerList();
+          if (srcLayers.empty() || dstLayers.empty())
+            return from;
+
+        // Check no-ops when we move layers at the same level (all
+        // layers with the same parent), all adjacents, and which are
+        // moved to the same place.
+        if (srcSelLayers.hasSameParent() &&
+            dstSelLayers.hasSameParent() &&
+            are_layers_adjacent(srcLayers) &&
+            are_layers_adjacent(dstLayers)) {
+          for (Layer* srcLayer : srcLayers)
+            if (dstSelLayers.contains(srcLayer))
+              return from;
+
+          if ((place == kDocumentRangeBefore
+               && dstLayers.front() == srcLayers.back()->getNext()) ||
+              (place == kDocumentRangeAfter
+               && dstLayers.back() == srcLayers.front()->getPrevious()))
+            return from;
+        }
 
         // We cannot move the background
-        for (LayerIndex i = from.layerBegin(); i <= from.layerEnd(); ++i)
-          if (sprite->indexToLayer(i)->isBackground())
+        for (Layer* layer : srcSelLayers)
+          if (layer->isBackground())
             throw std::runtime_error("The background layer cannot be moved");
       }
 
       // Before background
       if (place == kDocumentRangeBefore) {
-        Layer* background = sprite->indexToLayer(to.layerBegin());
-        if (background && background->isBackground())
-          throw std::runtime_error("You cannot move or copy something below the background layer");
+        for (Layer* background : to.selectedLayers()) {
+          if (background && background->isBackground())
+            throw std::runtime_error("You cannot move or copy something below the background layer");
+        }
       }
       break;
   }
@@ -92,238 +262,121 @@ static DocumentRange drop_range_op(
     DocumentApi api = doc->getApi(transaction);
 
     // TODO Try to add the range with just one call to DocumentApi
-    // methods, to avoid generating a lot of SetCelFrame undoers (see
-    // DocumentApi::setCelFramePosition).
+    // methods, to avoid generating a lot of cmd::SetCelFrame (see
+    // DocumentApi::setCelFramePosition() function).
 
     switch (from.type()) {
 
-      case DocumentRange::kCels:
-        {
-          LayerList layers = sprite->allBrowsableLayers();
-          int srcLayerBegin, srcLayerStep, srcLayerEnd;
-          int dstLayerBegin, dstLayerStep;
-          frame_t srcFrameBegin, srcFrameStep, srcFrameEnd;
-          frame_t dstFrameBegin, dstFrameStep;
+      case DocumentRange::kCels: {
+        LayerList allLayers = sprite->allBrowsableLayers();
+        if (allLayers.empty())
+          break;
 
-          if (to.layerBegin() <= from.layerBegin()) {
-            srcLayerBegin = from.layerBegin();
-            srcLayerStep = 1;
-            srcLayerEnd = from.layerEnd()+1;
-            dstLayerBegin = to.layerBegin();
-            dstLayerStep = 1;
-          }
-          else {
-            srcLayerBegin = from.layerEnd();
-            srcLayerStep = -1;
-            srcLayerEnd = from.layerBegin()-1;
-            dstLayerBegin = to.layerEnd();
-            dstLayerStep = -1;
-          }
+        LayerList srcLayers = from.selectedLayers().toLayerList();
+        LayerList dstLayers = to.selectedLayers().toLayerList();
+        if (srcLayers.empty())
+          throw std::invalid_argument("You need to specify a non-empty cels range");
 
-          if (to.frameBegin() <= from.frameBegin()) {
-            srcFrameBegin = from.frameBegin();
-            srcFrameStep = frame_t(1);
-            srcFrameEnd = from.frameEnd()+1;
-            dstFrameBegin = to.frameBegin();
-            dstFrameStep = frame_t(1);
-          }
-          else {
-            srcFrameBegin = from.frameEnd();
-            srcFrameStep = frame_t(-1);
-            srcFrameEnd = from.frameBegin()-1;
-            dstFrameBegin = to.frameEnd();
-            dstFrameStep = frame_t(-1);
-          }
-
-          for (int srcLayerIdx = srcLayerBegin,
-                 dstLayerIdx = dstLayerBegin; srcLayerIdx != srcLayerEnd; ) {
-            for (frame_t srcFrame = srcFrameBegin,
-                   dstFrame = dstFrameBegin; srcFrame != srcFrameEnd; ) {
-              if (dstLayerIdx < 0 || dstLayerIdx >= int(layers.size()) ||
-                  srcLayerIdx < 0 || srcLayerIdx >= int(layers.size()))
-                break;
-
-              ASSERT(layers[srcLayerIdx]->isImage());
-              ASSERT(layers[dstLayerIdx]->isImage());
-
-              LayerImage* srcLayer = static_cast<LayerImage*>(layers[srcLayerIdx]);
-              LayerImage* dstLayer = static_cast<LayerImage*>(layers[dstLayerIdx]);
-
-              switch (op) {
-                case Move: api.moveCel(srcLayer, srcFrame, dstLayer, dstFrame); break;
-                case Copy: api.copyCel(srcLayer, srcFrame, dstLayer, dstFrame); break;
-              }
-
-              srcFrame += srcFrameStep;
-              dstFrame += dstFrameStep;
-            }
-            srcLayerIdx += srcLayerStep;
-            dstLayerIdx += dstLayerStep;
-          }
-
-          resultRange = to;
+        if (find_layer_index(allLayers, srcLayers.front()) <
+            find_layer_index(allLayers, dstLayers.front())) {
+          std::reverse(srcLayers.begin(), srcLayers.end());
+          std::reverse(dstLayers.begin(), dstLayers.end());
         }
-        break;
 
-      case DocumentRange::kFrames:
-        {
-          frame_t srcFrameBegin = 0, srcFrameStep, srcFrameEnd = 0;
-          frame_t dstFrameBegin = 0, dstFrameStep;
+        if (from.firstFrame() < to.firstFrame()) {
+          auto srcFrames = from.selectedFrames().reversed();
+          auto dstFrames = to.selectedFrames().reversed();
 
-          switch (op) {
-
-            case Move:
-              if (place == kDocumentRangeBefore) {
-                if (to.frameBegin() <= from.frameBegin()) {
-                  srcFrameBegin = from.frameBegin();
-                  srcFrameStep = frame_t(1);
-                  srcFrameEnd = from.frameEnd()+1;
-                  dstFrameBegin = to.frameBegin();
-                  dstFrameStep = frame_t(1);
-                }
-                else {
-                  srcFrameBegin = from.frameEnd();
-                  srcFrameStep = frame_t(-1);
-                  srcFrameEnd = from.frameBegin()-1;
-                  dstFrameBegin = to.frameBegin();
-                  dstFrameStep = frame_t(-1);
-                }
-              }
-              else if (place == kDocumentRangeAfter) {
-                if (to.frameEnd() <= from.frameBegin()) {
-                  srcFrameBegin = from.frameBegin();
-                  srcFrameStep = frame_t(1);
-                  srcFrameEnd = from.frameEnd()+1;
-                  dstFrameBegin = to.frameEnd()+1;
-                  dstFrameStep = frame_t(1);
-                }
-                else {
-                  srcFrameBegin = from.frameEnd();
-                  srcFrameStep = frame_t(-1);
-                  srcFrameEnd = from.frameBegin()-1;
-                  dstFrameBegin = to.frameEnd()+1;
-                  dstFrameStep = frame_t(-1);
-                }
-              }
-              break;
-
-            case Copy:
-              if (place == kDocumentRangeBefore) {
-                if (to.frameBegin() <= from.frameBegin()) {
-                  srcFrameBegin = from.frameBegin();
-                  srcFrameStep = frame_t(2);
-                  srcFrameEnd = from.frameBegin() + 2*from.frames();
-                  dstFrameBegin = to.frameBegin();
-                  dstFrameStep = frame_t(1);
-                }
-                else {
-                  srcFrameBegin = from.frameEnd();
-                  srcFrameStep = frame_t(-1);
-                  srcFrameEnd = from.frameBegin()-1;
-                  dstFrameBegin = to.frameBegin();
-                  dstFrameStep = frame_t(0);
-                }
-              }
-              else if (place == kDocumentRangeAfter) {
-                if (to.frameEnd() <= from.frameBegin()) {
-                  srcFrameBegin = from.frameBegin();
-                  srcFrameStep = frame_t(2);
-                  srcFrameEnd = from.frameBegin() + 2*from.frames();
-                  dstFrameBegin = to.frameEnd()+1;
-                  dstFrameStep = frame_t(1);
-                }
-                else {
-                  srcFrameBegin = from.frameEnd();
-                  srcFrameStep = frame_t(-1);
-                  srcFrameEnd = from.frameBegin()-1;
-                  dstFrameBegin = to.frameEnd()+1;
-                  dstFrameStep = frame_t(0);
-                }
-              }
-              break;
-          }
-
-          for (frame_t srcFrame = srcFrameBegin,
-                 dstFrame = dstFrameBegin; srcFrame != srcFrameEnd; ) {
-            switch (op) {
-              case Move: api.moveFrame(sprite, srcFrame, dstFrame); break;
-              case Copy: api.copyFrame(sprite, srcFrame, dstFrame); break;
-            }
-            srcFrame += srcFrameStep;
-            dstFrame += dstFrameStep;
-          }
-
-          if (place == kDocumentRangeBefore) {
-            resultRange.startRange(LayerIndex::NoLayer, frame_t(to.frameBegin()), from.type());
-            resultRange.endRange(LayerIndex::NoLayer, frame_t(to.frameBegin()+from.frames()-1));
-          }
-          else if (place == kDocumentRangeAfter) {
-            resultRange.startRange(LayerIndex::NoLayer, frame_t(to.frameEnd()+1), from.type());
-            resultRange.endRange(LayerIndex::NoLayer, frame_t(to.frameEnd()+1+from.frames()-1));
-          }
-
-          if (op == Move && from.frameBegin() < to.frameBegin())
-            resultRange.displace(0, -from.frames());
+          move_or_copy_cels(api, op, srcLayers, dstLayers, srcFrames, dstFrames);
         }
+        else {
+          const auto& srcFrames = from.selectedFrames();
+          const auto& dstFrames = to.selectedFrames();
+
+          move_or_copy_cels(api, op, srcLayers, dstLayers, srcFrames, dstFrames);
+        }
+
+        resultRange = to;
         break;
+      }
 
-      case DocumentRange::kLayers:
-        {
-          LayerList layers = sprite->allBrowsableLayers();
+      case DocumentRange::kFrames: {
+        frame_t dstFrame;
+        if (place == kDocumentRangeBefore)
+          dstFrame = to.firstFrame();
+        else
+          dstFrame = to.lastFrame()+1;
 
-          if (layers.empty())
+        resultRange =
+          move_or_copy_frames(api, op, sprite,
+                              from.selectedFrames(), dstFrame);
+        break;
+      }
+
+      case DocumentRange::kLayers: {
+        LayerList allLayers = sprite->allBrowsableLayers();
+        if (allLayers.empty())
+          break;
+
+        LayerList srcLayers = from.selectedLayers().toLayerList();
+        LayerList dstLayers = to.selectedLayers().toLayerList();
+        ASSERT(!srcLayers.empty());
+        ASSERT(!dstLayers.empty());
+
+        switch (op) {
+
+          case Move:
+            if (place == kDocumentRangeBefore) {
+              Layer* beforeThis = dstLayers.front();
+              Layer* afterThis  = nullptr;
+
+              for (Layer* srcLayer : srcLayers) {
+                if (afterThis)
+                  api.restackLayerAfter(srcLayer, afterThis);
+                else
+                  api.restackLayerBefore(srcLayer, beforeThis);
+
+                afterThis = srcLayer;
+              }
+            }
+            else if (place == kDocumentRangeAfter) {
+              Layer* afterThis = dstLayers.back();
+              for (Layer* srcLayer : srcLayers) {
+                api.restackLayerAfter(srcLayer, afterThis);
+                afterThis = srcLayer;
+              }
+            }
+
+            // Same set of layers than the "from" range
+            resultRange = from;
             break;
 
-          switch (op) {
+          case Copy: {
+            if (place == kDocumentRangeBefore) {
+              for (Layer* srcLayer :  srcLayers) {
+                Layer* copiedLayer =
+                  api.duplicateLayerBefore(srcLayer, dstLayers.front());
 
-            case Move:
-              if (place == kDocumentRangeBefore) {
-                for (LayerIndex i = from.layerBegin(); i <= from.layerEnd(); ++i) {
-                  api.restackLayerBefore(
-                    layers[i],
-                    layers[to.layerBegin()]);
-                }
+                resultRange.startRange(copiedLayer, -1, DocumentRange::kLayers);
+                resultRange.endRange(copiedLayer, -1);
               }
-              else if (place == kDocumentRangeAfter) {
-                for (LayerIndex i = from.layerEnd(); i >= from.layerBegin(); --i) {
-                  api.restackLayerAfter(
-                    layers[i],
-                    layers[to.layerEnd()]);
-                }
-              }
-              break;
+            }
+            else if (place == kDocumentRangeAfter) {
+              std::reverse(srcLayers.begin(), srcLayers.end());
 
-            case Copy:
-              if (place == kDocumentRangeBefore) {
-                for (LayerIndex i = from.layerBegin(); i <= from.layerEnd(); ++i) {
-                  api.duplicateLayerBefore(
-                    layers[i],
-                    layers[to.layerBegin()]);
-                }
+              for (Layer* srcLayer :  srcLayers) {
+                Layer* copiedLayer =
+                  api.duplicateLayerAfter(srcLayer, dstLayers.back());
+
+                resultRange.startRange(copiedLayer, -1, DocumentRange::kLayers);
+                resultRange.endRange(copiedLayer, -1);
               }
-              else if (place == kDocumentRangeAfter) {
-                for (LayerIndex i = from.layerEnd(); i >= from.layerBegin(); --i) {
-                  api.duplicateLayerAfter(
-                    layers[i],
-                    layers[to.layerEnd()]);
-                }
-              }
-              break;
+            }
+            break;
           }
-
-          if (place == kDocumentRangeBefore) {
-            resultRange.startRange(LayerIndex(to.layerBegin()), frame_t(-1), from.type());
-            resultRange.endRange(LayerIndex(to.layerBegin()+from.layers()-1), frame_t(-1));
-          }
-          else if (place == kDocumentRangeAfter) {
-            resultRange.startRange(LayerIndex(to.layerEnd()+1), frame_t(-1), from.type());
-            resultRange.endRange(LayerIndex(to.layerEnd()+1+from.layers()-1), frame_t(-1));
-          }
-
-          if (op == Move && from.layerBegin() < to.layerBegin())
-            resultRange.displace(-from.layers(), 0);
         }
         break;
+      }
     }
 
     transaction.commit();
@@ -350,29 +403,28 @@ void reverse_frames(Document* doc, const DocumentRange& range)
   Transaction transaction(writer.context(), "Reverse Frames");
   DocumentApi api = doc->getApi(transaction);
   Sprite* sprite = doc->sprite();
+  LayerList layers;
   frame_t frameBegin, frameEnd;
-  int layerBegin, layerEnd;
   bool moveFrames = false;
   bool swapCels = false;
 
   switch (range.type()) {
     case DocumentRange::kCels:
-      frameBegin = range.frameBegin();
-      frameEnd = range.frameEnd();
-      layerBegin = range.layerBegin();
-      layerEnd = range.layerEnd() + 1;
+      frameBegin = range.firstFrame();
+      frameEnd = range.lastFrame();
+      layers = range.selectedLayers().toLayerList();
       swapCels = true;
       break;
     case DocumentRange::kFrames:
-      frameBegin = range.frameBegin();
-      frameEnd = range.frameEnd();
+      frameBegin = range.firstFrame();
+      frameEnd = range.lastFrame();
+      layers = sprite->allLayers();
       moveFrames = true;
       break;
     case DocumentRange::kLayers:
       frameBegin = frame_t(0);
       frameEnd = sprite->totalFrames()-1;
-      layerBegin = range.layerBegin();
-      layerEnd = range.layerEnd() + 1;
+      layers = range.selectedLayers().toLayerList();
       swapCels = true;
       break;
   }
@@ -385,10 +437,8 @@ void reverse_frames(Document* doc, const DocumentRange& range)
     }
   }
   else if (swapCels) {
-    LayerList layers = sprite->allBrowsableLayers();
-
-    for (int layerIdx = layerBegin; layerIdx != layerEnd; ++layerIdx) {
-      if (!layers[layerIdx]->isImage())
+    for (Layer* layer : layers) {
+      if (!layer->isImage())
         continue;
 
       for (frame_t frame = frameBegin,
@@ -398,8 +448,8 @@ void reverse_frames(Document* doc, const DocumentRange& range)
         if (frame == frameRev)
           continue;
 
-        LayerImage* layer = static_cast<LayerImage*>(layers[layerIdx]);
-        api.swapCel(layer, frame, frameRev);
+        LayerImage* imageLayer = static_cast<LayerImage*>(layer);
+        api.swapCel(imageLayer, frame, frameRev);
       }
     }
   }
diff --git a/src/app/document_range_tests.cpp b/src/app/document_range_tests.cpp
index 49fa6affb..216b99b00 100644
--- a/src/app/document_range_tests.cpp
+++ b/src/app/document_range_tests.cpp
@@ -21,15 +21,59 @@
 using namespace app;
 using namespace doc;
 
-namespace app {
+namespace std {
 
-  std::ostream& operator<<(std::ostream& os, const DocumentRange& range) {
-    return os << "{ layers: [" << range.layerBegin() << ", " << range.layerEnd() << "]"
-              << ", frames: [" << range.frameBegin() << ", " << range.frameEnd() << "] }";
+std::ostream& operator<<(std::ostream& os, const doc::Layer* layer) {
+  if (layer)
+    os << '"' << layer->name() << '"';
+  else
+    os << "(null layer)";
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const app::DocumentRange& range) {
+  os << "{ layers: [";
+
+  bool first = true;
+  for (auto layer : range.selectedLayers()) {
+    if (first)
+      first = false;
+    else
+      os << ", ";
+    os << layer;
   }
 
+  os << "]";
+  os << ", frames: [";
+
+  first = true;
+  for (auto frame : range.selectedFrames()) {
+    if (first)
+      first = false;
+    else
+      os << ", ";
+    os << frame;
+  }
+
+  os << "] }";
+  return os;
 }
 
+std::ostream& operator<<(std::ostream& os, const doc::LayerList& layers) {
+  os << "[";
+  bool first = true;
+  for (auto layer : layers) {
+    if (first)
+      first = false;
+    else
+      os << ", ";
+    os << layer;
+  }
+  return os << "]";
+}
+
+} // namespace std
+
 typedef base::UniquePtr<app::Document> DocumentPtr;
 
 #define EXPECT_LAYER_ORDER(a, b, c, d) \
@@ -44,6 +88,14 @@ typedef base::UniquePtr<app::Document> DocumentPtr;
               expect_frame(c, 2) &&    \
               expect_frame(d, 3));
 
+#define EXPECT_FRAME_ORDER6(a, b, c, d, e, f)   \
+  EXPECT_TRUE(expect_frame(a, 0) &&             \
+              expect_frame(b, 1) &&             \
+              expect_frame(c, 2) &&             \
+              expect_frame(d, 3) &&             \
+              expect_frame(e, 4) &&             \
+              expect_frame(f, 5));
+
 #define EXPECT_FRAME_COPY1(a, b, c, d, e) \
   EXPECT_TRUE(expect_frame(a, 0));        \
   EXPECT_TRUE(expect_frame(b, 1));        \
@@ -79,7 +131,7 @@ public:
   DocRangeOps() {
     expected_color = rgba(255, 255, 255, 255);
 
-    doc.reset(static_cast<app::Document*>(ctx.documents().add(4, 4)));
+    doc.reset(static_cast<app::Document*>(ctx.documents().add(6, 4)));
     sprite = doc->sprite();
     layer1 = dynamic_cast<LayerImage*>(sprite->root()->firstLayer());
     layer2 = new LayerImage(sprite);
@@ -95,24 +147,26 @@ public:
     layer3->setName("layer3");
     layer4->setName("layer4");
 
-    sprite->setTotalFrames(frame_t(4));
+    sprite->setTotalFrames(frame_t(6));
     sprite->setFrameDuration(frame_t(0), 1); // These durations can be used to identify
     sprite->setFrameDuration(frame_t(1), 2); // frames after a move operation
     sprite->setFrameDuration(frame_t(2), 3);
     sprite->setFrameDuration(frame_t(3), 4);
+    sprite->setFrameDuration(frame_t(4), 5);
+    sprite->setFrameDuration(frame_t(5), 6);
 
     LayerList layers = sprite->allLayers();
 
-    for (int i=0; i<4; i++) {
+    for (layer_t i=0; i<layers.size(); i++) {
       LayerImage* layer = static_cast<LayerImage*>(layers[i]);
 
-      for (int j=0; j<4; j++) {
+      for (frame_t j=0; j<sprite->totalFrames(); j++) {
         Cel* cel = layer->cel(frame_t(j));
         ImageRef image;
         if (cel)
           image = cel->imageRef();
         else {
-          image.reset(Image::create(IMAGE_RGB, 4, 4));
+          image.reset(Image::create(IMAGE_RGB, 6, 4));
           cel = new Cel(frame_t(j), image);
           layer->addCel(cel);
         }
@@ -157,7 +211,7 @@ protected:
       LayerList layers = sprite->allLayers();
       Layer* a = layers[expected_layer];
       Layer* b = layers[layer];
-      EXPECT_EQ(a->name(), b->name());
+      EXPECT_EQ(a->name(), b->name()) << layers;
       if (a != b)
         return false;
     }
@@ -191,6 +245,50 @@ protected:
     return (cel == NULL);
   }
 
+  DocumentRange range(Layer* fromLayer, frame_t fromFrNum, Layer* toLayer, frame_t toFrNum, DocumentRange::Type type) {
+    DocumentRange r;
+    r.startRange(fromLayer, fromFrNum, type);
+    r.endRange(toLayer, toFrNum);
+    return r;
+  }
+
+  DocumentRange range(layer_t fromLayer, frame_t fromFrNum,
+                      layer_t toLayer, frame_t toFrNum, DocumentRange::Type type) {
+    LayerList layers = sprite->allLayers();
+    return range(layers[fromLayer], fromFrNum, layers[toLayer], toFrNum, type);
+  }
+
+  DocumentRange layers_range(Layer* fromLayer, Layer* toLayer) {
+    return range(fromLayer, -1, toLayer, -1, DocumentRange::kLayers);
+  }
+
+  DocumentRange layers_range(layer_t fromLayer, layer_t toLayer) {
+    LayerList layers = sprite->allLayers();
+    return layers_range(layers[fromLayer], layers[toLayer]);
+  }
+
+  DocumentRange layers_range(Layer* layer) {
+    return range(layer, -1, layer, -1, DocumentRange::kLayers);
+  }
+
+  DocumentRange layers_range(layer_t layer) {
+    LayerList layers = sprite->allLayers();
+    return layers_range(layers[layer]);
+  }
+
+  DocumentRange frames_range(frame_t fromFrame, frame_t toFrame) {
+    return range(nullptr, fromFrame, nullptr, toFrame, DocumentRange::kFrames);
+  }
+
+  DocumentRange frames_range(frame_t frame) {
+    return range(nullptr, frame, nullptr, frame, DocumentRange::kFrames);
+  }
+
+  DocumentRange cels_range(layer_t fromLayer, frame_t fromFrNum,
+                           layer_t toLayer, frame_t toFrNum) {
+    return range(fromLayer, fromFrNum, toLayer, toFrNum, DocumentRange::kCels);
+  }
+
   TestContextT<app::Context> ctx;
   DocumentPtr doc;
   Sprite* sprite;
@@ -201,155 +299,113 @@ protected:
   color_t expected_color;
 };
 
-inline DocumentRange range(Layer* fromLayer, frame_t fromFrNum, Layer* toLayer, frame_t toFrNum, DocumentRange::Type type) {
-  DocumentRange r;
-  r.startRange(fromLayer->sprite()->layerToIndex(fromLayer), fromFrNum, type);
-  r.endRange(toLayer->sprite()->layerToIndex(toLayer), toFrNum);
-  return r;
-}
-
-inline DocumentRange range(int fromLayer, frame_t fromFrNum, int toLayer, frame_t toFrNum, DocumentRange::Type type) {
-  DocumentRange r;
-  r.startRange(LayerIndex(fromLayer), fromFrNum, type);
-  r.endRange(LayerIndex(toLayer), toFrNum);
-  return r;
-}
-
-inline DocumentRange layers_range(Layer* fromLayer, Layer* toLayer) {
-  return range(fromLayer, -1, toLayer, -1, DocumentRange::kLayers);
-}
-
-inline DocumentRange layers_range(int fromLayer, int toLayer) {
-  return range(fromLayer, -1, toLayer, -1, DocumentRange::kLayers);
-}
-
-inline DocumentRange layers_range(Layer* layer) {
-  return range(layer, -1, layer, -1, DocumentRange::kLayers);
-}
-
-inline DocumentRange layers_range(int layer) {
-  return range(layer, -1, layer, -1, DocumentRange::kLayers);
-}
-
-inline DocumentRange frames_range(frame_t fromFrame, frame_t toFrame) {
-  return range(0, fromFrame, 0, toFrame, DocumentRange::kFrames);
-}
-
-inline DocumentRange frames_range(frame_t frame) {
-  return range(0, frame, 0, frame, DocumentRange::kFrames);
-}
-
-inline DocumentRange cels_range(int fromLayer, frame_t fromFrNum, int toLayer, frame_t toFrNum) {
-  return range(fromLayer, fromFrNum, toLayer, toFrNum, DocumentRange::kCels);
-}
-
 TEST_F(DocRangeOps, MoveLayersNoOp) {
   // Move one layer to the same place
 
   EXPECT_EQ(layers_range(layer1),
-    move_range(doc,
-      layers_range(layer1),
-      layers_range(layer1), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer1),
+                       layers_range(layer1), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer1),
-    move_range(doc,
-      layers_range(layer1),
-      layers_range(layer2), kDocumentRangeBefore));
+            move_range(doc,
+                       layers_range(layer1),
+                       layers_range(layer2), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer4),
-    move_range(doc,
-      layers_range(layer4),
-      layers_range(layer4), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer4),
+                       layers_range(layer4), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer4),
-    move_range(doc,
-      layers_range(layer4),
-      layers_range(layer4), kDocumentRangeBefore));
+            move_range(doc,
+                       layers_range(layer4),
+                       layers_range(layer4), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer4),
-    move_range(doc,
-      layers_range(layer4),
-      layers_range(layer3), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer4),
+                       layers_range(layer3), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   // Move two layer to the same place
 
   EXPECT_EQ(layers_range(layer1, layer2),
-    move_range(doc,
-      layers_range(layer1, layer2),
-      layers_range(layer1), kDocumentRangeBefore));
+            move_range(doc,
+                       layers_range(layer1, layer2),
+                       layers_range(layer1), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer1, layer2),
-    move_range(doc,
-      layers_range(layer1, layer2),
-      layers_range(layer1), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer1, layer2),
+                       layers_range(layer1), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer1, layer2),
-    move_range(doc,
-      layers_range(layer1, layer2),
-      layers_range(layer2), kDocumentRangeBefore));
+            move_range(doc,
+                       layers_range(layer1, layer2),
+                       layers_range(layer2), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer1, layer2),
-    move_range(doc,
-      layers_range(layer1, layer2),
-      layers_range(layer2), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer1, layer2),
+                       layers_range(layer2), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer1, layer2),
-    move_range(doc,
-      layers_range(layer1, layer2),
-      layers_range(layer3), kDocumentRangeBefore));
+            move_range(doc,
+                       layers_range(layer1, layer2),
+                       layers_range(layer3), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer3, layer4),
-    move_range(doc,
-      layers_range(layer3, layer4),
-      layers_range(layer2), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer3, layer4),
+                       layers_range(layer2), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer3, layer4),
-    move_range(doc,
-      layers_range(layer3, layer4),
-      layers_range(layer3), kDocumentRangeBefore));
+            move_range(doc,
+                       layers_range(layer3, layer4),
+                       layers_range(layer3), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer3, layer4),
-    move_range(doc,
-      layers_range(layer3, layer4),
-      layers_range(layer3), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer3, layer4),
+                       layers_range(layer3), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer3, layer4),
-    move_range(doc,
-      layers_range(layer3, layer4),
-      layers_range(layer4), kDocumentRangeBefore));
+            move_range(doc,
+                       layers_range(layer3, layer4),
+                       layers_range(layer4), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(layers_range(layer3, layer4),
-    move_range(doc,
-      layers_range(layer3, layer4),
-      layers_range(layer4), kDocumentRangeAfter));
+            move_range(doc,
+                       layers_range(layer3, layer4),
+                       layers_range(layer4), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
@@ -359,35 +415,35 @@ TEST_F(DocRangeOps, MoveLayersNoOp) {
   for (int i=0; i<2; ++i) {
     for (int layer=0; layer<4; ++layer) {
       EXPECT_EQ(layers_range(layer1, layer4),
-        move_range(doc,
-          layers_range(layer1, layer4),
-          layers_range(layer), places[i]));
+                move_range(doc,
+                           layers_range(layer1, layer4),
+                           layers_range(layer), places[i]));
       EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
       EXPECT_FALSE(doc->undoHistory()->canUndo());
     }
 
     for (int layer=0; layer<3; ++layer) {
       EXPECT_EQ(layers_range(layer1, layer4),
-        move_range(doc,
-          layers_range(layer1, layer4),
-          layers_range(layer, layer+1), places[i]));
+                move_range(doc,
+                           layers_range(layer1, layer4),
+                           layers_range(layer, layer+1), places[i]));
       EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
       EXPECT_FALSE(doc->undoHistory()->canUndo());
     }
 
     for (int layer=0; layer<2; ++layer) {
       EXPECT_EQ(layers_range(layer1, layer4),
-        move_range(doc,
-          layers_range(layer1, layer4),
-          layers_range(layer, layer+2), places[i]));
+                move_range(doc,
+                           layers_range(layer1, layer4),
+                           layers_range(layer, layer+2), places[i]));
       EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
       EXPECT_FALSE(doc->undoHistory()->canUndo());
     }
 
     EXPECT_EQ(layers_range(layer1, layer4),
-      move_range(doc,
-        layers_range(layer1, layer4),
-        layers_range(layer1, layer4), places[i]));
+              move_range(doc,
+                         layers_range(layer1, layer4),
+                         layers_range(layer1, layer4), places[i]));
     EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
     EXPECT_FALSE(doc->undoHistory()->canUndo());
   }
@@ -397,109 +453,109 @@ TEST_F(DocRangeOps, MoveFramesNoOp) {
   // Move one frame to the same place
 
   EXPECT_EQ(frames_range(0),
-    move_range(doc,
-      frames_range(0),
-      frames_range(0), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(0),
+                       frames_range(0), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(0),
-    move_range(doc,
-      frames_range(0),
-      frames_range(1), kDocumentRangeBefore));
+            move_range(doc,
+                       frames_range(0),
+                       frames_range(1), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(3),
-    move_range(doc,
-      frames_range(3),
-      frames_range(3), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(3),
+                       frames_range(3), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(3),
-    move_range(doc,
-      frames_range(3),
-      frames_range(3), kDocumentRangeBefore));
+            move_range(doc,
+                       frames_range(3),
+                       frames_range(3), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(3),
-    move_range(doc,
-      frames_range(3),
-      frames_range(2), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(3),
+                       frames_range(2), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   // Move two frame to the same place
 
   EXPECT_EQ(frames_range(0, 1),
-    move_range(doc,
-      frames_range(0, 1),
-      frames_range(0), kDocumentRangeBefore));
+            move_range(doc,
+                       frames_range(0, 1),
+                       frames_range(0), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(0, 1),
-    move_range(doc,
-      frames_range(0, 1),
-      frames_range(0), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(0, 1),
+                       frames_range(0), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(0, 1),
-    move_range(doc,
-      frames_range(0, 1),
-      frames_range(1), kDocumentRangeBefore));
+            move_range(doc,
+                       frames_range(0, 1),
+                       frames_range(1), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(0, 1),
-    move_range(doc,
-      frames_range(0, 1),
-      frames_range(1), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(0, 1),
+                       frames_range(1), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(0, 1),
-    move_range(doc,
-      frames_range(0, 1),
-      frames_range(2), kDocumentRangeBefore));
+            move_range(doc,
+                       frames_range(0, 1),
+                       frames_range(2), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(2, 3),
-    move_range(doc,
-      frames_range(2, 3),
-      frames_range(1), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(2, 3),
+                       frames_range(1), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(2, 3),
-    move_range(doc,
-      frames_range(2, 3),
-      frames_range(2), kDocumentRangeBefore));
+            move_range(doc,
+                       frames_range(2, 3),
+                       frames_range(2), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(2, 3),
-    move_range(doc,
-      frames_range(2, 3),
-      frames_range(2), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(2, 3),
+                       frames_range(2), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(2, 3),
-    move_range(doc,
-      frames_range(2, 3),
-      frames_range(3), kDocumentRangeBefore));
+            move_range(doc,
+                       frames_range(2, 3),
+                       frames_range(3), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
   EXPECT_EQ(frames_range(2, 3),
-    move_range(doc,
-      frames_range(2, 3),
-      frames_range(3), kDocumentRangeAfter));
+            move_range(doc,
+                       frames_range(2, 3),
+                       frames_range(3), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
   EXPECT_FALSE(doc->undoHistory()->canUndo());
 
@@ -509,42 +565,50 @@ TEST_F(DocRangeOps, MoveFramesNoOp) {
   for (int i=0; i<2; ++i) {
     for (int frame=0; frame<4; ++frame) {
       EXPECT_EQ(frames_range(0, 3),
-        move_range(doc,
-          frames_range(0, 3),
-          frames_range(frame), places[i]));
+                move_range(doc,
+                           frames_range(0, 3),
+                           frames_range(frame), places[i]));
       EXPECT_FRAME_ORDER(0, 1, 2, 3);
       EXPECT_FALSE(doc->undoHistory()->canUndo());
     }
 
     for (int frame=0; frame<3; ++frame) {
       EXPECT_EQ(frames_range(0, 3),
-        move_range(doc,
-          frames_range(0, 3),
-          frames_range(frame, frame+1), places[i]));
+                move_range(doc,
+                           frames_range(0, 3),
+                           frames_range(frame, frame+1), places[i]));
       EXPECT_FRAME_ORDER(0, 1, 2, 3);
       EXPECT_FALSE(doc->undoHistory()->canUndo());
     }
 
     for (int frame=0; frame<2; ++frame) {
       EXPECT_EQ(frames_range(0, 3),
-        move_range(doc,
-          frames_range(0, 3),
-          frames_range(frame, frame+2), places[i]));
+                move_range(doc,
+                           frames_range(0, 3),
+                           frames_range(frame, frame+2), places[i]));
       EXPECT_FRAME_ORDER(0, 1, 2, 3);
       EXPECT_FALSE(doc->undoHistory()->canUndo());
     }
 
     EXPECT_EQ(frames_range(0, 3),
-      move_range(doc,
-        frames_range(0, 3),
-        frames_range(0, 3), places[i]));
+              move_range(doc,
+                         frames_range(0, 3),
+                         frames_range(0, 3), places[i]));
     EXPECT_FRAME_ORDER(0, 1, 2, 3);
     EXPECT_FALSE(doc->undoHistory()->canUndo());
   }
 }
 
 TEST_F(DocRangeOps, MoveCelsNoOp) {
-  // TODO
+  EXPECT_EQ(cels_range(0, 0, 1, 1),
+            move_range(doc,
+                       cels_range(0, 0, 1, 1),
+                       cels_range(0, 0, 1, 1), kDocumentRangeAfter));
+  EXPECT_CEL(0, 0, 0, 0);
+  EXPECT_CEL(0, 1, 0, 1);
+  EXPECT_CEL(1, 0, 1, 0);
+  EXPECT_CEL(1, 1, 1, 1);
+  EXPECT_FALSE(doc->undoHistory()->canUndo());
 }
 
 TEST_F(DocRangeOps, CopyCelsNoOp) {
@@ -552,25 +616,21 @@ TEST_F(DocRangeOps, CopyCelsNoOp) {
 }
 
 TEST_F(DocRangeOps, MoveLayers) {
-  DocumentRange result;
-
   // One layer at the bottom of another
-  result = move_range(doc,
-    layers_range(layer1),
-    layers_range(layer2), kDocumentRangeAfter);
+  EXPECT_EQ(layers_range(layer1),
+            move_range(doc,
+                       layers_range(layer1),
+                       layers_range(layer2), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer2, layer1, layer3, layer4);
-  EXPECT_EQ(layers_range(layer1), result);
-
   doc->undoHistory()->undo();
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 
   // One layer at the bottom
-  result = move_range(doc,
-    layers_range(layer2),
-    layers_range(layer1), kDocumentRangeBefore);
+  EXPECT_EQ(layers_range(layer2),
+            move_range(doc,
+                       layers_range(layer2),
+                       layers_range(layer1), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer2, layer1, layer3, layer4);
-  EXPECT_EQ(layers_range(layer2), result);
-
   doc->undoHistory()->undo();
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 
@@ -585,46 +645,43 @@ TEST_F(DocRangeOps, MoveLayers) {
   layer1->setBackground(false);
 
   // Move one layer to the top
-  result = move_range(doc,
-    layers_range(layer2),
-    layers_range(layer4), kDocumentRangeAfter);
+  EXPECT_EQ(layers_range(layer2),
+            move_range(doc,
+                       layers_range(layer2),
+                       layers_range(layer4), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer3, layer4, layer2);
-  EXPECT_EQ(layers_range(layer2), result);
-
   doc->undoHistory()->undo();
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 
   // Move one layers before other
-  result = move_range(doc,
-    layers_range(layer2),
-    layers_range(layer4), kDocumentRangeBefore);
+  EXPECT_EQ(layers_range(layer2),
+            move_range(doc,
+                       layers_range(layer2),
+                       layers_range(layer4), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer1, layer3, layer2, layer4);
-  EXPECT_EQ(layers_range(layer2), result);
-
   doc->undoHistory()->undo();
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 
-  result = move_range(doc,
-    layers_range(layer1),
-    layers_range(layer3, layer4), kDocumentRangeBefore);
+  EXPECT_EQ(layers_range(layer1),
+            move_range(doc,
+                       layers_range(layer1),
+                       layers_range(layer3, layer4), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer2, layer1, layer3, layer4);
-  EXPECT_EQ(layers_range(layer1), result);
-
   doc->undoHistory()->undo();
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 
   // Move two layers on top of other
-  result = move_range(doc,
-    layers_range(layer2, layer3),
-    layers_range(layer4), kDocumentRangeAfter);
+  EXPECT_EQ(layers_range(layer2, layer3),
+            move_range(doc,
+                       layers_range(layer2, layer3),
+                       layers_range(layer4), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer4, layer2, layer3);
-  EXPECT_EQ(layers_range(layer2, layer3), result);
 
-  result = move_range(doc,
-    layers_range(layer2, layer3),
-    layers_range(layer1), kDocumentRangeAfter);
+  EXPECT_EQ(layers_range(layer2, layer3),
+            move_range(doc,
+                       layers_range(layer2, layer3),
+                       layers_range(layer1), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
-  EXPECT_EQ(layers_range(layer2, layer3), result);
 
   // Move three layers at the bottom (but we cannot because the bottom is a background layer)
   layer1->setBackground(true);
@@ -637,85 +694,243 @@ TEST_F(DocRangeOps, MoveLayers) {
   layer1->setBackground(false);
 
   // Move three layers at the top
-  result = move_range(doc,
-    layers_range(layer1, layer3),
-    layers_range(layer4), kDocumentRangeAfter);
+  EXPECT_EQ(layers_range(layer1, layer3),
+            move_range(doc,
+                       layers_range(layer1, layer3),
+                       layers_range(layer4), kDocumentRangeAfter));
   EXPECT_LAYER_ORDER(layer4, layer1, layer2, layer3);
-  EXPECT_EQ(layers_range(layer1, layer3), result);
-
   doc->undoHistory()->undo();
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 
   // Move three layers at the bottom
-  result = move_range(doc,
-    layers_range(layer2, layer4),
-    layers_range(layer1), kDocumentRangeBefore);
+  EXPECT_EQ(layers_range(layer2, layer4),
+            move_range(doc,
+                       layers_range(layer2, layer4),
+                       layers_range(layer1), kDocumentRangeBefore));
   EXPECT_LAYER_ORDER(layer2, layer3, layer4, layer1);
-  EXPECT_EQ(layers_range(layer2, layer4), result);
-
   doc->undoHistory()->undo();
   EXPECT_LAYER_ORDER(layer1, layer2, layer3, layer4);
 }
 
 TEST_F(DocRangeOps, MoveFrames) {
-  move_range(doc,
-    frames_range(0, 0),
-    frames_range(1, 1), kDocumentRangeAfter);
+  // Move frame 0 after 1
+  EXPECT_EQ(frames_range(1),
+            move_range(doc,
+                       frames_range(0),
+                       frames_range(1), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(1, 0, 2, 3);
-
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  // Move one frame at the end
-  move_range(doc,
-    frames_range(1, 1),
-    frames_range(3, 3), kDocumentRangeAfter);
+  // Move frame 1 after frame 5 (at the end)
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+  EXPECT_EQ(frames_range(5),
+            move_range(doc,
+                       frames_range(1),
+                       frames_range(5), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER6(0, 2, 3, 4, 5, 1);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move frames 1,2 after 5
+  EXPECT_EQ(frames_range(4, 5),
+            move_range(
+              doc,
+              frames_range(1, 2),
+              frames_range(5), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER6(0, 3, 4, 5, 1, 2);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move frames 1,2 after 3
+  EXPECT_EQ(frames_range(1, 2),
+            move_range(doc,
+                       frames_range(2, 3),
+                       frames_range(0), kDocumentRangeAfter));
   EXPECT_FRAME_ORDER(0, 2, 3, 1);
-
-  doc->undoHistory()->undo();
-  EXPECT_FRAME_ORDER(0, 1, 2, 3);
-
-  // Move two frames after other
-  move_range(doc,
-    frames_range(1, 2),
-    frames_range(3, 3), kDocumentRangeAfter);
-  EXPECT_FRAME_ORDER(0, 3, 1, 2);
-
-  doc->undoHistory()->undo();
-  EXPECT_FRAME_ORDER(0, 1, 2, 3);
-
-  move_range(doc,
-    frames_range(2, 3),
-    frames_range(0, 0), kDocumentRangeAfter);
-  EXPECT_FRAME_ORDER(0, 2, 3, 1);
-
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
   // Move three frames at the beginning
-  move_range(doc,
-    frames_range(1, 3),
-    frames_range(0, 0), kDocumentRangeBefore);
+  EXPECT_EQ(frames_range(0, 2),
+            move_range(doc,
+                       frames_range(1, 3),
+                       frames_range(0), kDocumentRangeBefore));
   EXPECT_FRAME_ORDER(1, 2, 3, 0);
-
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Move three frames at the end
+  EXPECT_EQ(frames_range(1, 3),
+            move_range(doc,
+                       frames_range(0, 2),
+                       frames_range(3), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER(3, 0, 1, 2);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+}
+
+TEST_F(DocRangeOps, MoveFramesNonAdjacent) {
+  // Move frames 0,2...
+
+  DocumentRange from;
+  from.startRange(nullptr, 0, DocumentRange::kFrames); from.endRange(nullptr, 0);
+  from.startRange(nullptr, 2, DocumentRange::kFrames); from.endRange(nullptr, 2);
+
+  // Move frames 0,2 after 3...
+
+  EXPECT_EQ(frames_range(2, 3),
+            move_range(doc, from, frames_range(3), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER(1, 3, 0, 2);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Move frames 0,2 before 3...
+
+  EXPECT_EQ(frames_range(1, 2),
+            move_range(doc, from, frames_range(3), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER(1, 0, 2, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Move frames 0,2 before 0...
+
+  EXPECT_EQ(frames_range(0, 1),
+            move_range(doc, from, frames_range(0), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER(0, 2, 1, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Move frames 0,2 after 0...
+
+  EXPECT_EQ(frames_range(0, 1),
+            move_range(doc, from, frames_range(0), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER(0, 2, 1, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Move frames 0,2 before 1...
+
+  EXPECT_EQ(frames_range(0, 1),
+            move_range(doc, from, frames_range(1), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER(0, 2, 1, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Move frames 0,2 after 1...
+
+  EXPECT_EQ(frames_range(1, 2),
+            move_range(doc, from, frames_range(1), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER(1, 0, 2, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Move 1,2,5...
+
+  from.clearRange();
+  from.startRange(nullptr, 1, DocumentRange::kFrames);
+  from.endRange(nullptr, 2);
+  from.startRange(nullptr, 5, DocumentRange::kFrames);
+  from.endRange(nullptr, 5);
+
+  // Move 1,2,5 before 4...
+
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+  EXPECT_EQ(frames_range(2, 4),
+            move_range(doc, from, frames_range(4), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER6(0, 3, 1, 2, 5, 4);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,2,5 after 4...
+
+  EXPECT_EQ(frames_range(3, 5),
+            move_range(doc, from, frames_range(4), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER6(0, 3, 4, 1, 2, 5);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,2,5 before 2...
+
+  EXPECT_EQ(frames_range(1, 3),
+            move_range(doc, from, frames_range(2), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER6(0, 1, 2, 5, 3, 4);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,2,5 after 2...
+
+  EXPECT_EQ(frames_range(1, 3),
+            move_range(doc, from, frames_range(2), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER6(0, 1, 2, 5, 3, 4);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,2,5 before 1...
+
+  EXPECT_EQ(frames_range(1, 3),
+            move_range(doc, from, frames_range(1), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER6(0, 1, 2, 5, 3, 4);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,3,5...
+
+  from.clearRange();
+  from.startRange(nullptr, 1, DocumentRange::kFrames);
+  from.endRange(nullptr, 1);
+  from.startRange(nullptr, 3, DocumentRange::kFrames);
+  from.endRange(nullptr, 3);
+  from.startRange(nullptr, 5, DocumentRange::kFrames);
+  from.endRange(nullptr, 5);
+
+  // Move 1,3,5 before 4...
+
+  EXPECT_EQ(frames_range(2, 4),
+            move_range(doc, from, frames_range(4), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER6(0, 2, 1, 3, 5, 4);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,3,5 after 4...
+
+  EXPECT_EQ(frames_range(3, 5),
+            move_range(doc, from, frames_range(4), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER6(0, 2, 4, 1, 3, 5);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,3,5 before 5...
+
+  EXPECT_EQ(frames_range(3, 5),
+            move_range(doc, from, frames_range(5), kDocumentRangeBefore));
+  EXPECT_FRAME_ORDER6(0, 2, 4, 1, 3, 5);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
+
+  // Move 1,3,5 after 5...
+
+  EXPECT_EQ(frames_range(3, 5),
+            move_range(doc, from, frames_range(5), kDocumentRangeAfter));
+  EXPECT_FRAME_ORDER6(0, 2, 4, 1, 3, 5);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER6(0, 1, 2, 3, 4, 5);
 }
 
 TEST_F(DocRangeOps, MoveCels) {
   DocumentRangePlace ignore = kDocumentRangeBefore;
 
   move_range(doc,
-    cels_range(0, 0, 0, 0),
-    cels_range(0, 1, 0, 1), ignore);
+             cels_range(0, 0, 0, 0),
+             cels_range(0, 1, 0, 1), ignore);
   EXPECT_CEL(0, 0, 0, 1);
   EXPECT_EMPTY_CEL(0, 0);
   doc->undoHistory()->undo();
   EXPECT_CEL(0, 0, 0, 0);
 
   move_range(doc,
-    cels_range(0, 0, 0, 1),
-    cels_range(0, 2, 0, 3), ignore);
+             cels_range(0, 0, 0, 1),
+             cels_range(0, 2, 0, 3), ignore);
   EXPECT_CEL(0, 0, 0, 2);
   EXPECT_CEL(0, 1, 0, 3);
   EXPECT_EMPTY_CEL(0, 0);
@@ -723,8 +938,21 @@ TEST_F(DocRangeOps, MoveCels) {
   doc->undoHistory()->undo();
 
   move_range(doc,
-    cels_range(0, 0, 0, 3),
-    cels_range(1, 0, 1, 3), ignore);
+             cels_range(0, 0, 1, 1),
+             cels_range(2, 2, 3, 3), ignore);
+  EXPECT_CEL(0, 0, 2, 2);
+  EXPECT_CEL(0, 1, 2, 3);
+  EXPECT_CEL(1, 0, 3, 2);
+  EXPECT_CEL(1, 1, 3, 3);
+  EXPECT_EMPTY_CEL(0, 0);
+  EXPECT_EMPTY_CEL(0, 1);
+  EXPECT_EMPTY_CEL(1, 0);
+  EXPECT_EMPTY_CEL(1, 1);
+  doc->undoHistory()->undo();
+
+  move_range(doc,
+             cels_range(0, 0, 0, 3),
+             cels_range(1, 0, 1, 3), ignore);
   EXPECT_CEL(0, 0, 1, 0);
   EXPECT_CEL(0, 1, 1, 1);
   EXPECT_CEL(0, 2, 1, 2);
@@ -734,6 +962,16 @@ TEST_F(DocRangeOps, MoveCels) {
   EXPECT_EMPTY_CEL(0, 2);
   EXPECT_EMPTY_CEL(0, 3);
   doc->undoHistory()->undo();
+
+  // Moving with overlapping areas
+  move_range(doc,
+             cels_range(0, 0, 0, 2),
+             cels_range(0, 1, 0, 3), ignore);
+  EXPECT_CEL(0, 0, 0, 1);
+  EXPECT_CEL(0, 1, 0, 2);
+  EXPECT_CEL(0, 2, 0, 3);
+  EXPECT_EMPTY_CEL(0, 0);
+  doc->undoHistory()->undo();
 }
 
 TEST_F(DocRangeOps, CopyLayers) {
@@ -742,79 +980,139 @@ TEST_F(DocRangeOps, CopyLayers) {
 
 TEST_F(DocRangeOps, CopyFrames) {
   // Copy one frame
-  copy_range(doc,
-    frames_range(0),
-    frames_range(2, 3), kDocumentRangeBefore);
+  EXPECT_EQ(frames_range(2),
+            copy_range(doc,
+                       frames_range(0),
+                       frames_range(2, 3), kDocumentRangeBefore));
   EXPECT_FRAME_COPY1(0, 1, 0, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(0),
-    frames_range(2, 3), kDocumentRangeAfter);
+  EXPECT_EQ(frames_range(4),
+            copy_range(doc,
+                       frames_range(0),
+                       frames_range(2, 3), kDocumentRangeAfter));
   EXPECT_FRAME_COPY1(0, 1, 2, 3, 0);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(3),
-    frames_range(0, 1), kDocumentRangeBefore);
+  EXPECT_EQ(frames_range(0),
+            copy_range(doc,
+                       frames_range(3),
+                       frames_range(0, 1), kDocumentRangeBefore));
   EXPECT_FRAME_COPY1(3, 0, 1, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(3),
-    frames_range(0, 1), kDocumentRangeAfter);
+  EXPECT_EQ(frames_range(2),
+            copy_range(doc,
+                       frames_range(3),
+                       frames_range(0, 1), kDocumentRangeAfter));
   EXPECT_FRAME_COPY1(0, 1, 3, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
   // Copy three frames
 
-  copy_range(doc,
-    frames_range(0, 2),
-    frames_range(3), kDocumentRangeBefore);
+  EXPECT_EQ(frames_range(3, 5),
+            copy_range(doc,
+                       frames_range(0, 2),
+                       frames_range(3), kDocumentRangeBefore));
   EXPECT_FRAME_COPY3(0, 1, 2, 0, 1, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(0, 2),
-    frames_range(3), kDocumentRangeAfter);
+  EXPECT_EQ(frames_range(4, 6),
+            copy_range(doc,
+                       frames_range(0, 2),
+                       frames_range(3), kDocumentRangeAfter));
   EXPECT_FRAME_COPY3(0, 1, 2, 3, 0, 1, 2);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(1, 3),
-    frames_range(0), kDocumentRangeBefore);
+  EXPECT_EQ(frames_range(0, 2),
+            copy_range(doc,
+                       frames_range(1, 3),
+                       frames_range(0), kDocumentRangeBefore));
   EXPECT_FRAME_COPY3(1, 2, 3, 0, 1, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(1, 3),
-    frames_range(0), kDocumentRangeAfter);
+  EXPECT_EQ(frames_range(1, 3),
+            copy_range(doc,
+                       frames_range(1, 3),
+                       frames_range(0), kDocumentRangeAfter));
   EXPECT_FRAME_COPY3(0, 1, 2, 3, 1, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(0, 2),
-    frames_range(0, 2), kDocumentRangeBefore);
+  EXPECT_EQ(frames_range(0, 2),
+            copy_range(doc,
+                       frames_range(0, 2),
+                       frames_range(0, 2), kDocumentRangeBefore));
   EXPECT_FRAME_COPY3(0, 1, 2, 0, 1, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 
-  copy_range(doc,
-    frames_range(0, 2),
-    frames_range(0, 2), kDocumentRangeAfter);
+  EXPECT_EQ(frames_range(3, 5),
+            copy_range(doc,
+                       frames_range(0, 2),
+                       frames_range(0, 2), kDocumentRangeAfter));
   EXPECT_FRAME_COPY3(0, 1, 2, 0, 1, 2, 3);
   doc->undoHistory()->undo();
   EXPECT_FRAME_ORDER(0, 1, 2, 3);
 }
 
+TEST_F(DocRangeOps, CopyFramesNonAdjacent) {
+  // Copy frames 0 and 2...
+
+  DocumentRange from;
+  from.startRange(nullptr, 0, DocumentRange::kFrames); from.endRange(nullptr, 0);
+  from.startRange(nullptr, 2, DocumentRange::kFrames); from.endRange(nullptr, 2);
+
+  EXPECT_EQ(frames_range(3, 4),
+            copy_range(doc, from, frames_range(3), kDocumentRangeBefore));
+  EXPECT_FRAME_COPY2(0, 1, 2, 0, 2, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  EXPECT_EQ(frames_range(4, 5),
+            copy_range(doc, from, frames_range(3), kDocumentRangeAfter));
+  EXPECT_FRAME_COPY2(0, 1, 2, 3, 0, 2);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  EXPECT_EQ(frames_range(2, 3),
+            copy_range(doc, from, frames_range(1), kDocumentRangeAfter));
+  EXPECT_FRAME_COPY2(0, 1, 0, 2, 2, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  EXPECT_EQ(frames_range(1, 2),
+            copy_range(doc, from, frames_range(1), kDocumentRangeBefore));
+  EXPECT_FRAME_COPY2(0, 0, 2, 1, 2, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  // Copy frames 1 and 3...
+
+  from.clearRange();
+  from.startRange(nullptr, 1, DocumentRange::kFrames); from.endRange(nullptr, 1);
+  from.startRange(nullptr, 3, DocumentRange::kFrames); from.endRange(nullptr, 3);
+
+  EXPECT_EQ(frames_range(0, 1),
+            copy_range(doc, from, frames_range(0), kDocumentRangeBefore));
+  EXPECT_FRAME_COPY2(1, 3, 0, 1, 2, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+
+  EXPECT_EQ(frames_range(1, 2),
+            copy_range(doc, from, frames_range(0), kDocumentRangeAfter));
+  EXPECT_FRAME_COPY2(0, 1, 3, 1, 2, 3);
+  doc->undoHistory()->undo();
+  EXPECT_FRAME_ORDER(0, 1, 2, 3);
+}
+
 TEST_F(DocRangeOps, CopyCels) {
   // TODO
 }
diff --git a/src/app/ui/status_bar.h b/src/app/ui/status_bar.h
index 8b9aa8e2e..40bb18a01 100644
--- a/src/app/ui/status_bar.h
+++ b/src/app/ui/status_bar.h
@@ -15,7 +15,6 @@
 #include "doc/context_observer.h"
 #include "doc/document_observer.h"
 #include "doc/documents_observer.h"
-#include "doc/layer_index.h"
 #include "ui/base.h"
 #include "ui/box.h"
 
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 98be39f1f..14c7f275a 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -145,7 +145,7 @@ namespace {
     }
   }
 
-}
+} // anonymous namespace
 
 Timeline::Timeline()
   : Widget(kGenericWidget)
@@ -200,7 +200,7 @@ void Timeline::updateUsingEditor(Editor* editor)
   detachDocument();
 
   if (m_range.enabled()) {
-    m_range.disableRange();
+    m_range.clearRange();
     invalidate();
   }
 
@@ -262,6 +262,23 @@ bool Timeline::isMovingCel() const
           m_range.type() == Range::kCels);
 }
 
+bool Timeline::selectedLayersBounds(const SelectedLayers& layers,
+                                    layer_t* first, layer_t* last) const
+{
+  if (layers.empty())
+    return false;
+
+  *first = *last = getLayerIndex(*layers.begin());
+
+  for (auto layer : layers) {
+    layer_t i = getLayerIndex(layer);
+    if (*first > i) *first = i;
+    if (*last < i) *last = i;
+  }
+
+  return true;
+}
+
 void Timeline::setLayer(Layer* layer)
 {
   ASSERT(m_editor != NULL);
@@ -299,49 +316,49 @@ void Timeline::setFrame(frame_t frame, bool byUser)
   }
 }
 
-SelectedLayers Timeline::selectedLayers() const
-{
-  SelectedLayers layers;
-
-  for (LayerIndex layer = m_range.layerBegin(); layer <= m_range.layerEnd(); ++layer) {
-    layers.insert(m_layers[layer].layer);
-  }
-
-  return layers;
-}
-
-SelectedFrames Timeline::selectedFrames() const
-{
-  SelectedFrames frames;
-
-  if (m_range.enabled() &&
-      m_range.frameBegin() >= frame_t(0)) {
-    frames.insert(m_range.frameBegin(),
-                  m_range.frameEnd());
-  }
-
-  return frames;
-}
-
 void Timeline::prepareToMoveRange()
 {
   ASSERT(m_range.enabled());
 
-  m_moveRangeData.activeRelativeLayer = getLayerIndex(m_layer) - m_range.layerBegin();
-  m_moveRangeData.activeRelativeFrame = m_frame - m_range.frameBegin();
+  layer_t i = 0;
+  for (auto layer : m_range.selectedLayers().toLayerList()) {
+    if (layer == m_layer)
+      break;
+    ++i;
+  }
+
+  frame_t j = 0;
+  for (auto frame : m_range.selectedFrames()) {
+    if (frame == m_frame)
+      break;
+    ++j;
+  }
+
+  m_moveRangeData.activeRelativeLayer = i;
+  m_moveRangeData.activeRelativeFrame = j;
 }
 
 void Timeline::moveRange(Range& range)
 {
   regenerateLayers();
 
-  if (range.layerBegin() >= LayerIndex(0) &&
-      range.layerBegin() + m_moveRangeData.activeRelativeLayer < int(m_layers.size())) {
-    setLayer(m_layers[range.layerBegin() + m_moveRangeData.activeRelativeLayer].layer);
+  layer_t i = 0;
+  for (auto layer : range.selectedLayers().toLayerList()) {
+    if (i == m_moveRangeData.activeRelativeLayer) {
+      setLayer(layer);
+      break;
+    }
+    ++i;
   }
 
-  if (range.frameBegin() >= frame_t(0))
-    setFrame(range.frameBegin() + m_moveRangeData.activeRelativeFrame, true);
+  frame_t j = 0;
+  for (auto frame : range.selectedFrames()) {
+    if (j == m_moveRangeData.activeRelativeFrame) {
+      setFrame(frame, true);
+      break;
+    }
+    ++j;
+  }
 
   m_range = range;
 }
@@ -404,6 +421,14 @@ bool Timeline::onProcessMessage(Message* msg)
       // Clicked-part = hot-part.
       m_clk = m_hot;
 
+      // With Ctrl+click (Win/Linux) or Shift+click (OS X) we can
+      // select non-adjacents layer/frame ranges
+      bool clearRange =
+#if !defined(__APPLE__)
+        !msg->ctrlPressed() ||
+#endif
+        !msg->shiftPressed();
+
       captureMouse();
 
       switch (m_hot.part) {
@@ -425,7 +450,10 @@ bool Timeline::onProcessMessage(Message* msg)
 
           if (selectFrame) {
             m_state = STATE_SELECTING_FRAMES;
-            m_range.startRange(getLayerIndex(m_layer), m_clk.frame, Range::kFrames);
+            if (clearRange)
+              m_range.clearRange();
+            m_range.startRange(m_layer, m_clk.frame, Range::kFrames);
+            m_startRange = m_range;
 
             setFrame(m_clk.frame, true);
           }
@@ -433,12 +461,16 @@ bool Timeline::onProcessMessage(Message* msg)
         }
         case PART_LAYER_TEXT: {
           base::ScopedValue<bool> lock(m_fromTimeline, true, false);
-          LayerIndex old_layer = getLayerIndex(m_layer);
+          layer_t old_layer = getLayerIndex(m_layer);
           bool selectLayer = (mouseMsg->left() || !isLayerActive(m_clk.layer));
 
           if (selectLayer) {
             m_state = STATE_SELECTING_LAYERS;
-            m_range.startRange(m_clk.layer, m_frame, Range::kLayers);
+            if (clearRange)
+              m_range.clearRange();
+            m_range.startRange(m_layers[m_clk.layer].layer,
+                               m_frame, Range::kLayers);
+            m_startRange = m_range;
 
             // Did the user select another layer?
             if (old_layer != m_clk.layer) {
@@ -459,7 +491,7 @@ bool Timeline::onProcessMessage(Message* msg)
           break;
         case PART_CEL: {
           base::ScopedValue<bool> lock(m_fromTimeline, true, false);
-          LayerIndex old_layer = getLayerIndex(m_layer);
+          layer_t old_layer = getLayerIndex(m_layer);
           bool selectCel = (mouseMsg->left()
             || !isLayerActive(m_clk.layer)
             || !isFrameActive(m_clk.frame));
@@ -467,7 +499,10 @@ bool Timeline::onProcessMessage(Message* msg)
 
           if (selectCel) {
             m_state = STATE_SELECTING_CELS;
-            m_range.startRange(m_clk.layer, m_clk.frame, Range::kCels);
+            m_range.clearRange();
+            m_range.startRange(m_layers[m_clk.layer].layer,
+                               m_clk.frame, Range::kCels);
+            m_startRange = m_range;
           }
 
           // Select the new clicked-part.
@@ -493,15 +528,20 @@ bool Timeline::onProcessMessage(Message* msg)
           if (m_range.type() == Range::kCels) {
             m_clk = hitTestCel(mouseMsg->position() - bounds().origin());
 
-            if (m_clk.layer < m_range.layerBegin())
-              m_clk.layer = m_range.layerBegin();
-            else if (m_clk.layer > m_range.layerEnd())
-              m_clk.layer = m_range.layerEnd();
+            if (m_range.layers() > 0) {
+              layer_t layerFirst, layerLast;
+              if (selectedLayersBounds(selectedLayers(),
+                                       &layerFirst, &layerLast)) {
+                layer_t layerIdx = m_clk.layer;
+                layerIdx = MID(layerFirst, layerIdx, layerLast);
+                m_clk.layer = layerIdx;
+              }
+            }
 
-            if (m_clk.frame < m_range.frameBegin())
-              m_clk.frame = m_range.frameBegin();
-            else if (m_clk.frame > m_range.frameEnd())
-              m_clk.frame = m_range.frameEnd();
+            if (m_clk.frame < m_range.firstFrame())
+              m_clk.frame = m_range.firstFrame();
+            else if (m_clk.frame > m_range.lastFrame())
+              m_clk.frame = m_range.lastFrame();
           }
           break;
       }
@@ -573,25 +613,31 @@ bool Timeline::onProcessMessage(Message* msg)
         switch (m_state) {
 
           case STATE_SELECTING_LAYERS: {
-            if (m_layer != m_layers[hit.layer].layer) {
-              m_range.endRange(hit.layer, m_frame);
-              setLayer(m_layers[m_clk.layer = hit.layer].layer);
+            Layer* hitLayer = m_layers[hit.layer].layer;
+            if (m_layer != hitLayer) {
+              m_clk.layer = hit.layer;
+              setLayer(hitLayer);
+              m_range = m_startRange;
+              m_range.endRange(hitLayer, m_frame);
             }
             break;
           }
 
           case STATE_SELECTING_FRAMES: {
-            m_range.endRange(getLayerIndex(m_layer), hit.frame);
             setFrame(m_clk.frame = hit.frame, true);
+            m_range = m_startRange;
+            m_range.endRange(m_layer, hit.frame);
             break;
           }
 
           case STATE_SELECTING_CELS:
-            if ((m_layer != m_layers[hit.layer].layer)
-              || (m_frame != hit.frame)) {
-              m_range.endRange(hit.layer, hit.frame);
-              setLayer(m_layers[m_clk.layer = hit.layer].layer);
+            Layer* hitLayer = m_layers[hit.layer].layer;
+            if ((m_layer != hitLayer) || (m_frame != hit.frame)) {
+              m_clk.layer = hit.layer;
+              setLayer(hitLayer);
               setFrame(m_clk.frame = hit.frame, true);
+              m_range = m_startRange;
+              m_range.endRange(hitLayer, hit.frame);
             }
             break;
         }
@@ -929,7 +975,7 @@ bool Timeline::onProcessMessage(Message* msg)
 
         case kKeyEsc:
           if (m_state == STATE_STANDBY) {
-            m_range.disableRange();
+            m_range.clearRange();
             invalidate();
           }
           else {
@@ -1054,11 +1100,11 @@ void Timeline::onPaint(ui::PaintEvent& ev)
     // Lock the sprite to read/render it.
     const DocumentReader documentReader(m_document, 0);
 
-    LayerIndex layer, first_layer, last_layer;
-    frame_t frame, first_frame, last_frame;
+    layer_t layer, firstLayer, lastLayer;
+    frame_t frame, firstFrame, lastFrame;
 
-    getDrawableLayers(g, &first_layer, &last_layer);
-    getDrawableFrames(g, &first_frame, &last_frame);
+    getDrawableLayers(g, &firstLayer, &lastLayer);
+    getDrawableFrames(g, &firstFrame, &lastFrame);
 
     drawTop(g);
 
@@ -1069,7 +1115,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
     {
       IntersectClip clip(g, getFrameHeadersBounds());
       if (clip) {
-        for (frame=first_frame; frame<=last_frame; ++frame)
+        for (frame=firstFrame; frame<=lastFrame; ++frame)
           drawHeaderFrame(g, frame);
 
         // Draw onionskin indicators.
@@ -1084,7 +1130,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
 
     // Draw each visible layer.
     DrawCelData data;
-    for (layer=last_layer; layer>=first_layer; --layer) {
+    for (layer=lastLayer; layer>=firstLayer; --layer) {
       {
         IntersectClip clip(g, getLayerHeadersBounds());
         if (clip)
@@ -1098,7 +1144,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
       Layer* layerPtr = m_layers[layer].layer;
       if (!layerPtr->isImage()) {
         // Draw empty cels
-        for (frame=first_frame; frame<=last_frame; ++frame) {
+        for (frame=firstFrame; frame<=lastFrame; ++frame) {
           drawCel(g, layer, frame, nullptr, nullptr);
         }
         continue;
@@ -1108,7 +1154,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
       LayerImage* layerImagePtr = static_cast<LayerImage*>(layerPtr);
       data.begin = layerImagePtr->getCelBegin();
       data.end = layerImagePtr->getCelEnd();
-      data.it = layerImagePtr->findFirstCelIteratorAfter(first_frame-1);
+      data.it = layerImagePtr->findFirstCelIteratorAfter(firstFrame-1);
       data.prevIt = data.end;
       data.nextIt = (data.it != data.end ? data.it+1: data.end);
 
@@ -1130,7 +1176,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
               --it2;
               if ((*it2)->image()->id() == imageId) {
                 data.firstLink = it2;
-                if ((*data.firstLink)->frame() < first_frame)
+                if ((*data.firstLink)->frame() < firstFrame)
                   break;
               }
             } while (it2 != data.begin);
@@ -1140,7 +1186,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
           while (it2 != data.end) {
             if ((*it2)->image()->id() == imageId) {
               data.lastLink = it2;
-              if ((*data.lastLink)->frame() > last_frame)
+              if ((*data.lastLink)->frame() > lastFrame)
                 break;
             }
             ++it2;
@@ -1151,7 +1197,7 @@ void Timeline::onPaint(ui::PaintEvent& ev)
         data.activeIt = data.end;
 
       // Draw every visible cel for each layer.
-      for (frame=first_frame; frame<=last_frame; ++frame) {
+      for (frame=firstFrame; frame<=lastFrame; ++frame) {
         Cel* cel =
           (data.it != data.end &&
            (*data.it)->frame() == frame ? *data.it: nullptr);
@@ -1279,7 +1325,7 @@ void Timeline::onRemoveFrame(doc::DocumentEvent& ev)
 
 void Timeline::onSelectionChanged(doc::DocumentEvent& ev)
 {
-  m_range.disableRange();
+  m_range.clearRange();
   invalidate();
 }
 
@@ -1301,7 +1347,7 @@ void Timeline::onAfterFrameChanged(Editor* editor)
   setFrame(editor->frame(), false);
 
   if (!hasCapture())
-    m_range.disableRange();
+    m_range.clearRange();
 
   showCurrentCel();
   invalidate();
@@ -1315,7 +1361,7 @@ void Timeline::onAfterLayerChanged(Editor* editor)
   setLayer(editor->layer());
 
   if (!hasCapture())
-    m_range.disableRange();
+    m_range.clearRange();
 
   showCurrentCel();
   invalidate();
@@ -1366,28 +1412,28 @@ void Timeline::setCursor(ui::Message* msg, const Hit& hit)
   }
 }
 
-void Timeline::getDrawableLayers(ui::Graphics* g, LayerIndex* first_layer, LayerIndex* last_layer)
+void Timeline::getDrawableLayers(ui::Graphics* g, layer_t* firstLayer, layer_t* lastLayer)
 {
   int hpx = (clientBounds().h - HDRSIZE - topHeight());
-  LayerIndex i = lastLayer() - LayerIndex((viewScroll().y+hpx) / LAYSIZE);
-  i = MID(firstLayer(), i, lastLayer());
+  layer_t i = this->lastLayer() - ((viewScroll().y+hpx) / LAYSIZE);
+  i = MID(this->firstLayer(), i, this->lastLayer());
 
-  LayerIndex j = i + LayerIndex(hpx / LAYSIZE + 1);
+  layer_t j = i + (hpx / LAYSIZE + 1);
   if (!m_layers.empty())
-    j = MID(firstLayer(), j, lastLayer());
+    j = MID(this->firstLayer(), j, this->lastLayer());
   else
-    j = LayerIndex::NoLayer;
+    j = -1;
 
-  *first_layer = i;
-  *last_layer = j;
+  *firstLayer = i;
+  *lastLayer = j;
 }
 
-void Timeline::getDrawableFrames(ui::Graphics* g, frame_t* first_frame, frame_t* last_frame)
+void Timeline::getDrawableFrames(ui::Graphics* g, frame_t* firstFrame, frame_t* lastFrame)
 {
   int availW = (clientBounds().w - m_separator_x);
 
-  *first_frame = frame_t(viewScroll().x / FRMSIZE);
-  *last_frame = *first_frame + frame_t(availW / FRMSIZE) + ((availW % FRMSIZE) > 0 ? 1: 0);
+  *firstFrame = frame_t(viewScroll().x / FRMSIZE);
+  *lastFrame = *firstFrame + frame_t(availW / FRMSIZE) + ((availW % FRMSIZE) > 0 ? 1: 0);
 }
 
 void Timeline::drawPart(ui::Graphics* g, const gfx::Rect& bounds,
@@ -1500,7 +1546,7 @@ void Timeline::drawHeaderFrame(ui::Graphics* g, frame_t frame)
   g->setFont(oldFont);
 }
 
-void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
+void Timeline::drawLayer(ui::Graphics* g, int layerIdx)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
   Layer* layer = m_layers[layerIdx].layer;
@@ -1614,7 +1660,7 @@ void Timeline::drawLayer(ui::Graphics* g, LayerIndex layerIdx)
   }
 }
 
-void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Cel* cel, DrawCelData* data)
+void Timeline::drawCel(ui::Graphics* g, layer_t layerIndex, frame_t frame, Cel* cel, DrawCelData* data)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
   Layer* layer = m_layers[layerIndex].layer;
@@ -1622,8 +1668,9 @@ void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Ce
   bool is_hover = (m_hot.part == PART_CEL &&
     m_hot.layer == layerIndex &&
     m_hot.frame == frame);
-  bool is_active = (isLayerActive(layerIndex) || isFrameActive(frame));
-  bool is_empty = (image == nullptr);
+  const bool is_active = (isLayerActive(layerIndex) ||
+                          isFrameActive(frame));
+  const bool is_empty = (image == nullptr);
   gfx::Rect bounds = getPartBounds(Hit(PART_CEL, layerIndex, frame));
   IntersectClip clip(g, bounds);
   if (!clip)
@@ -1740,7 +1787,7 @@ void Timeline::drawFrameTags(ui::Graphics* g)
     }
 
     {
-      bounds = getPartBounds(Hit(PART_FRAME_TAG, LayerIndex(0), 0, frameTag->id()));
+      bounds = getPartBounds(Hit(PART_FRAME_TAG, 0, 0, frameTag->id()));
 
       gfx::Color bg = frameTag->color();
       if (m_clk.part == PART_FRAME_TAG && m_clk.frameTag == frameTag->id()) {
@@ -2054,18 +2101,26 @@ gfx::Rect Timeline::getRangeBounds(const Range& range) const
 {
   gfx::Rect rc;
   switch (range.type()) {
-    case Range::kNone: break; // Return empty rectangle
+    case Range::kNone:
+      // Return empty rectangle
+      break;
     case Range::kCels:
-      rc = getPartBounds(Hit(PART_CEL, range.layerBegin(), range.frameBegin())).createUnion(
-        getPartBounds(Hit(PART_CEL, range.layerEnd(), range.frameEnd())));
+      for (auto layer : range.selectedLayers()) {
+        layer_t layerIdx = getLayerIndex(layer);
+        for (auto frame : range.selectedFrames())
+          rc |= getPartBounds(Hit(PART_CEL, layerIdx, frame));
+      }
       break;
-    case Range::kFrames:
-      rc = getPartBounds(Hit(PART_HEADER_FRAME, firstLayer(), range.frameBegin())).createUnion(
-        getPartBounds(Hit(PART_HEADER_FRAME, firstLayer(), range.frameEnd())));
+    case Range::kFrames: {
+      for (auto frame : range.selectedFrames())
+        rc |= getPartBounds(Hit(PART_HEADER_FRAME, 0, frame));
       break;
+    }
     case Range::kLayers:
-      rc = getPartBounds(Hit(PART_LAYER, range.layerBegin())).createUnion(
-        getPartBounds(Hit(PART_LAYER, range.layerEnd())));
+      for (auto layer : range.selectedLayers()) {
+        layer_t layerIdx = getLayerIndex(layer);
+        rc |= getPartBounds(Hit(PART_LAYER, layerIdx));
+      }
       break;
   }
   return rc;
@@ -2125,11 +2180,7 @@ void Timeline::updateByMousePos(ui::Message* msg, const gfx::Point& mousePos)
 
 Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
 {
-  Hit hit(
-    PART_NOTHING,
-    LayerIndex::NoLayer,
-    frame_t(-1));
-
+  Hit hit(PART_NOTHING, -1, -1);
   if (!m_document)
     return hit;
 
@@ -2140,8 +2191,8 @@ Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
     gfx::Point scroll = viewScroll();
     int top = topHeight();
 
-    hit.layer = lastLayer() - LayerIndex(
-      (mousePos.y
+    hit.layer = lastLayer() -
+      ((mousePos.y
         - top
         - HDRSIZE
         + scroll.y) / LAYSIZE);
@@ -2159,8 +2210,8 @@ Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
         hit.frame = MID(firstFrame(), hit.frame, lastFrame());
     }
     else {
-      if (hit.layer > lastLayer()) hit.layer = LayerIndex::NoLayer;
-      if (hit.frame > lastFrame()) hit.frame = frame_t(-1);
+      if (hit.layer > lastLayer()) hit.layer = -1;
+      if (hit.frame > lastFrame()) hit.frame = -1;
     }
 
     // Is the mouse over onionskin handles?
@@ -2179,7 +2230,7 @@ Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
     // Is the mouse on the frame tags area?
     else if (getPartBounds(Hit(PART_HEADER_FRAME_TAGS)).contains(mousePos)) {
       for (FrameTag* frameTag : m_sprite->frameTags()) {
-        gfx::Rect bounds = getPartBounds(Hit(PART_FRAME_TAG, LayerIndex(0), 0, frameTag->id()));
+        gfx::Rect bounds = getPartBounds(Hit(PART_FRAME_TAG, 0, 0, frameTag->id()));
         if (bounds.contains(mousePos)) {
           hit.part = PART_FRAME_TAG;
           hit.frameTag = frameTag->id();
@@ -2252,18 +2303,14 @@ Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
 
 Timeline::Hit Timeline::hitTestCel(const gfx::Point& mousePos)
 {
-  Hit hit(
-    PART_NOTHING,
-    LayerIndex::NoLayer,
-    frame_t(-1));
-
+  Hit hit(PART_NOTHING, -1, -1);
   if (!m_document)
     return hit;
 
   gfx::Point scroll = viewScroll();
   int top = topHeight();
 
-  hit.layer = lastLayer() - LayerIndex(
+  hit.layer = lastLayer() - (
     (mousePos.y
      - top
      - HDRSIZE
@@ -2320,25 +2367,30 @@ void Timeline::updateStatusBar(ui::Message* msg)
       case Range::kFrames:
         if (validFrame(m_hot.frame)) {
           if (m_dropTarget.hhit == DropTarget::Before) {
-            sb->setStatusText(0, "%s before frame %d", verb, int(m_dropRange.frameBegin()+1));
+            sb->setStatusText(0, "%s before frame %d", verb, int(m_dropRange.firstFrame()+1));
             return;
           }
           else if (m_dropTarget.hhit == DropTarget::After) {
-            sb->setStatusText(0, "%s after frame %d", verb, int(m_dropRange.frameEnd()+1));
+            sb->setStatusText(0, "%s after frame %d", verb, int(m_dropRange.lastFrame()+1));
             return;
           }
         }
         break;
 
       case Range::kLayers: {
-        int layerIdx = -1;
-        if (m_dropTarget.vhit == DropTarget::Bottom)
-          layerIdx = m_dropRange.layerBegin();
-        else if (m_dropTarget.vhit == DropTarget::Top)
-          layerIdx = m_dropRange.layerEnd();
+        layer_t firstLayer;
+        layer_t lastLayer;
+        if (!selectedLayersBounds(m_dropRange.selectedLayers(),
+                                  &firstLayer, &lastLayer))
+          break;
 
-        Layer* layer = ((layerIdx >= 0 && layerIdx < (int)m_layers.size()) ? m_layers[layerIdx].layer:
-                                                                             nullptr);
+        layer_t layerIdx = -1;
+        if (m_dropTarget.vhit == DropTarget::Bottom)
+          layerIdx = firstLayer;
+        else if (m_dropTarget.vhit == DropTarget::Top)
+          layerIdx = lastLayer;
+
+        Layer* layer = (validLayer(layerIdx) ? m_layers[layerIdx].layer: nullptr);
         if (layer) {
           if (m_dropTarget.vhit == DropTarget::Bottom) {
             sb->setStatusText(0, "%s at bottom of layer %s", verb, layer->name().c_str());
@@ -2440,7 +2492,7 @@ void Timeline::updateStatusBar(ui::Message* msg)
   sb->clearText();
 }
 
-void Timeline::showCel(LayerIndex layer, frame_t frame)
+void Timeline::showCel(layer_t layer, frame_t frame)
 {
   gfx::Point scroll = viewScroll();
 
@@ -2478,7 +2530,7 @@ void Timeline::showCel(LayerIndex layer, frame_t frame)
 
 void Timeline::showCurrentCel()
 {
-  LayerIndex layer = getLayerIndex(m_layer);
+  layer_t layer = getLayerIndex(m_layer);
   if (layer >= firstLayer())
     showCel(layer, m_frame);
 }
@@ -2568,29 +2620,29 @@ bool Timeline::allLayersDiscontinuous()
   return true;
 }
 
-LayerIndex Timeline::getLayerIndex(const Layer* layer) const
+layer_t Timeline::getLayerIndex(const Layer* layer) const
 {
   for (int i=0; i<(int)m_layers.size(); i++)
     if (m_layers[i].layer == layer)
-      return LayerIndex(i);
+      return i;
 
-  return LayerIndex::NoLayer;
+  return -1;
 }
 
-bool Timeline::isLayerActive(LayerIndex layerIndex) const
+bool Timeline::isLayerActive(const layer_t layerIndex) const
 {
   if (layerIndex == getLayerIndex(m_layer))
     return true;
   else
-    return m_range.inRange(layerIndex);
+    return m_range.contains(m_layers[layerIndex].layer);
 }
 
-bool Timeline::isFrameActive(frame_t frame) const
+bool Timeline::isFrameActive(const frame_t frame) const
 {
   if (frame == m_frame)
     return true;
   else
-    return m_range.inRange(frame);
+    return m_range.contains(frame);
 }
 
 void Timeline::dropRange(DropOp op)
@@ -2664,57 +2716,24 @@ void Timeline::updateDropRange(const gfx::Point& pt)
   m_dropTarget.vhit = DropTarget::VNone;
 
   if (m_state != STATE_MOVING_RANGE) {
-    m_dropRange.disableRange();
+    m_dropRange.clearRange();
     return;
   }
 
   switch (m_range.type()) {
 
-    case Range::kCels: {
-      frame_t dx = m_hot.frame - m_clk.frame;
-      LayerIndex dy = m_hot.layer - m_clk.layer;
-
-      LayerIndex layerIdx = dy+m_range.layerBegin();
-      layerIdx = MID(firstLayer(), layerIdx, LayerIndex(m_layers.size() - m_range.layers()));
-
-      frame_t frame = dx+m_range.frameBegin();
-      frame = MAX(firstFrame(), frame);
-
-      m_dropRange.startRange(layerIdx, frame, m_range.type());
-      m_dropRange.endRange(
-        layerIdx+LayerIndex(m_range.layers()-1),
-        frame+m_range.frames()-1);
+    case Range::kCels:
+      m_dropRange = m_range;
+      m_dropRange.displace(m_hot.layer - m_clk.layer,
+                           m_hot.frame - m_clk.frame);
       break;
-    }
 
-    case Range::kFrames: {
-      frame_t frame = m_hot.frame;
-      frame_t frameEnd = frame;
-
-      if (frame >= m_range.frameBegin() && frame <= m_range.frameEnd()) {
-        frame = m_range.frameBegin();
-        frameEnd = frame + m_range.frames() - 1;
-      }
-
-      LayerIndex layerIdx = getLayerIndex(m_layer);
-      m_dropRange.startRange(layerIdx, frame, m_range.type());
-      m_dropRange.endRange(layerIdx, frameEnd);
+    case Range::kFrames:
+    case Range::kLayers:
+      m_dropRange.clearRange();
+      m_dropRange.startRange(m_layers[m_hot.layer].layer, m_hot.frame, m_range.type());
+      m_dropRange.endRange(m_layers[m_hot.layer].layer, m_hot.frame);
       break;
-    }
-
-    case Range::kLayers: {
-      LayerIndex layer = m_hot.layer;
-      LayerIndex layerEnd = layer;
-
-      if (layer >= m_range.layerBegin() && layer <= m_range.layerEnd()) {
-        layer = m_range.layerBegin();
-        layerEnd = layer + LayerIndex(m_range.layers() - 1);
-      }
-
-      m_dropRange.startRange(layer, m_frame, m_range.type());
-      m_dropRange.endRange(layerEnd, m_frame);
-      break;
-    }
   }
 
   gfx::Rect bounds = getRangeBounds(m_dropRange);
@@ -2794,7 +2813,7 @@ void Timeline::onNewInputPriority(InputChainElement* element)
   // That is why we don't disable the range in this case.
   Workspace* workspace = dynamic_cast<Workspace*>(element);
   if (!workspace) {
-    m_range.disableRange();
+    m_range.clearRange();
     invalidate();
   }
 }
@@ -2879,7 +2898,7 @@ bool Timeline::onClear(Context* ctx)
 
 void Timeline::onCancel(Context* ctx)
 {
-  m_range.disableRange();
+  m_range.clearRange();
   clearClipboardRange();
   invalidate();
 }
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 0fbb8dcd7..31e472ccb 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -18,7 +18,6 @@
 #include "doc/document_observer.h"
 #include "doc/documents_observer.h"
 #include "doc/frame.h"
-#include "doc/layer_index.h"
 #include "doc/selected_frames.h"
 #include "doc/selected_layers.h"
 #include "doc/sprite.h"
@@ -90,8 +89,8 @@ namespace app {
     bool isMovingCel() const;
 
     Range range() const { return m_range; }
-    SelectedLayers selectedLayers() const;
-    SelectedFrames selectedFrames() const;
+    const SelectedLayers& selectedLayers() const { return m_range.selectedLayers(); }
+    const SelectedFrames& selectedFrames() const { return m_range.selectedFrames(); }
 
     void prepareToMoveRange();
     void moveRange(Range& range);
@@ -151,11 +150,11 @@ namespace app {
 
     struct Hit {
       int part;
-      LayerIndex layer;
+      layer_t layer;
       frame_t frame;
       ObjectId frameTag;
 
-      Hit(int part = 0, LayerIndex layer = LayerIndex(0), frame_t frame = 0, ObjectId frameTag = NullId)
+      Hit(int part = 0, layer_t layer = -1, frame_t frame = 0, ObjectId frameTag = NullId)
         : part(part), layer(layer), frame(frame), frameTag(frameTag) {
       }
 
@@ -182,84 +181,11 @@ namespace app {
       HHit hhit;
       VHit vhit;
       Layer* layer;
-      LayerIndex layerIdx;
+      ObjectId layerId;
       frame_t frame;
       int xpos, ypos;
     };
 
-    void setLayer(Layer* layer);
-    void setFrame(frame_t frame, bool byUser);
-    bool allLayersVisible();
-    bool allLayersInvisible();
-    bool allLayersLocked();
-    bool allLayersUnlocked();
-    bool allLayersContinuous();
-    bool allLayersDiscontinuous();
-    void detachDocument();
-    void setCursor(ui::Message* msg, const Hit& hit);
-    void getDrawableLayers(ui::Graphics* g, LayerIndex* first_layer, LayerIndex* last_layer);
-    void getDrawableFrames(ui::Graphics* g, frame_t* first_frame, frame_t* last_frame);
-    void drawPart(ui::Graphics* g, const gfx::Rect& bounds,
-                  const char* text, skin::Style* style,
-                  bool is_active = false, bool is_hover = false,
-                  bool is_clicked = false, bool is_disabled = false);
-    void drawTop(ui::Graphics* g);
-    void drawHeader(ui::Graphics* g);
-    void drawHeaderFrame(ui::Graphics* g, frame_t frame);
-    void drawLayer(ui::Graphics* g, LayerIndex layerIdx);
-    void drawCel(ui::Graphics* g, LayerIndex layerIdx, frame_t frame, Cel* cel, DrawCelData* data);
-    void drawCelLinkDecorators(ui::Graphics* g, const gfx::Rect& bounds,
-                               Cel* cel, frame_t frame, bool is_active, bool is_hover,
-                               DrawCelData* data);
-    void drawFrameTags(ui::Graphics* g);
-    void drawRangeOutline(ui::Graphics* g);
-    void drawPaddings(ui::Graphics* g);
-    bool drawPart(ui::Graphics* g, int part, LayerIndex layer, frame_t frame);
-    void drawClipboardRange(ui::Graphics* g);
-    gfx::Rect getLayerHeadersBounds() const;
-    gfx::Rect getFrameHeadersBounds() const;
-    gfx::Rect getOnionskinFramesBounds() const;
-    gfx::Rect getCelsBounds() const;
-    gfx::Rect getPartBounds(const Hit& hit) const;
-    gfx::Rect getRangeBounds(const Range& range) const;
-    void invalidateHit(const Hit& hit);
-    void regenerateLayers();
-    void updateScrollBars();
-    void updateByMousePos(ui::Message* msg, const gfx::Point& mousePos);
-    Hit hitTest(ui::Message* msg, const gfx::Point& mousePos);
-    Hit hitTestCel(const gfx::Point& mousePos);
-    void setHot(const Hit& hit);
-    void showCel(LayerIndex layer, frame_t frame);
-    void showCurrentCel();
-    void cleanClk();
-    gfx::Size getScrollableSize() const;
-    gfx::Point getMaxScrollablePos() const;
-    LayerIndex getLayerIndex(const Layer* layer) const;
-    bool isLayerActive(LayerIndex layerIdx) const;
-    bool isFrameActive(frame_t frame) const;
-    void updateStatusBar(ui::Message* msg);
-    void updateDropRange(const gfx::Point& pt);
-    void clearClipboardRange();
-
-    bool isCopyKeyPressed(ui::Message* msg);
-
-    // The layer of the bottom (e.g. Background layer)
-    LayerIndex firstLayer() const { return LayerIndex(0); }
-
-    // The layer of the top.
-    LayerIndex lastLayer() const { return LayerIndex(m_layers.size()-1); }
-
-    frame_t firstFrame() const { return frame_t(0); }
-    frame_t lastFrame() const { return m_sprite->lastFrame(); }
-
-    bool validLayer(LayerIndex layer) const { return layer >= firstLayer() && layer <= lastLayer(); }
-    bool validFrame(frame_t frame) const { return frame >= firstFrame() && frame <= lastFrame(); }
-
-    int topHeight() const;
-
-    DocumentPreferences& docPref() const;
-    skin::SkinTheme* skinTheme() const;
-
     struct LayerInfo {
       Layer* layer;
       int level;
@@ -286,6 +212,81 @@ namespace app {
       }
     };
 
+    bool selectedLayersBounds(const SelectedLayers& layers,
+                              layer_t* first, layer_t* last) const;
+
+    void setLayer(Layer* layer);
+    void setFrame(frame_t frame, bool byUser);
+    bool allLayersVisible();
+    bool allLayersInvisible();
+    bool allLayersLocked();
+    bool allLayersUnlocked();
+    bool allLayersContinuous();
+    bool allLayersDiscontinuous();
+    void detachDocument();
+    void setCursor(ui::Message* msg, const Hit& hit);
+    void getDrawableLayers(ui::Graphics* g, layer_t* firstLayer, layer_t* lastLayer);
+    void getDrawableFrames(ui::Graphics* g, frame_t* firstFrame, frame_t* lastFrame);
+    void drawPart(ui::Graphics* g, const gfx::Rect& bounds,
+                  const char* text, skin::Style* style,
+                  bool is_active = false, bool is_hover = false,
+                  bool is_clicked = false, bool is_disabled = false);
+    void drawTop(ui::Graphics* g);
+    void drawHeader(ui::Graphics* g);
+    void drawHeaderFrame(ui::Graphics* g, frame_t frame);
+    void drawLayer(ui::Graphics* g, layer_t layerIdx);
+    void drawCel(ui::Graphics* g, layer_t layerIdx, frame_t frame, Cel* cel, DrawCelData* data);
+    void drawCelLinkDecorators(ui::Graphics* g, const gfx::Rect& bounds,
+                               Cel* cel, frame_t frame, bool is_active, bool is_hover,
+                               DrawCelData* data);
+    void drawFrameTags(ui::Graphics* g);
+    void drawRangeOutline(ui::Graphics* g);
+    void drawPaddings(ui::Graphics* g);
+    bool drawPart(ui::Graphics* g, int part, layer_t layer, frame_t frame);
+    void drawClipboardRange(ui::Graphics* g);
+    gfx::Rect getLayerHeadersBounds() const;
+    gfx::Rect getFrameHeadersBounds() const;
+    gfx::Rect getOnionskinFramesBounds() const;
+    gfx::Rect getCelsBounds() const;
+    gfx::Rect getPartBounds(const Hit& hit) const;
+    gfx::Rect getRangeBounds(const Range& range) const;
+    void invalidateHit(const Hit& hit);
+    void regenerateLayers();
+    void updateScrollBars();
+    void updateByMousePos(ui::Message* msg, const gfx::Point& mousePos);
+    Hit hitTest(ui::Message* msg, const gfx::Point& mousePos);
+    Hit hitTestCel(const gfx::Point& mousePos);
+    void setHot(const Hit& hit);
+    void showCel(layer_t layer, frame_t frame);
+    void showCurrentCel();
+    void cleanClk();
+    gfx::Size getScrollableSize() const;
+    gfx::Point getMaxScrollablePos() const;
+    layer_t getLayerIndex(const Layer* layer) const;
+    bool isLayerActive(const layer_t layerIdx) const;
+    bool isFrameActive(const frame_t frame) const;
+    void updateStatusBar(ui::Message* msg);
+    void updateDropRange(const gfx::Point& pt);
+    void clearClipboardRange();
+
+    bool isCopyKeyPressed(ui::Message* msg);
+
+    // The layer of the bottom (e.g. Background layer)
+    layer_t firstLayer() const { return 0; }
+    // The layer of the top.
+    layer_t lastLayer() const { return m_layers.size()-1; }
+
+    frame_t firstFrame() const { return frame_t(0); }
+    frame_t lastFrame() const { return m_sprite->lastFrame(); }
+
+    bool validLayer(layer_t layer) const { return layer >= firstLayer() && layer <= lastLayer(); }
+    bool validFrame(frame_t frame) const { return frame >= firstFrame() && frame <= lastFrame(); }
+
+    int topHeight() const;
+
+    DocumentPreferences& docPref() const;
+    skin::SkinTheme* skinTheme() const;
+
     ui::ScrollBar m_hbar;
     ui::ScrollBar m_vbar;
     gfx::Rect m_viewportArea;
@@ -296,6 +297,7 @@ namespace app {
     Layer* m_layer;
     frame_t m_frame;
     Range m_range;
+    Range m_startRange;
     Range m_dropRange;
     State m_state;
     std::vector<LayerInfo> m_layers;
@@ -324,7 +326,7 @@ namespace app {
 
     // Temporal data used to move the range.
     struct MoveRange {
-      int activeRelativeLayer;
+      layer_t activeRelativeLayer;
       frame_t activeRelativeFrame;
     } m_moveRangeData;
   };
diff --git a/src/app/util/clipboard.cpp b/src/app/util/clipboard.cpp
index e6c6b1a04..181888da0 100644
--- a/src/app/util/clipboard.cpp
+++ b/src/app/util/clipboard.cpp
@@ -348,31 +348,28 @@ void paste()
       DocumentRange srcRange = clipboard_range.range();
       Document* srcDoc = clipboard_range.document();
       Sprite* srcSpr = srcDoc->sprite();
-      LayerList srcLayers = srcSpr->allBrowsableLayers();
-      LayerList dstLayers = dstSpr->allBrowsableLayers();
 
       switch (srcRange.type()) {
 
         case DocumentRange::kCels: {
+          Layer* dstLayer = editor->layer();
+          frame_t dstFrameFirst = editor->frame();
+
+          DocumentRange dstRange;
+          dstRange.startRange(dstLayer, dstFrameFirst, DocumentRange::kCels);
+          for (layer_t i=1; i<srcRange.layers(); ++i) {
+            dstLayer = dstLayer->getPreviousInWholeHierarchy();
+            if (dstLayer == nullptr)
+              break;
+          }
+          dstRange.endRange(dstLayer, dstFrameFirst+srcRange.frames()-1);
+
           // We can use a document range op (copy_range) to copy/paste
           // cels in the same document.
           if (srcDoc == dstDoc) {
-            Timeline* timeline = App::instance()->timeline();
-            DocumentRange dstRange = timeline->range();
-            LayerIndex dstLayer = srcSpr->layerToIndex(editor->layer());
-            frame_t dstFrame = editor->frame();
-
-            if (dstRange.enabled()) {
-              dstLayer = dstRange.layerEnd();
-              dstFrame = dstRange.frameBegin();
-            }
-
-            LayerIndex dstLayer2(int(dstLayer)-srcRange.layers()+1);
-            dstRange.startRange(dstLayer, dstFrame, DocumentRange::kCels);
-            dstRange.endRange(dstLayer2, dstFrame+srcRange.frames()-1);
-
             // This is the app::copy_range (not clipboard::copy_range()).
-            app::copy_range(srcDoc, srcRange, dstRange, kDocumentRangeBefore);
+            if (srcRange.layers() == dstRange.layers())
+              app::copy_range(srcDoc, srcRange, dstRange, kDocumentRangeBefore);
             editor->invalidate();
             return;
           }
@@ -381,32 +378,36 @@ void paste()
           DocumentApi api = dstDoc->getApi(transaction);
 
           // Add extra frames if needed
-          frame_t dstFrameBegin = editor->frame();
-          while (dstFrameBegin+srcRange.frames() > dstSpr->totalFrames())
+          while (dstFrameFirst+srcRange.frames() > dstSpr->totalFrames())
             api.addFrame(dstSpr, dstSpr->totalFrames());
 
-          for (LayerIndex
-                 i = srcRange.layerEnd(),
-                 j = dstSpr->layerToIndex(editor->layer());
-               i >= srcRange.layerBegin() &&
-                 i >= LayerIndex(0) &&
-                 j >= LayerIndex(0); --i, --j) {
+          auto srcIt = srcRange.selectedLayers().begin();
+          auto dstIt = dstRange.selectedLayers().begin();
+          auto srcEnd = srcRange.selectedLayers().end();
+          auto dstEnd = dstRange.selectedLayers().end();
+
+          for (; srcIt != srcEnd && dstIt != dstEnd; ++srcIt, ++dstIt) {
+            auto srcLayer = *srcIt;
+            auto dstLayer = *dstIt;
+
+            if (!srcLayer->isImage() ||
+                !dstLayer->isImage())
+              continue;
+
             // Maps a linked Cel in the original sprite with its
             // corresponding copy in the new sprite. In this way
             // we can.
             std::map<Cel*, Cel*> relatedCels;
 
-            for (frame_t frame = srcRange.frameBegin(),
-                   dstFrame = dstFrameBegin;
-                 frame <= srcRange.frameEnd();
-                 ++frame, ++dstFrame) {
-              Cel* srcCel = srcLayers[i]->cel(frame);
+            frame_t dstFrame = dstFrameFirst;
+            for (frame_t srcFrame : srcRange.selectedFrames()) {
+              Cel* srcCel = srcLayer->cel(srcFrame);
               Cel* srcLink = nullptr;
 
               if (srcCel && srcCel->image()) {
                 bool createCopy = true;
 
-                if (dstLayers[j]->isContinuous() &&
+                if (dstLayer->isContinuous() &&
                     srcCel->links()) {
                   srcLink = srcCel->link();
                   if (!srcLink)
@@ -419,28 +420,29 @@ void paste()
 
                       // Create a link from dstRelated
                       api.copyCel(
-                        static_cast<LayerImage*>(dstLayers[j]), dstRelated->frame(),
-                        static_cast<LayerImage*>(dstLayers[j]), dstFrame);
+                        static_cast<LayerImage*>(dstLayer), dstRelated->frame(),
+                        static_cast<LayerImage*>(dstLayer), dstFrame);
                     }
                   }
                 }
 
                 if (createCopy) {
                   api.copyCel(
-                    static_cast<LayerImage*>(srcLayers[i]), frame,
-                    static_cast<LayerImage*>(dstLayers[j]), dstFrame);
+                    static_cast<LayerImage*>(srcLayer), srcFrame,
+                    static_cast<LayerImage*>(dstLayer), dstFrame);
 
                   if (srcLink)
-                    relatedCels[srcLink] = dstLayers[j]->cel(dstFrame);
+                    relatedCels[srcLink] = dstLayer->cel(dstFrame);
                 }
               }
               else {
-                Cel* dstCel = dstLayers[j]->cel(dstFrame);
+                Cel* dstCel = dstLayer->cel(dstFrame);
                 if (dstCel)
                   api.clearCel(dstCel);
               }
-            }
 
+              ++dstFrame;
+            }
           }
 
           transaction.commit();
@@ -449,42 +451,49 @@ void paste()
         }
 
         case DocumentRange::kFrames: {
-          Transaction transaction(UIContext::instance(), "Paste Frames");
-          DocumentApi api = dstDoc->getApi(transaction);
           frame_t dstFrame = editor->frame();
 
+          // We use a DocumentRange operation to copy frames inside
+          // the same sprite.
           if (srcSpr == dstSpr) {
-            if (srcRange.inRange(dstFrame))
-              dstFrame = srcRange.frameEnd()+1;
+            DocumentRange dstRange;
+            dstRange.startRange(nullptr, dstFrame, DocumentRange::kFrames);
+            dstRange.endRange(nullptr, dstFrame);
+            app::copy_range(srcDoc, srcRange, dstRange, kDocumentRangeBefore);
+            break;
           }
 
-          frame_t srcFrame = srcRange.frameBegin();
-          for (frame_t frame = srcRange.frameBegin(); frame <= srcRange.frameEnd(); ++frame) {
+          Transaction transaction(UIContext::instance(), "Paste Frames");
+          DocumentApi api = dstDoc->getApi(transaction);
+
+          auto srcLayers = srcSpr->allBrowsableLayers();
+          auto dstLayers = dstSpr->allBrowsableLayers();
+
+          for (frame_t srcFrame : srcRange.selectedFrames()) {
             api.addEmptyFrame(dstSpr, dstFrame);
-
-            // If we are copying frames from/to the same sprite, we
-            // have to adjust the source frame.
-            if (srcSpr == dstSpr) {
-              if (dstFrame < srcFrame)
-                ++srcFrame;
-            }
-
             api.setFrameDuration(dstSpr, dstFrame, srcSpr->frameDuration(srcFrame));
 
-            for (LayerIndex
-                   i = LayerIndex(srcLayers.size()-1),
-                   j = LayerIndex(dstLayers.size()-1);
-                   i >= LayerIndex(0) &&
-                   j >= LayerIndex(0); --i, --j) {
-              Cel* cel = static_cast<LayerImage*>(srcLayers[i])->cel(srcFrame);
+            auto srcIt = srcLayers.begin();
+            auto dstIt = dstLayers.begin();
+            auto srcEnd = srcLayers.end();
+            auto dstEnd = dstLayers.end();
+
+            for (; srcIt != srcEnd && dstIt != dstEnd; ++srcIt, ++dstIt) {
+              auto srcLayer = *srcIt;
+              auto dstLayer = *dstIt;
+
+              if (!srcLayer->isImage() ||
+                  !dstLayer->isImage())
+                continue;
+
+              Cel* cel = static_cast<LayerImage*>(srcLayer)->cel(srcFrame);
               if (cel && cel->image()) {
                 api.copyCel(
-                  static_cast<LayerImage*>(srcLayers[i]), srcFrame,
-                  static_cast<LayerImage*>(dstLayers[j]), dstFrame);
+                  static_cast<LayerImage*>(srcLayer), srcFrame,
+                  static_cast<LayerImage*>(dstLayer), dstFrame);
               }
             }
 
-            ++srcFrame;
             ++dstFrame;
           }
 
@@ -500,39 +509,49 @@ void paste()
           Transaction transaction(UIContext::instance(), "Paste Layers");
           DocumentApi api = dstDoc->getApi(transaction);
 
+          // Remove children if their parent is selected so we only
+          // copy the parent.
+          SelectedLayers srcLayersSet = srcRange.selectedLayers();
+          srcLayersSet.removeChildrenIfParentIsSelected();
+          LayerList srcLayers = srcLayersSet.toLayerList();
+
           // Expand frames of dstDoc if it's needed.
-          frame_t maxFrame(0);
-          for (LayerIndex i = srcRange.layerBegin();
-               i <= srcRange.layerEnd() &&
-               i < LayerIndex(srcLayers.size()); ++i) {
-            Cel* lastCel = static_cast<LayerImage*>(srcLayers[i])->getLastCel();
+          frame_t maxFrame = 0;
+          for (Layer* srcLayer : srcLayers) {
+            if (!srcLayer->isImage())
+              continue;
+
+            Cel* lastCel = static_cast<LayerImage*>(srcLayer)->getLastCel();
             if (lastCel && maxFrame < lastCel->frame())
               maxFrame = lastCel->frame();
           }
           while (dstSpr->totalFrames() < maxFrame+1)
             api.addEmptyFrame(dstSpr, dstSpr->totalFrames());
 
-          for (LayerIndex i = srcRange.layerBegin(); i <= srcRange.layerEnd(); ++i) {
+          for (Layer* srcLayer : srcLayers) {
             Layer* afterThis;
-            if (srcLayers[i]->isBackground() &&
-                !dstDoc->sprite()->backgroundLayer()) {
+            if (srcLayer->isBackground() && !dstDoc->sprite()->backgroundLayer())
               afterThis = nullptr;
-            }
             else
               afterThis = dstSpr->root()->lastLayer();
 
-            LayerImage* newLayer = new LayerImage(dstSpr);
+            Layer* newLayer = nullptr;
+            if (srcLayer->isImage())
+              newLayer = new LayerImage(dstSpr);
+            else if (srcLayer->isGroup())
+              newLayer = new LayerGroup(dstSpr);
+            else
+              continue;
+
             api.addLayer(dstSpr->root(), newLayer, afterThis);
 
-            srcDoc->copyLayerContent(
-              srcLayers[i], dstDoc, newLayer);
+            srcDoc->copyLayerContent(srcLayer, dstDoc, newLayer);
           }
 
           transaction.commit();
           editor->invalidate();
           break;
         }
-
       }
       break;
     }
diff --git a/src/app/util/range_utils.cpp b/src/app/util/range_utils.cpp
index 3ddab85aa..5475bbe7d 100644
--- a/src/app/util/range_utils.cpp
+++ b/src/app/util/range_utils.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -34,16 +34,12 @@ CelList get_unique_cels(Sprite* sprite, const DocumentRange& inrange)
 
   std::set<ObjectId> visited;
 
-  for (LayerIndex layerIdx = range.layerBegin(); layerIdx <= range.layerEnd(); ++layerIdx) {
-    Layer* layer = sprite->indexToLayer(layerIdx);
+  for (Layer* layer : range.selectedLayers()) {
     if (!layer || !layer->isImage())
       continue;
 
     LayerImage* layerImage = static_cast<LayerImage*>(layer);
-    for (frame_t frame = range.frameEnd(),
-           begin = range.frameBegin()-1;
-         frame != begin;
-         --frame) {
+    for (frame_t frame : range.selectedFrames()) {
       Cel* cel = layerImage->cel(frame);
       if (!cel)
         continue;
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 847e4170f..6985030a2 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -42,7 +42,6 @@ add_library(doc-lib
   image_io.cpp
   images_collector.cpp
   layer.cpp
-  layer_index.cpp
   layer_io.cpp
   layer_list.cpp
   mask.cpp
diff --git a/src/doc/cels_range.cpp b/src/doc/cels_range.cpp
index d2a0d41e6..79582fbfc 100644
--- a/src/doc/cels_range.cpp
+++ b/src/doc/cels_range.cpp
@@ -17,29 +17,37 @@
 namespace doc {
 
 CelsRange::CelsRange(const Sprite* sprite,
-  frame_t first, frame_t last, Flags flags)
-  : m_begin(sprite, first, last, flags)
-  , m_end()
+                     const SelectedFrames& selFrames,
+                     const Flags flags)
+  : m_selFrames(selFrames)
+  , m_begin(sprite, m_selFrames, flags)
+  , m_end(m_selFrames)
 {
 }
 
-CelsRange::iterator::iterator()
+CelsRange::iterator::iterator(const SelectedFrames& selFrames)
   : m_cel(nullptr)
+  , m_selFrames(selFrames)
+  , m_frameIterator(selFrames.begin())
 {
 }
 
-CelsRange::iterator::iterator(const Sprite* sprite, frame_t first, frame_t last, CelsRange::Flags flags)
+CelsRange::iterator::iterator(const Sprite* sprite,
+                              const SelectedFrames& selFrames,
+                              const CelsRange::Flags flags)
   : m_cel(nullptr)
-  , m_first(first)
-  , m_last(last)
+  , m_selFrames(selFrames)
+  , m_frameIterator(selFrames.begin())
   , m_flags(flags)
 {
   // Get first cel
   Layer* layer = sprite->root()->firstLayer();
   while (layer && !m_cel) {
     if (layer->isImage()) {
-      for (frame_t f=first; f<=last; ++f) {
-        m_cel = layer->cel(f);
+      m_frameIterator = m_selFrames.begin();
+      auto endFrame = m_selFrames.end();
+      for (; m_frameIterator!=endFrame; ++m_frameIterator) {
+        m_cel = layer->cel(*m_frameIterator);
         if (m_cel)
           break;
       }
@@ -58,15 +66,16 @@ CelsRange::iterator& CelsRange::iterator::operator++()
   if (!m_cel)
     return *this;
 
-  // Get next cel
-  Layer* layer = m_cel->layer();
-  frame_t first = m_cel->frame()+1;
-  m_cel = nullptr;
+  auto endFrame = m_selFrames.end();
+  if (m_frameIterator != endFrame)
+    ++m_frameIterator;
 
+  Layer* layer = m_cel->layer();
+  m_cel = nullptr;
   while (layer && !m_cel) {
     if (layer->isImage()) {
-      for (frame_t f=first; f<=m_last; ++f) {
-        m_cel = layer->cel(f);
+      for (; m_frameIterator!=endFrame; ++m_frameIterator) {
+        m_cel = layer->cel(*m_frameIterator);
         if (m_cel) {
           if (m_flags == CelsRange::UNIQUE) {
             if (m_visited.find(m_cel->data()->id()) == m_visited.end()) {
@@ -84,7 +93,7 @@ CelsRange::iterator& CelsRange::iterator::operator++()
 
     if (!m_cel) {
       layer = layer->getNextInWholeHierarchy();
-      first = m_first;
+      m_frameIterator = m_selFrames.begin();
     }
   }
   return *this;
diff --git a/src/doc/cels_range.h b/src/doc/cels_range.h
index c12152204..ecb057d06 100644
--- a/src/doc/cels_range.h
+++ b/src/doc/cels_range.h
@@ -10,12 +10,15 @@
 
 #include "doc/frame.h"
 #include "doc/object_id.h"
+#include "doc/selected_frames.h"
 
 #include <set>
 
 namespace doc {
+
   class Cel;
   class Layer;
+  class SelectedFrames;
   class Sprite;
 
   class CelsRange {
@@ -26,12 +29,15 @@ namespace doc {
     };
 
     CelsRange(const Sprite* sprite,
-      frame_t first, frame_t last, Flags flags = ALL);
+              const SelectedFrames& selFrames,
+              const Flags flags = ALL);
 
     class iterator {
     public:
-      iterator();
-      iterator(const Sprite* sprite, frame_t first, frame_t last, Flags flags);
+      iterator(const SelectedFrames& selFrames);
+      iterator(const Sprite* sprite,
+               const SelectedFrames& selFrames,
+               const Flags flags);
 
       bool operator==(const iterator& other) const {
         return m_cel == other.m_cel;
@@ -49,7 +55,8 @@ namespace doc {
 
     private:
       Cel* m_cel;
-      frame_t m_first, m_last;
+      const SelectedFrames& m_selFrames;
+      SelectedFrames::const_iterator m_frameIterator;
       Flags m_flags;
       std::set<ObjectId> m_visited;
     };
@@ -58,6 +65,7 @@ namespace doc {
     iterator end() { return m_end; }
 
   private:
+    SelectedFrames m_selFrames;
     iterator m_begin, m_end;
   };
 
diff --git a/src/doc/layer.cpp b/src/doc/layer.cpp
index 9c6ba8ff3..e0f5635d9 100644
--- a/src/doc/layer.cpp
+++ b/src/doc/layer.cpp
@@ -424,14 +424,13 @@ void LayerGroup::removeLayer(Layer* layer)
 
 void LayerGroup::insertLayer(Layer* layer, Layer* after)
 {
+  auto after_it = m_layers.begin();
   if (after) {
-    auto after_it = std::find(m_layers.begin(), m_layers.end(), after);
-    ASSERT(after_it != m_layers.end());
-    after_it++;
-    m_layers.insert(after_it, layer);
+    after_it = std::find(m_layers.begin(), m_layers.end(), after);
+    if (after_it != m_layers.end())
+      ++after_it;
   }
-  else
-    m_layers.insert(m_layers.begin(), layer);
+  m_layers.insert(after_it, layer);
 
   layer->setParent(this);
 }
diff --git a/src/doc/layer_index.cpp b/src/doc/layer_index.cpp
deleted file mode 100644
index 0b1bdb828..000000000
--- a/src/doc/layer_index.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Aseprite Document Library
-// Copyright (c) 2001-2014 David Capello
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "doc/layer_index.h"
-
-namespace doc {
-
-const LayerIndex LayerIndex::NoLayer(-1);
-
-} // namespace doc
diff --git a/src/doc/layer_index.h b/src/doc/layer_index.h
deleted file mode 100644
index af3393c65..000000000
--- a/src/doc/layer_index.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Aseprite Document Library
-// Copyright (c) 2001-2014 David Capello
-//
-// This file is released under the terms of the MIT license.
-// Read LICENSE.txt for more information.
-
-#ifndef DOC_LAYER_INDEX_H_INCLUDED
-#define DOC_LAYER_INDEX_H_INCLUDED
-#pragma once
-
-namespace doc {
-
-  class LayerIndex {
-  public:
-    static const LayerIndex NoLayer;
-
-    LayerIndex() : m_value(0) { }
-    explicit LayerIndex(int value) : m_value(value) { }
-
-    LayerIndex next(int i = 1) const { return LayerIndex(m_value+i); };
-    LayerIndex previous(int i = 1) const { return LayerIndex(m_value-i); };
-
-    operator int() { return m_value; }
-    operator const int() const { return m_value; }
-
-    LayerIndex& operator=(const LayerIndex& o) { m_value = o.m_value; return *this; }
-    LayerIndex& operator++() { ++m_value; return *this; }
-    LayerIndex& operator--() { --m_value; return *this; }
-    LayerIndex operator++(int) { LayerIndex old(*this); ++m_value; return old; }
-    LayerIndex operator--(int) { LayerIndex old(*this); --m_value; return old; }
-    LayerIndex& operator+=(const LayerIndex& o) { m_value += o.m_value; return *this; }
-    LayerIndex& operator-=(const LayerIndex& o) { m_value -= o.m_value; return *this; }
-    bool operator<(const LayerIndex& o) const { return m_value < o.m_value; }
-    bool operator>(const LayerIndex& o) const { return m_value > o.m_value; }
-    bool operator<=(const LayerIndex& o) const { return m_value <= o.m_value; }
-    bool operator>=(const LayerIndex& o) const { return m_value >= o.m_value; }
-    bool operator==(const LayerIndex& o) const { return m_value == o.m_value; }
-    bool operator!=(const LayerIndex& o) const { return m_value != o.m_value; }
-
-  private:
-    int m_value;
-  };
-
-  inline LayerIndex operator+(const LayerIndex& x, const LayerIndex& y) {
-    return LayerIndex((int)x + (int)y);
-  }
-
-  inline LayerIndex operator-(const LayerIndex& x, const LayerIndex& y) {
-    return LayerIndex((int)x - (int)y);
-  }
-
-} // namespace doc
-
-#endif
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index d94034186..00e8718f8 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -29,9 +29,6 @@
 
 namespace doc {
 
-static Layer* index2layer(const Layer* layer, const LayerIndex& index, int* index_count);
-static LayerIndex layer2index(const Layer* layer, const Layer* find_layer, int* index_count);
-
 //////////////////////////////////////////////////////////////////////
 // Constructors/Destructor
 
@@ -212,11 +209,6 @@ LayerImage* Sprite::backgroundLayer() const
   return NULL;
 }
 
-LayerIndex Sprite::firstLayer() const
-{
-  return LayerIndex(0);
-}
-
 Layer* Sprite::firstBrowsableLayer() const
 {
   Layer* layer = root()->firstLayer();
@@ -225,31 +217,6 @@ Layer* Sprite::firstBrowsableLayer() const
   return layer;
 }
 
-LayerIndex Sprite::lastLayer() const
-{
-  return LayerIndex(root()->layersCount()-1);
-}
-
-Layer* Sprite::layer(int layerIndex) const
-{
-  return indexToLayer(LayerIndex(layerIndex));
-}
-
-Layer* Sprite::indexToLayer(LayerIndex index) const
-{
-  if (index < LayerIndex(0))
-    return NULL;
-
-  int index_count = -1;
-  return index2layer(root(), index, &index_count);
-}
-
-LayerIndex Sprite::layerToIndex(const Layer* layer) const
-{
-  int index_count = -1;
-  return layer2index(root(), layer, &index_count);
-}
-
 layer_t Sprite::allLayersCount() const
 {
   return root()->allLayersCount();
@@ -554,64 +521,28 @@ LayerList Sprite::allBrowsableLayers() const
 
 CelsRange Sprite::cels() const
 {
-  return CelsRange(this, frame_t(0), lastFrame());
+  SelectedFrames selFrames;
+  selFrames.insert(0, lastFrame());
+  return CelsRange(this, selFrames);
 }
 
 CelsRange Sprite::cels(frame_t frame) const
 {
-  return CelsRange(this, frame, frame);
+  SelectedFrames selFrames;
+  selFrames.insert(frame);
+  return CelsRange(this, selFrames);
 }
 
 CelsRange Sprite::uniqueCels() const
 {
-  return CelsRange(this, frame_t(0), lastFrame(), CelsRange::UNIQUE);
+  SelectedFrames selFrames;
+  selFrames.insert(0, lastFrame());
+  return CelsRange(this, selFrames, CelsRange::UNIQUE);
 }
 
-CelsRange Sprite::uniqueCels(frame_t from, frame_t to) const
+CelsRange Sprite::uniqueCels(const SelectedFrames& selFrames) const
 {
-  return CelsRange(this, from, to, CelsRange::UNIQUE);
-}
-
-//////////////////////////////////////////////////////////////////////
-
-static Layer* index2layer(const Layer* layer, const LayerIndex& index, int* index_count)
-{
-  if (index == *index_count)
-    return (Layer*)layer;
-  else {
-    (*index_count)++;
-
-    if (layer->isGroup()) {
-      Layer *found;
-
-      for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
-        if ((found = index2layer(child, index, index_count)))
-          return found;
-      }
-    }
-
-    return NULL;
-  }
-}
-
-static LayerIndex layer2index(const Layer* layer, const Layer* find_layer, int* index_count)
-{
-  if (layer == find_layer)
-    return LayerIndex(*index_count);
-  else {
-    (*index_count)++;
-
-    if (layer->isGroup()) {
-      int found;
-
-      for (const Layer* child : static_cast<const LayerGroup*>(layer)->layers()) {
-        if ((found = layer2index(child, find_layer, index_count)) >= 0)
-          return LayerIndex(found);
-      }
-    }
-
-    return LayerIndex(-1);
-  }
+  return CelsRange(this, selFrames, CelsRange::UNIQUE);
 }
 
 } // namespace doc
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index 577c4b3bc..fd1428ba7 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -16,7 +16,6 @@
 #include "doc/frame_tags.h"
 #include "doc/image_ref.h"
 #include "doc/image_spec.h"
-#include "doc/layer_index.h"
 #include "doc/object.h"
 #include "doc/pixel_format.h"
 #include "doc/pixel_ratio.h"
@@ -37,6 +36,7 @@ namespace doc {
   class Palette;
   class Remap;
   class RgbMap;
+  class SelectedFrames;
 
   typedef std::vector<Palette*> PalettesList;
 
@@ -91,14 +91,7 @@ namespace doc {
 
     LayerGroup* root() const { return m_root; }
     LayerImage* backgroundLayer() const;
-
-    LayerIndex firstLayer() const;
     Layer* firstBrowsableLayer() const;
-    LayerIndex lastLayer() const;
-
-    Layer* layer(int layerIndex) const;
-    Layer* indexToLayer(LayerIndex index) const;
-    LayerIndex layerToIndex(const Layer* layer) const;
     layer_t allLayersCount() const;
 
     ////////////////////////////////////////
@@ -159,7 +152,7 @@ namespace doc {
     CelsRange cels() const;
     CelsRange cels(frame_t frame) const;
     CelsRange uniqueCels() const;
-    CelsRange uniqueCels(frame_t from, frame_t to) const;
+    CelsRange uniqueCels(const SelectedFrames& selFrames) const;
 
   private:
     Document* m_document;

From ee7c4940d08d2e47c8248816b14f47d7ef893c61 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 17:37:29 -0300
Subject: [PATCH 77/86] Fix duplicateLayerBefore() when it's used in last (top)
 layer

---
 src/app/document_api.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index c7121fa88..41cdd164e 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -498,8 +498,10 @@ Layer* DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
 Layer* DocumentApi::duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer)
 {
   Layer* afterThis = (beforeLayer ? beforeLayer->getPreviousInWholeHierarchy(): nullptr);
-
-  return duplicateLayerAfter(sourceLayer, afterThis);
+  Layer* newLayer = duplicateLayerAfter(sourceLayer, afterThis);
+  if (newLayer)
+    restackLayerBefore(newLayer, beforeLayer);
+  return newLayer;
 }
 
 Cel* DocumentApi::addCel(LayerImage* layer, frame_t frameNumber, const ImageRef& image)

From f527eab3bdd18ace7b8ef1942264745dc02a002b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 17:38:51 -0300
Subject: [PATCH 78/86] Remove unused member variables in crash::Session

---
 src/app/crash/session.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/crash/session.h b/src/app/crash/session.h
index ec97529d4..10dd37bd2 100644
--- a/src/app/crash/session.h
+++ b/src/app/crash/session.h
@@ -65,8 +65,6 @@ namespace crash {
 
     base::pid m_pid;
     std::string m_path;
-    std::fstream m_log;
-    std::fstream m_pidFile;
     Backups m_backups;
 
     DISABLE_COPYING(Session);

From be704d27f3b72d25afe0d532332a8883a70d0f70 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 17:40:02 -0300
Subject: [PATCH 79/86] Don't list incompatible session in data recovery

An incompatible session is when the backup was done with another
Aseprite version number that the running instance.
---
 src/app/crash/data_recovery.cpp |  7 +++++--
 src/app/crash/session.cpp       | 13 +++++++++++++
 src/app/crash/session.h         |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/app/crash/data_recovery.cpp b/src/app/crash/data_recovery.cpp
index 0c1d47119..98311a6df 100644
--- a/src/app/crash/data_recovery.cpp
+++ b/src/app/crash/data_recovery.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -38,7 +38,10 @@ DataRecovery::DataRecovery(doc::Context* ctx)
 
       SessionPtr session(new Session(itempath));
       if (!session->isRunning()) {
-        if (!session->isEmpty()) {
+        if (session->version() != VERSION) {
+          TRACE("cannot be loaded (incompatible version)\n");
+        }
+        else if (!session->isEmpty()) {
           TRACE("to be loaded\n");
           m_sessions.push_back(session);
         }
diff --git a/src/app/crash/session.cpp b/src/app/crash/session.cpp
index eb377e358..d773998d3 100644
--- a/src/app/crash/session.cpp
+++ b/src/app/crash/session.cpp
@@ -72,6 +72,19 @@ std::string Session::name() const
     return name;
 }
 
+std::string Session::version()
+{
+  if (m_version.empty()) {
+    std::string verfile = verFilename();
+    if (base::is_file(verfile)) {
+      std::ifstream pf(FSTREAM_PATH(verfile));
+      if (pf)
+        pf >> m_version;
+    }
+  }
+  return m_version;
+}
+
 const Session::Backups& Session::backups()
 {
   if (m_backups.empty()) {
diff --git a/src/app/crash/session.h b/src/app/crash/session.h
index 10dd37bd2..fdd9fb26d 100644
--- a/src/app/crash/session.h
+++ b/src/app/crash/session.h
@@ -41,6 +41,7 @@ namespace crash {
     ~Session();
 
     std::string name() const;
+    std::string version();
     const Backups& backups();
 
     bool isRunning();
@@ -65,6 +66,7 @@ namespace crash {
 
     base::pid m_pid;
     std::string m_path;
+    std::string m_version;
     Backups m_backups;
 
     DISABLE_COPYING(Session);

From eeb701dc8c75f123fdb7236a9cfca0bde96f00f6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 17:40:47 -0300
Subject: [PATCH 80/86] Save hierarchy of layers correctly in data recovery
 backups

---
 src/app/cmd/add_layer.cpp        |  2 ++
 src/app/cmd/move_layer.cpp       |  2 ++
 src/app/crash/read_document.cpp  | 28 ++++++++++++++++++---
 src/app/crash/write_document.cpp | 42 +++++++++++++++++++++++---------
 4 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/src/app/cmd/add_layer.cpp b/src/app/cmd/add_layer.cpp
index cd512b808..80ed36087 100644
--- a/src/app/cmd/add_layer.cpp
+++ b/src/app/cmd/add_layer.cpp
@@ -68,6 +68,7 @@ void AddLayer::addLayer(Layer* group, Layer* newLayer, Layer* afterThis)
 {
   static_cast<LayerGroup*>(group)->insertLayer(newLayer, afterThis);
   group->incrementVersion();
+  group->sprite()->incrementVersion();
 
   Document* doc = group->sprite()->document();
   DocumentEvent ev(doc);
@@ -86,6 +87,7 @@ void AddLayer::removeLayer(Layer* group, Layer* layer)
 
   static_cast<LayerGroup*>(group)->removeLayer(layer);
   group->incrementVersion();
+  layer->sprite()->incrementVersion();
 
   doc->notifyObservers<DocumentEvent&>(&DocumentObserver::onAfterRemoveLayer, ev);
 
diff --git a/src/app/cmd/move_layer.cpp b/src/app/cmd/move_layer.cpp
index 820bc4117..e50fc87b1 100644
--- a/src/app/cmd/move_layer.cpp
+++ b/src/app/cmd/move_layer.cpp
@@ -48,6 +48,7 @@ void MoveLayer::onExecute()
   if (oldParent != newParent)
     oldParent->incrementVersion();
   newParent->incrementVersion();
+  layer->sprite()->incrementVersion();
 }
 
 void MoveLayer::onUndo()
@@ -66,6 +67,7 @@ void MoveLayer::onUndo()
   if (oldParent != newParent)
     oldParent->incrementVersion();
   newParent->incrementVersion();
+  layer->sprite()->incrementVersion();
 }
 
 void MoveLayer::onFireNotifications()
diff --git a/src/app/crash/read_document.cpp b/src/app/crash/read_document.cpp
index 13b937542..c48eeea4b 100644
--- a/src/app/crash/read_document.cpp
+++ b/src/app/crash/read_document.cpp
@@ -240,11 +240,26 @@ private:
     // Read layers
     int nlayers = read32(s);
     if (nlayers >= 1 && nlayers < 0xfffff) {
+      std::map<ObjectId, LayerGroup*> layersMap;
+      layersMap[0] = spr->root(); // parentId = 0 is the root level
+
       for (int i = 0; i < nlayers; ++i) {
         ObjectId layId = read32(s);
+        ObjectId parentId = read32(s);
+
+        if (!layersMap[parentId]) {
+          Console().printf("Inexistent parent #%d for layer #%d", parentId, layId);
+          // Put this layer at the root level
+          parentId = 0;
+        }
+
         Layer* lay = loadObject<Layer*>("lay", layId, &Reader::readLayer);
-        if (lay)
-          spr->root()->addLayer(lay);
+        if (lay) {
+          if (lay->isGroup())
+            layersMap[layId] = static_cast<LayerGroup*>(lay);
+
+          layersMap[parentId]->addLayer(lay);
+        }
       }
     }
     else {
@@ -279,7 +294,8 @@ private:
   Layer* readLayer(std::ifstream& s) {
     LayerFlags flags = (LayerFlags)read32(s);
     ObjectType type = (ObjectType)read16(s);
-    ASSERT(type == ObjectType::LayerImage);
+    ASSERT(type == ObjectType::LayerImage ||
+           type == ObjectType::LayerGroup);
 
     std::string name = read_string(s);
 
@@ -303,6 +319,12 @@ private:
       }
       return lay.release();
     }
+    else if (type == ObjectType::LayerGroup) {
+      base::UniquePtr<LayerGroup> lay(new LayerGroup(m_sprite));
+      lay->setName(name);
+      lay->setFlags(flags);
+      return lay.release();
+    }
     else {
       Console().printf("Unable to load layer named '%s', type #%d\n",
         name.c_str(), (int)type);
diff --git a/src/app/crash/write_document.cpp b/src/app/crash/write_document.cpp
index 945ecad3e..63abd98ac 100644
--- a/src/app/crash/write_document.cpp
+++ b/src/app/crash/write_document.cpp
@@ -76,6 +76,7 @@ public:
     for (Cel* cel : spr->cels())
       saveObject("cel", cel, &Writer::writeCel);
 
+    // Save all layers (top level, groups, children, etc.)
     LayerList layers = spr->allLayers();
     for (Layer* lay : layers)
       saveObject("lay", lay, &Writer::writeLayerStructure);
@@ -103,10 +104,8 @@ private:
       write32(s, spr->frameDuration(fr));
 
     // IDs of all main layers
-    LayerList layers = spr->allLayers();
-    write32(s, layers.size());
-    for (Layer* lay : layers)
-      write32(s, lay->id());
+    write32(s, spr->allLayersCount());
+    writeAllLayersID(s, 0, spr->root());
 
     // IDs of all palettes
     write32(s, spr->getPalettes().size());
@@ -119,21 +118,40 @@ private:
       write32(s, frtag->id());
   }
 
+  void writeAllLayersID(std::ofstream& s, ObjectId parentId, const LayerGroup* group) {
+    for (const Layer* lay : group->layers()) {
+      write32(s, lay->id());
+      write32(s, parentId);
+
+      if (lay->isGroup())
+        writeAllLayersID(s, lay->id(), static_cast<const LayerGroup*>(lay));
+    }
+  }
+
   void writeLayerStructure(std::ofstream& s, Layer* lay) {
     write32(s, static_cast<int>(lay->flags())); // Flags
     write16(s, static_cast<int>(lay->type()));  // Type
     write_string(s, lay->name());
 
-    if (lay->type() == ObjectType::LayerImage) {
-      CelConstIterator it, begin = static_cast<const LayerImage*>(lay)->getCelBegin();
-      CelConstIterator end = static_cast<const LayerImage*>(lay)->getCelEnd();
+    switch (lay->type()) {
 
-      // Cels
-      write32(s, static_cast<const LayerImage*>(lay)->getCelsCount());
-      for (it=begin; it != end; ++it) {
-        const Cel* cel = *it;
-        write32(s, cel->id());
+      case ObjectType::LayerImage: {
+        CelConstIterator it, begin = static_cast<const LayerImage*>(lay)->getCelBegin();
+        CelConstIterator end = static_cast<const LayerImage*>(lay)->getCelEnd();
+
+        // Cels
+        write32(s, static_cast<const LayerImage*>(lay)->getCelsCount());
+        for (it=begin; it != end; ++it) {
+          const Cel* cel = *it;
+          write32(s, cel->id());
+        }
+        break;
       }
+
+      case ObjectType::LayerGroup:
+        // Do nothing (the layer parent/children structure is saved in
+        // writeSprite/writeAllLayersID() functions)
+        break;
     }
   }
 

From 9e28a56eb328ceabd8f09a97fd3d035d6f712923 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 17:50:08 -0300
Subject: [PATCH 81/86] Fix duplicateLayerAfter() when we drag-and-drop to copy
 a layer as first item in a different layer group

---
 src/app/document_api.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 41cdd164e..94c6cfe97 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -489,7 +489,8 @@ Layer* DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
 
   newLayerPtr->setName(newLayerPtr->name() + " Copy");
 
-  addLayer(sourceLayer->parent(), newLayerPtr, afterLayer);
+  addLayer(afterLayer ? afterLayer->parent():
+                        sourceLayer->parent(), newLayerPtr, afterLayer);
 
   // Release the pointer as it is owned by the sprite now.
   return newLayerPtr.release();

From a5c464102b4e08d057e4ebcc9f3fce81e323d1c6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 17:57:03 -0300
Subject: [PATCH 82/86] Fix bug setting layer opacity in properties dialog

---
 src/app/commands/cmd_layer_properties.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/commands/cmd_layer_properties.cpp b/src/app/commands/cmd_layer_properties.cpp
index fdbc4838d..0b512b918 100644
--- a/src/app/commands/cmd_layer_properties.cpp
+++ b/src/app/commands/cmd_layer_properties.cpp
@@ -189,7 +189,7 @@ private:
         if (newName != m_layer->name())
           transaction.execute(new cmd::SetLayerName(writer.layer(), newName));
 
-        if (m_userData != m_layer->userData()) {
+        if (m_userData != m_layer->userData())
           transaction.execute(new cmd::SetUserData(writer.layer(), m_userData));
 
         if (m_layer->isImage()) {
@@ -200,10 +200,9 @@ private:
             transaction.execute(new cmd::SetLayerBlendMode(static_cast<LayerImage*>(writer.layer()), newBlendMode));
         }
 
-          // Redraw timeline because the layer's user data/color
-          // might have changed.
-          App::instance()->timeline()->invalidate();
-        }
+        // Redraw timeline because the layer's name/user data/color
+        // might have changed.
+        App::instance()->timeline()->invalidate();
 
         transaction.commit();
       }

From 94b508989edd9636636ba588a6211c99ced9fb81 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 25 Aug 2016 20:19:29 -0300
Subject: [PATCH 83/86] Fix changing opacity of a cel's range

We have to change the range in Timeline before generating a
onActiveSiteChange() so the cel's properties dialog knows the new range
to be used to change the opacity.
---
 src/app/commands/cmd_cel_properties.cpp | 46 ++++++++++---------------
 src/app/ui/timeline.cpp                 | 27 ++++++++++-----
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/app/commands/cmd_cel_properties.cpp b/src/app/commands/cmd_cel_properties.cpp
index 7b9273497..42dbe5752 100644
--- a/src/app/commands/cmd_cel_properties.cpp
+++ b/src/app/commands/cmd_cel_properties.cpp
@@ -169,36 +169,28 @@ private:
         ContextWriter writer(UIContext::instance());
         Transaction transaction(writer.context(), "Set Cel Properties");
 
-        if (count == 1 && m_cel) {
-          if (!m_cel->layer()->isBackground() &&
-              newOpacity != m_cel->opacity()) {
-            transaction.execute(new cmd::SetCelOpacity(writer.cel(), newOpacity));
-          }
-
-          if (m_userData != m_cel->data()->userData()) {
-            transaction.execute(new cmd::SetUserData(writer.cel()->data(), m_userData));
-
-            // Redraw timeline because the cel's user data/color
-            // might have changed.
-            App::instance()->timeline()->invalidate();
-          }
+        DocumentRange range;
+        if (m_range.enabled())
+          range = m_range;
+        else {
+          range.startRange(m_cel->layer(), m_cel->frame(), DocumentRange::kCels);
+          range.endRange(m_cel->layer(), m_cel->frame());
         }
-        else if (m_range.enabled()) {
-          Sprite* sprite = m_document->sprite();
-          for (Cel* cel : sprite->uniqueCels(m_range.selectedFrames())) {
-            if (m_range.contains(cel->layer())) {
-              if (!cel->layer()->isBackground() && newOpacity != cel->opacity()) {
-                transaction.execute(new cmd::SetCelOpacity(cel, newOpacity));
-              }
 
-              if (m_newUserData &&
-                  m_userData != cel->data()->userData()) {
-                transaction.execute(new cmd::SetUserData(cel->data(), m_userData));
+        Sprite* sprite = m_document->sprite();
+        for (Cel* cel : sprite->uniqueCels(range.selectedFrames())) {
+          if (range.contains(cel->layer())) {
+            if (!cel->layer()->isBackground() && newOpacity != cel->opacity()) {
+              transaction.execute(new cmd::SetCelOpacity(cel, newOpacity));
+            }
 
-                // Redraw timeline because the cel's user data/color
-                // might have changed.
-                App::instance()->timeline()->invalidate();
-              }
+            if (m_newUserData &&
+                m_userData != cel->data()->userData()) {
+              transaction.execute(new cmd::SetUserData(cel->data(), m_userData));
+
+              // Redraw timeline because the cel's user data/color
+              // might have changed.
+              App::instance()->timeline()->invalidate();
             }
           }
         }
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 14c7f275a..e02ebed65 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -342,6 +342,11 @@ void Timeline::moveRange(Range& range)
 {
   regenerateLayers();
 
+  // We have to change the range before we generate an
+  // onActiveSiteChange() event so observers (like cel properties
+  // dialog) know the new selected range.
+  m_range = range;
+
   layer_t i = 0;
   for (auto layer : range.selectedLayers().toLayerList()) {
     if (i == m_moveRangeData.activeRelativeLayer) {
@@ -359,8 +364,6 @@ void Timeline::moveRange(Range& range)
     }
     ++j;
   }
-
-  m_range = range;
 }
 
 void Timeline::activateClipboardRange()
@@ -616,17 +619,23 @@ bool Timeline::onProcessMessage(Message* msg)
             Layer* hitLayer = m_layers[hit.layer].layer;
             if (m_layer != hitLayer) {
               m_clk.layer = hit.layer;
-              setLayer(hitLayer);
+
+              // We have to change the range before we generate an
+              // onActiveSiteChange() event so observers (like cel
+              // properties dialog) know the new selected range.
               m_range = m_startRange;
               m_range.endRange(hitLayer, m_frame);
+
+              setLayer(hitLayer);
             }
             break;
           }
 
           case STATE_SELECTING_FRAMES: {
-            setFrame(m_clk.frame = hit.frame, true);
             m_range = m_startRange;
             m_range.endRange(m_layer, hit.frame);
+
+            setFrame(m_clk.frame = hit.frame, true);
             break;
           }
 
@@ -634,10 +643,12 @@ bool Timeline::onProcessMessage(Message* msg)
             Layer* hitLayer = m_layers[hit.layer].layer;
             if ((m_layer != hitLayer) || (m_frame != hit.frame)) {
               m_clk.layer = hit.layer;
-              setLayer(hitLayer);
-              setFrame(m_clk.frame = hit.frame, true);
+
               m_range = m_startRange;
               m_range.endRange(hitLayer, hit.frame);
+
+              setLayer(hitLayer);
+              setFrame(m_clk.frame = hit.frame, true);
             }
             break;
         }
@@ -1358,11 +1369,11 @@ void Timeline::onAfterLayerChanged(Editor* editor)
   if (m_fromTimeline)
     return;
 
-  setLayer(editor->layer());
-
   if (!hasCapture())
     m_range.clearRange();
 
+  setLayer(editor->layer());
+
   showCurrentCel();
   invalidate();
 }

From e9871543beb562afa5b8575b67099c705cf61f33 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 26 Aug 2016 18:18:25 -0300
Subject: [PATCH 84/86] Timeline: Add drag & drop of layers as first child in a
 group

---
 src/app/commands/cmd_duplicate_layer.cpp |  6 +-
 src/app/commands/cmd_new_layer.cpp       |  4 +-
 src/app/document_api.cpp                 | 42 ++++++--------
 src/app/document_api.h                   |  8 +--
 src/app/document_range_ops.cpp           | 64 +++++++++++++++-------
 src/app/document_range_ops.h             |  3 +-
 src/app/ui/timeline.cpp                  | 70 +++++++++++++++++++-----
 src/app/ui/timeline.h                    | 19 ++++++-
 8 files changed, 145 insertions(+), 71 deletions(-)

diff --git a/src/app/commands/cmd_duplicate_layer.cpp b/src/app/commands/cmd_duplicate_layer.cpp
index a2cf34193..7f73569b3 100644
--- a/src/app/commands/cmd_duplicate_layer.cpp
+++ b/src/app/commands/cmd_duplicate_layer.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -58,7 +58,9 @@ void DuplicateLayerCommand::onExecute(Context* context)
     Transaction transaction(writer.context(), "Layer Duplication");
     LayerImage* sourceLayer = static_cast<LayerImage*>(writer.layer());
     DocumentApi api = document->getApi(transaction);
-    api.duplicateLayerAfter(sourceLayer, sourceLayer);
+    api.duplicateLayerAfter(sourceLayer,
+                            sourceLayer->parent(),
+                            sourceLayer);
     transaction.commit();
   }
 
diff --git a/src/app/commands/cmd_new_layer.cpp b/src/app/commands/cmd_new_layer.cpp
index 03a8b1045..dcbf139fc 100644
--- a/src/app/commands/cmd_new_layer.cpp
+++ b/src/app/commands/cmd_new_layer.cpp
@@ -138,7 +138,9 @@ void NewLayerCommand::onExecute(Context* context)
     // If "top" parameter is false, create the layer above the active
     // one.
     if (activeLayer && !m_top) {
-      api.restackLayerAfter(layer, activeLayer);
+      api.restackLayerAfter(layer,
+                            activeLayer->parent(),
+                            activeLayer);
 
       // Put all selected layers inside the group
       if (m_group && writer.site()->inTimeline()) {
diff --git a/src/app/document_api.cpp b/src/app/document_api.cpp
index 94c6cfe97..ab9b335a7 100644
--- a/src/app/document_api.cpp
+++ b/src/app/document_api.cpp
@@ -422,20 +422,20 @@ void DocumentApi::removeLayer(Layer* layer)
   m_transaction.execute(new cmd::RemoveLayer(layer));
 }
 
-void DocumentApi::restackLayerAfter(Layer* layer, Layer* afterThis)
+void DocumentApi::restackLayerAfter(Layer* layer, LayerGroup* parent, Layer* afterThis)
 {
+  ASSERT(parent);
+
   if (layer == afterThis)
     return;
 
-  m_transaction.execute(
-    new cmd::MoveLayer(
-      layer,
-      (afterThis ? afterThis->parent(): layer->parent()),
-      afterThis));
+  m_transaction.execute(new cmd::MoveLayer(layer, parent, afterThis));
 }
 
-void DocumentApi::restackLayerBefore(Layer* layer, Layer* beforeThis)
+void DocumentApi::restackLayerBefore(Layer* layer, LayerGroup* parent, Layer* beforeThis)
 {
+  ASSERT(parent);
+
   if (layer == beforeThis)
     return;
 
@@ -443,20 +443,9 @@ void DocumentApi::restackLayerBefore(Layer* layer, Layer* beforeThis)
   if (beforeThis)
     afterThis = beforeThis->getPrevious();
   else
-    afterThis = layer->sprite()->root()->lastLayer();
+    afterThis = parent->lastLayer();
 
-  // The following code is similar to DocumentApi::restackLayerAfter()
-  // but we use the parent from "beforeThis" (as afterThis might be
-  // nullptr now).
-
-  if (layer == afterThis)
-    return;
-
-  m_transaction.execute(
-    new cmd::MoveLayer(
-      layer,
-      (beforeThis ? beforeThis->parent(): layer->parent()),
-      afterThis));
+  restackLayerAfter(layer, parent, afterThis);
 }
 
 void DocumentApi::backgroundFromLayer(Layer* layer)
@@ -474,8 +463,9 @@ void DocumentApi::flattenLayers(Sprite* sprite)
   m_transaction.execute(new cmd::FlattenLayers(sprite));
 }
 
-Layer* DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
+Layer* DocumentApi::duplicateLayerAfter(Layer* sourceLayer, LayerGroup* parent, Layer* afterLayer)
 {
+  ASSERT(parent);
   base::UniquePtr<Layer> newLayerPtr;
 
   if (sourceLayer->isImage())
@@ -489,19 +479,19 @@ Layer* DocumentApi::duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer)
 
   newLayerPtr->setName(newLayerPtr->name() + " Copy");
 
-  addLayer(afterLayer ? afterLayer->parent():
-                        sourceLayer->parent(), newLayerPtr, afterLayer);
+  addLayer(parent, newLayerPtr, afterLayer);
 
   // Release the pointer as it is owned by the sprite now.
   return newLayerPtr.release();
 }
 
-Layer* DocumentApi::duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer)
+Layer* DocumentApi::duplicateLayerBefore(Layer* sourceLayer, LayerGroup* parent, Layer* beforeLayer)
 {
+  ASSERT(parent);
   Layer* afterThis = (beforeLayer ? beforeLayer->getPreviousInWholeHierarchy(): nullptr);
-  Layer* newLayer = duplicateLayerAfter(sourceLayer, afterThis);
+  Layer* newLayer = duplicateLayerAfter(sourceLayer, parent, afterThis);
   if (newLayer)
-    restackLayerBefore(newLayer, beforeLayer);
+    restackLayerBefore(newLayer, parent, beforeLayer);
   return newLayer;
 }
 
diff --git a/src/app/document_api.h b/src/app/document_api.h
index 9b53a97f2..63cc29296 100644
--- a/src/app/document_api.h
+++ b/src/app/document_api.h
@@ -84,13 +84,13 @@ namespace app {
     LayerGroup* newGroup(LayerGroup* parent, const std::string& name);
     void addLayer(LayerGroup* parent, Layer* newLayer, Layer* afterThis);
     void removeLayer(Layer* layer);
-    void restackLayerAfter(Layer* layer, Layer* afterThis);
-    void restackLayerBefore(Layer* layer, Layer* beforeThis);
+    void restackLayerAfter(Layer* layer, LayerGroup* parent, Layer* afterThis);
+    void restackLayerBefore(Layer* layer, LayerGroup* parent, Layer* beforeThis);
     void backgroundFromLayer(Layer* layer);
     void layerFromBackground(Layer* layer);
     void flattenLayers(Sprite* sprite);
-    Layer* duplicateLayerAfter(Layer* sourceLayer, Layer* afterLayer);
-    Layer* duplicateLayerBefore(Layer* sourceLayer, Layer* beforeLayer);
+    Layer* duplicateLayerAfter(Layer* sourceLayer, LayerGroup* parent, Layer* afterLayer);
+    Layer* duplicateLayerBefore(Layer* sourceLayer, LayerGroup* parent, Layer* beforeLayer);
 
     // Images API
     void replaceImage(Sprite* sprite, const ImageRef& oldImage, const ImageRef& newImage);
diff --git a/src/app/document_range_ops.cpp b/src/app/document_range_ops.cpp
index 1c9fec472..2b05e494d 100644
--- a/src/app/document_range_ops.cpp
+++ b/src/app/document_range_ops.cpp
@@ -169,8 +169,26 @@ static DocumentRange move_or_copy_frames(
 
 static DocumentRange drop_range_op(
   Document* doc, Op op, const DocumentRange& from,
-  DocumentRangePlace place, const DocumentRange& to)
+  DocumentRangePlace place, DocumentRange to)
 {
+  // Convert "first child" operation into a insert after last child.
+  LayerGroup* parent = nullptr;
+  if (to.type() == DocumentRange::kLayers &&
+      !to.selectedLayers().empty()) {
+    if (place == kDocumentRangeFirstChild &&
+        (*to.selectedLayers().begin())->isGroup()) {
+      place = kDocumentRangeAfter;
+      parent = static_cast<LayerGroup*>((*to.selectedLayers().begin()));
+
+      to.clearRange();
+      to.startRange(parent->lastLayer(), -1, DocumentRange::kLayers);
+      to.endRange(parent->lastLayer(), -1);
+    }
+    else {
+      parent = (*to.selectedLayers().begin())->parent();
+    }
+  }
+
   if (place != kDocumentRangeBefore &&
       place != kDocumentRangeAfter) {
     ASSERT(false);
@@ -203,17 +221,22 @@ static DocumentRange drop_range_op(
 
     case DocumentRange::kLayers:
       if (op == Move) {
-          SelectedLayers srcSelLayers = from.selectedLayers();
-          SelectedLayers dstSelLayers = to.selectedLayers();
-          LayerList srcLayers = srcSelLayers.toLayerList();
-          LayerList dstLayers = dstSelLayers.toLayerList();
-          if (srcLayers.empty() || dstLayers.empty())
-            return from;
+        SelectedLayers srcSelLayers = from.selectedLayers();
+        SelectedLayers dstSelLayers = to.selectedLayers();
+        LayerList srcLayers = srcSelLayers.toLayerList();
+        LayerList dstLayers = dstSelLayers.toLayerList();
+        ASSERT(!srcLayers.empty());
+        if (srcLayers.empty())
+          return from;
+
+        // dstLayers can be nullptr when we insert the first child in
+        // a group.
 
         // Check no-ops when we move layers at the same level (all
         // layers with the same parent), all adjacents, and which are
         // moved to the same place.
-        if (srcSelLayers.hasSameParent() &&
+        if (!dstSelLayers.empty() &&
+            srcSelLayers.hasSameParent() &&
             dstSelLayers.hasSameParent() &&
             are_layers_adjacent(srcLayers) &&
             are_layers_adjacent(dstLayers)) {
@@ -321,28 +344,27 @@ static DocumentRange drop_range_op(
         LayerList srcLayers = from.selectedLayers().toLayerList();
         LayerList dstLayers = to.selectedLayers().toLayerList();
         ASSERT(!srcLayers.empty());
-        ASSERT(!dstLayers.empty());
 
         switch (op) {
 
           case Move:
             if (place == kDocumentRangeBefore) {
-              Layer* beforeThis = dstLayers.front();
+              Layer* beforeThis = (!dstLayers.empty() ? dstLayers.front(): nullptr);
               Layer* afterThis  = nullptr;
 
               for (Layer* srcLayer : srcLayers) {
                 if (afterThis)
-                  api.restackLayerAfter(srcLayer, afterThis);
+                  api.restackLayerAfter(srcLayer, parent, afterThis);
                 else
-                  api.restackLayerBefore(srcLayer, beforeThis);
+                  api.restackLayerBefore(srcLayer, parent, beforeThis);
 
                 afterThis = srcLayer;
               }
             }
             else if (place == kDocumentRangeAfter) {
-              Layer* afterThis = dstLayers.back();
+              Layer* afterThis = (!dstLayers.empty() ? dstLayers.back(): nullptr);
               for (Layer* srcLayer : srcLayers) {
-                api.restackLayerAfter(srcLayer, afterThis);
+                api.restackLayerAfter(srcLayer, parent, afterThis);
                 afterThis = srcLayer;
               }
             }
@@ -353,9 +375,10 @@ static DocumentRange drop_range_op(
 
           case Copy: {
             if (place == kDocumentRangeBefore) {
+              Layer* beforeThis = (!dstLayers.empty() ? dstLayers.front(): nullptr);
               for (Layer* srcLayer :  srcLayers) {
-                Layer* copiedLayer =
-                  api.duplicateLayerBefore(srcLayer, dstLayers.front());
+                Layer* copiedLayer = api.duplicateLayerBefore(
+                  srcLayer, parent, beforeThis);
 
                 resultRange.startRange(copiedLayer, -1, DocumentRange::kLayers);
                 resultRange.endRange(copiedLayer, -1);
@@ -364,9 +387,10 @@ static DocumentRange drop_range_op(
             else if (place == kDocumentRangeAfter) {
               std::reverse(srcLayers.begin(), srcLayers.end());
 
+              Layer* afterThis = (!dstLayers.empty() ? dstLayers.back(): nullptr);
               for (Layer* srcLayer :  srcLayers) {
-                Layer* copiedLayer =
-                  api.duplicateLayerAfter(srcLayer, dstLayers.back());
+                Layer* copiedLayer = api.duplicateLayerAfter(
+                  srcLayer, parent, afterThis);
 
                 resultRange.startRange(copiedLayer, -1, DocumentRange::kLayers);
                 resultRange.endRange(copiedLayer, -1);
@@ -387,12 +411,12 @@ static DocumentRange drop_range_op(
 
 DocumentRange move_range(Document* doc, const DocumentRange& from, const DocumentRange& to, DocumentRangePlace place)
 {
-  return drop_range_op(doc, Move, from, place, to);
+  return drop_range_op(doc, Move, from, place, DocumentRange(to));
 }
 
 DocumentRange copy_range(Document* doc, const DocumentRange& from, const DocumentRange& to, DocumentRangePlace place)
 {
-  return drop_range_op(doc, Copy, from, place, to);
+  return drop_range_op(doc, Copy, from, place, DocumentRange(to));
 }
 
 void reverse_frames(Document* doc, const DocumentRange& range)
diff --git a/src/app/document_range_ops.h b/src/app/document_range_ops.h
index 6dc313f44..fb651a106 100644
--- a/src/app/document_range_ops.h
+++ b/src/app/document_range_ops.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -18,6 +18,7 @@ namespace app {
   enum DocumentRangePlace {
     kDocumentRangeBefore,
     kDocumentRangeAfter,
+    kDocumentRangeFirstChild,
   };
 
   // These functions returns the new location of the "from" range or
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index e02ebed65..06a39cff4 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -2213,6 +2213,10 @@ Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
         - m_separator_w
         + scroll.x) / FRMSIZE);
 
+    // Flag which indicates that we are in the are below the Background layer/last layer area
+    if (hit.layer < 0)
+      hit.veryBottom = true;
+
     if (hasCapture()) {
       hit.layer = MID(firstLayer(), hit.layer, lastLayer());
       if (isMovingCel())
@@ -2395,21 +2399,30 @@ void Timeline::updateStatusBar(ui::Message* msg)
                                   &firstLayer, &lastLayer))
           break;
 
+        if (m_dropTarget.vhit == DropTarget::VeryBottom) {
+          sb->setStatusText(0, "%s at the very bottom", verb);
+          return;
+        }
+
         layer_t layerIdx = -1;
-        if (m_dropTarget.vhit == DropTarget::Bottom)
+        if (m_dropTarget.vhit == DropTarget::Bottom ||
+            m_dropTarget.vhit == DropTarget::FirstChild)
           layerIdx = firstLayer;
         else if (m_dropTarget.vhit == DropTarget::Top)
           layerIdx = lastLayer;
 
         Layer* layer = (validLayer(layerIdx) ? m_layers[layerIdx].layer: nullptr);
         if (layer) {
-          if (m_dropTarget.vhit == DropTarget::Bottom) {
-            sb->setStatusText(0, "%s at bottom of layer %s", verb, layer->name().c_str());
-            return;
-          }
-          else if (m_dropTarget.vhit == DropTarget::Top) {
-            sb->setStatusText(0, "%s at top of layer %s", verb, layer->name().c_str());
-            return;
+          switch (m_dropTarget.vhit) {
+            case DropTarget::Bottom:
+              sb->setStatusText(0, "%s at bottom of layer %s", verb, layer->name().c_str());
+              return;
+            case DropTarget::Top:
+              sb->setStatusText(0, "%s at top of layer %s", verb, layer->name().c_str());
+              return;
+            case DropTarget::FirstChild:
+              sb->setStatusText(0, "%s as first child of layer %s", verb, layer->name().c_str());
+              return;
           }
         }
         break;
@@ -2661,15 +2674,33 @@ void Timeline::dropRange(DropOp op)
   bool copy = (op == Timeline::kCopy);
   Range newFromRange;
   DocumentRangePlace place = kDocumentRangeAfter;
+  Range dropRange = m_dropRange;
 
   switch (m_range.type()) {
+
     case Range::kFrames:
       if (m_dropTarget.hhit == DropTarget::Before)
         place = kDocumentRangeBefore;
       break;
+
     case Range::kLayers:
-      if (m_dropTarget.vhit == DropTarget::Bottom)
-        place = kDocumentRangeBefore;
+      switch (m_dropTarget.vhit) {
+        case DropTarget::Bottom:
+          place = kDocumentRangeBefore;
+          break;
+        case DropTarget::FirstChild:
+          place = kDocumentRangeFirstChild;
+          break;
+        case DropTarget::VeryBottom:
+          place = kDocumentRangeBefore;
+          {
+            Layer* layer = m_sprite->root()->firstLayer();
+            dropRange.clearRange();
+            dropRange.startRange(layer, -1, Range::kLayers);
+            dropRange.endRange(layer, -1);
+          }
+          break;
+      }
       break;
   }
 
@@ -2677,9 +2708,9 @@ void Timeline::dropRange(DropOp op)
 
   try {
     if (copy)
-      newFromRange = copy_range(m_document, m_range, m_dropRange, place);
+      newFromRange = copy_range(m_document, m_range, dropRange, place);
     else
-      newFromRange = move_range(m_document, m_range, m_dropRange, place);
+      newFromRange = move_range(m_document, m_range, dropRange, place);
 
     // If we drop a cel in the same frame (but in another layer),
     // document views are not updated, so we are forcing the updating of
@@ -2754,10 +2785,21 @@ void Timeline::updateDropRange(const gfx::Point& pt)
   else
     m_dropTarget.hhit = DropTarget::After;
 
-  if (pt.y < bounds.y + bounds.h/2)
+  if (m_hot.veryBottom)
+    m_dropTarget.vhit = DropTarget::VeryBottom;
+  else if (pt.y < bounds.y + bounds.h/2)
     m_dropTarget.vhit = DropTarget::Top;
-  else
+  // Special drop target for expanded groups
+  else if (m_range.type() == Range::kLayers &&
+           m_hot.layer >= 0 &&
+           m_hot.layer < m_layers.size() &&
+           m_layers[m_hot.layer].layer->isGroup() &&
+           static_cast<LayerGroup*>(m_layers[m_hot.layer].layer)->isExpanded()) {
+    m_dropTarget.vhit = DropTarget::FirstChild;
+  }
+  else {
     m_dropTarget.vhit = DropTarget::Bottom;
+  }
 
   if (oldHHit != m_dropTarget.hhit ||
       oldVHit != m_dropTarget.vhit) {
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 31e472ccb..7cdc196b7 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -153,9 +153,10 @@ namespace app {
       layer_t layer;
       frame_t frame;
       ObjectId frameTag;
+      bool veryBottom;
 
       Hit(int part = 0, layer_t layer = -1, frame_t frame = 0, ObjectId frameTag = NullId)
-        : part(part), layer(layer), frame(frame), frameTag(frameTag) {
+        : part(part), layer(layer), frame(frame), frameTag(frameTag), veryBottom(false) {
       }
 
       bool operator!=(const Hit& other) const {
@@ -170,8 +171,20 @@ namespace app {
     };
 
     struct DropTarget {
-      enum HHit { HNone, Before, After };
-      enum VHit { VNone, Bottom, Top };
+
+      enum HHit {
+        HNone,
+        Before,
+        After
+      };
+
+      enum VHit {
+        VNone,
+        Bottom,
+        Top,
+        FirstChild,
+        VeryBottom
+      };
 
       DropTarget() {
         hhit = HNone;

From 873407cd0f7961db12ffe6624748871d3d9a6476 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 29 Aug 2016 10:50:51 -0300
Subject: [PATCH 85/86] Fix document_api_tests for new restack layer function
 params

---
 src/app/document_api_tests.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/document_api_tests.cpp b/src/app/document_api_tests.cpp
index 7e4269ed6..a90a6de9f 100644
--- a/src/app/document_api_tests.cpp
+++ b/src/app/document_api_tests.cpp
@@ -55,7 +55,7 @@ TEST_F(BasicDocApiTest, RestackLayerBefore)
   {
     Transaction transaction(&ctx, "");
     // Do nothing
-    doc->getApi(transaction).restackLayerBefore(layer1, layer1);
+    doc->getApi(transaction).restackLayerBefore(layer1, layer1->parent(), layer1);
     EXPECT_EQ(layer1, root->firstLayer());
     EXPECT_EQ(layer2, root->firstLayer()->getNext());
     EXPECT_EQ(layer3, root->firstLayer()->getNext()->getNext());
@@ -65,7 +65,7 @@ TEST_F(BasicDocApiTest, RestackLayerBefore)
   EXPECT_EQ(layer1, root->firstLayer());
   {
     Transaction transaction(&ctx, "");
-    doc->getApi(transaction).restackLayerBefore(layer1, layer3);
+    doc->getApi(transaction).restackLayerBefore(layer1, layer3->parent(), layer3);
     EXPECT_EQ(layer2, root->firstLayer());
     EXPECT_EQ(layer1, root->firstLayer()->getNext());
     EXPECT_EQ(layer3, root->firstLayer()->getNext()->getNext());
@@ -75,7 +75,7 @@ TEST_F(BasicDocApiTest, RestackLayerBefore)
   EXPECT_EQ(layer1, root->firstLayer());
   {
     Transaction transaction(&ctx, "");
-    doc->getApi(transaction).restackLayerBefore(layer1, nullptr);
+    doc->getApi(transaction).restackLayerBefore(layer1, layer1->parent(), nullptr);
     EXPECT_EQ(layer2, root->firstLayer());
     EXPECT_EQ(layer3, root->firstLayer()->getNext());
     EXPECT_EQ(layer1, root->firstLayer()->getNext()->getNext());
@@ -89,7 +89,7 @@ TEST_F(BasicDocApiTest, RestackLayerAfter)
   {
     Transaction transaction(&ctx, "");
     // Do nothing
-    doc->getApi(transaction).restackLayerAfter(layer1, layer1);
+    doc->getApi(transaction).restackLayerAfter(layer1, layer1->parent(), layer1);
     EXPECT_EQ(layer1, root->firstLayer());
     EXPECT_EQ(layer2, root->firstLayer()->getNext());
     EXPECT_EQ(layer3, root->firstLayer()->getNext()->getNext());
@@ -99,7 +99,7 @@ TEST_F(BasicDocApiTest, RestackLayerAfter)
   EXPECT_EQ(layer1, root->firstLayer());
   {
     Transaction transaction(&ctx, "");
-    doc->getApi(transaction).restackLayerAfter(layer1, layer3);
+    doc->getApi(transaction).restackLayerAfter(layer1, layer3->parent(), layer3);
     EXPECT_EQ(layer2, root->firstLayer());
     EXPECT_EQ(layer3, root->firstLayer()->getNext());
     EXPECT_EQ(layer1, root->firstLayer()->getNext()->getNext());
@@ -109,7 +109,7 @@ TEST_F(BasicDocApiTest, RestackLayerAfter)
   EXPECT_EQ(layer1, root->firstLayer());
   {
     Transaction transaction(&ctx, "");
-    doc->getApi(transaction).restackLayerAfter(layer3, nullptr);
+    doc->getApi(transaction).restackLayerAfter(layer3, layer3->parent(), nullptr);
     EXPECT_EQ(layer3, root->firstLayer());
     EXPECT_EQ(layer1, root->firstLayer()->getNext());
     EXPECT_EQ(layer2, root->firstLayer()->getNext()->getNext());

From 595b2c14d2eeacd7bc99a5cfcec4b73d54b9028b Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 29 Aug 2016 15:24:50 -0300
Subject: [PATCH 86/86] Improve selection of layer in groups in Export Sprite
 Sheet

---
 src/app/commands/cmd_export_sprite_sheet.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp
index 6a200ac6a..4178fd2b7 100644
--- a/src/app/commands/cmd_export_sprite_sheet.cpp
+++ b/src/app/commands/cmd_export_sprite_sheet.cpp
@@ -251,11 +251,23 @@ public:
   class LayerItem : public ListItem {
   public:
     LayerItem(Layer* layer)
-      : ListItem("Layer: " + layer->name())
+      : ListItem(buildName(layer))
       , m_layer(layer) {
     }
     Layer* layer() const { return m_layer; }
   private:
+    static std::string buildName(const Layer* layer) {
+      bool isGroup = layer->isGroup();
+      std::string name;
+      while (layer != layer->sprite()->root()) {
+        if (!name.empty())
+          name.insert(0, " > ");
+        name.insert(0, layer->name());
+        layer = layer->parent();
+      }
+      name.insert(0, isGroup ? "Group: ": "Layer: ");
+      return name;
+    }
     Layer* m_layer;
   };
 
@@ -298,7 +310,8 @@ public:
       layers()->setSelectedItemIndex(i);
     {
       LayerList layersList = m_sprite->allLayers();
-      for (Layer* layer : layersList) {
+      for (auto it=layersList.rbegin(), end=layersList.rend(); it!=end; ++it) {
+        Layer* layer = *it;
         i = layers()->addItem(new LayerItem(layer));
         if (m_docPref.spriteSheet.layer() == layer->name())
           layers()->setSelectedItemIndex(i);