From 30feffab8d1726bec522985efb10f625505a0d33 Mon Sep 17 00:00:00 2001
From: Carlo 'zED' Caputo <carlo.caputo@gmail.com>
Date: Thu, 4 Aug 2016 03:02:44 -0300
Subject: [PATCH 1/7] setting to change timeline zoom

---
 data/pref.xml                           |  1 +
 data/widgets/timeline_conf.xml          |  3 +++
 src/app/ui/configure_timeline_popup.cpp |  7 +++++++
 src/app/ui/configure_timeline_popup.h   |  1 +
 src/app/ui/timeline.cpp                 | 11 +++++++++--
 src/app/ui/timeline.h                   |  1 +
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 3261bc7df..281f19a9a 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -257,6 +257,7 @@
       <option id="color2" type="app::Color" default="app::Color::fromRgb(192, 192, 192)" migrate="Option.CheckedBgColor2" />
     </section>
     <section id="thumbnails">
+      <option id="zoom" type="double" default="1" />
       <option id="enabled" type="bool" default="false" />
       <option id="overlay_enabled" type="bool" default="false" />
       <option id="overlay_size" type="int" default="5" />
diff --git a/data/widgets/timeline_conf.xml b/data/widgets/timeline_conf.xml
index 49b9ca067..0e30bab91 100644
--- a/data/widgets/timeline_conf.xml
+++ b/data/widgets/timeline_conf.xml
@@ -4,6 +4,9 @@
 <vbox id="timeline_conf">
   <separator cell_hspan="2" text="Thumbnails:" left="true" horizontal="true" />
   <grid columns="3">
+    <label text="Zoom:" />
+    <slider min="10" max="100" id="zoom" cell_align="horizontal" width="128" cell_hspan="2" />
+
     <check id="thumb_enabled" text="Enabled" />
     <label text="Opacity:" />
     <slider min="0" max="255" id="thumb_opacity" cell_align="horizontal" width="128" />
diff --git a/src/app/ui/configure_timeline_popup.cpp b/src/app/ui/configure_timeline_popup.cpp
index 7cfeb5783..44d3aeddc 100644
--- a/src/app/ui/configure_timeline_popup.cpp
+++ b/src/app/ui/configure_timeline_popup.cpp
@@ -62,6 +62,7 @@ ConfigureTimelinePopup::ConfigureTimelinePopup()
   m_box->behind()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onPositionChange, this));
   m_box->infront()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onPositionChange, this));
 
+  m_box->zoom()->Change.connect(base::Bind<void>(&ConfigureTimelinePopup::onZoomChange, this));
   m_box->thumbOpacity()->Change.connect(base::Bind<void>(&ConfigureTimelinePopup::onThumbOpacityChange, this));
   m_box->thumbBackground()->Change.connect(&ConfigureTimelinePopup::onThumbBackgroundChange, this);
   m_box->thumbEnabled()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onThumbEnabledChange, this));
@@ -133,6 +134,7 @@ void ConfigureTimelinePopup::updateWidgetsFromCurrentSettings()
       break;
   }
 
+  m_box->zoom()->setValue(docPref.thumbnails.zoom() * 10.0);
   m_box->thumbOpacity()->setValue(docPref.thumbnails.opacity());
   m_box->thumbBackground()->setColor(docPref.thumbnails.background());
   m_box->thumbEnabled()->setSelected(docPref.thumbnails.enabled());
@@ -209,6 +211,11 @@ void ConfigureTimelinePopup::onPositionChange()
                                render::OnionskinPosition::INFRONT);
 }
 
+void ConfigureTimelinePopup::onZoomChange()
+{
+  docPref().thumbnails.zoom(m_box->zoom()->getValue()/10.0);
+}
+
 void ConfigureTimelinePopup::onThumbOpacityChange()
 {
   docPref().thumbnails.opacity(m_box->thumbOpacity()->getValue());
diff --git a/src/app/ui/configure_timeline_popup.h b/src/app/ui/configure_timeline_popup.h
index 765211930..272da991a 100644
--- a/src/app/ui/configure_timeline_popup.h
+++ b/src/app/ui/configure_timeline_popup.h
@@ -41,6 +41,7 @@ namespace app {
     void onCurrentLayerChange();
     void onPositionChange();
 
+    void onZoomChange();
     void onThumbOpacityChange();
     void onThumbQualityChange();
     void onThumbBackgroundChange(const app::Color& color);
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index c201aa6c4..54c8db94e 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -150,8 +150,14 @@ Timeline::~Timeline()
   delete m_confPopup;
 }
 
+void Timeline::setZoom(double zoom)
+{
+  m_zoom = MID(1.0, zoom, 10.0);
+}
+
 void Timeline::onThumbnailsPrefChange()
 {
+  setZoom(docPref().thumbnails.zoom());
   invalidate();
 }
 
@@ -187,6 +193,8 @@ void Timeline::updateUsingEditor(Editor* editor)
   m_thumbnailsPrefConn = docPref.thumbnails.AfterChange.connect(
     base::Bind<void>(&Timeline::onThumbnailsPrefChange, this));
 
+  setZoom(docPref.thumbnails.zoom());
+
   // If we are already in the same position as the "editor", we don't
   // need to update the at all timeline.
   if (m_document == site.document() &&
@@ -893,8 +901,7 @@ bool Timeline::onProcessMessage(Message* msg)
       break;
 
     case kTouchMagnifyMessage:
-      m_zoom = m_zoom + m_zoom * static_cast<ui::TouchMessage*>(msg)->magnification();
-      m_zoom = MID(1.0, m_zoom, 10.0);
+      setZoom(m_zoom + m_zoom * static_cast<ui::TouchMessage*>(msg)->magnification());
       invalidate();
       break;
   }
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index 1716332d5..bfded399d 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -265,6 +265,7 @@ namespace app {
     void updateCelOverlayBounds(const Hit& hit);
     void drawCelOverlay(ui::Graphics* g);
     void onThumbnailsPrefChange();
+    void setZoom(double zoom);
 
     ui::ScrollBar m_hbar;
     ui::ScrollBar m_vbar;

From 1784deaf61d8163276fd9381362c130196ccd6ed Mon Sep 17 00:00:00 2001
From: "Carlo \"zED\" Caputo" <carlo.caputo@gmail.com>
Date: Sun, 7 Aug 2016 04:18:24 -0300
Subject: [PATCH 2/7] not zooming the timeline headers

---
 src/app/ui/timeline.cpp | 43 +++++++++++++++++++++++------------------
 src/app/ui/timeline.h   |  1 +
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 54c8db94e..8f35f04ff 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -1909,28 +1909,28 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
         m_separator_x + m_separator_w, bounds.h - y);
 
     case PART_HEADER_EYE:
-      return gfx::Rect(bounds.x + frameBoxWidth()*0, bounds.y + y,
-                       frameBoxWidth(), headerBoxHeight());
+      return gfx::Rect(bounds.x + headerBoxWidth()*0, bounds.y + y,
+                       headerBoxWidth(), headerBoxHeight());
 
     case PART_HEADER_PADLOCK:
-      return gfx::Rect(bounds.x + frameBoxWidth()*1, bounds.y + y,
-                       frameBoxWidth(), headerBoxHeight());
+      return gfx::Rect(bounds.x + headerBoxWidth()*1, bounds.y + y,
+                       headerBoxWidth(), headerBoxHeight());
 
     case PART_HEADER_CONTINUOUS:
-      return gfx::Rect(bounds.x + frameBoxWidth()*2, bounds.y + y,
-                       frameBoxWidth(), headerBoxHeight());
+      return gfx::Rect(bounds.x + headerBoxWidth()*2, bounds.y + y,
+                       headerBoxWidth(), headerBoxHeight());
 
     case PART_HEADER_GEAR:
-      return gfx::Rect(bounds.x + frameBoxWidth()*3, bounds.y + y,
-                       frameBoxWidth(), headerBoxHeight());
+      return gfx::Rect(bounds.x + headerBoxWidth()*3, bounds.y + y,
+                       headerBoxWidth(), headerBoxHeight());
 
     case PART_HEADER_ONIONSKIN:
-      return gfx::Rect(bounds.x + frameBoxWidth()*4, bounds.y + y,
-                       frameBoxWidth(), headerBoxHeight());
+      return gfx::Rect(bounds.x + headerBoxWidth()*4, bounds.y + y,
+                       headerBoxWidth(), headerBoxHeight());
 
     case PART_HEADER_LAYER:
-      return gfx::Rect(bounds.x + frameBoxWidth()*5, bounds.y + y,
-                       m_separator_x - frameBoxWidth()*5, headerBoxHeight());
+      return gfx::Rect(bounds.x + headerBoxWidth()*5, bounds.y + y,
+                       m_separator_x - headerBoxWidth()*5, headerBoxHeight());
 
     case PART_HEADER_FRAME:
       return gfx::Rect(
@@ -1956,29 +1956,29 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
       if (validLayer(hit.layer)) {
         return gfx::Rect(bounds.x,
           bounds.y + y + headerBoxHeight() + layerBoxHeight()*(lastLayer()-hit.layer) - viewScroll().y,
-          frameBoxWidth(), layerBoxHeight());
+          headerBoxWidth(), layerBoxHeight());
       }
       break;
 
     case PART_LAYER_PADLOCK_ICON:
       if (validLayer(hit.layer)) {
-        return gfx::Rect(bounds.x + frameBoxWidth(),
+        return gfx::Rect(bounds.x + headerBoxWidth(),
           bounds.y + y + headerBoxHeight() + layerBoxHeight()*(lastLayer()-hit.layer) - viewScroll().y,
-          frameBoxWidth(), layerBoxHeight());
+          headerBoxWidth(), layerBoxHeight());
       }
       break;
 
     case PART_LAYER_CONTINUOUS_ICON:
       if (validLayer(hit.layer)) {
-        return gfx::Rect(bounds.x + 2*frameBoxWidth(),
+        return gfx::Rect(bounds.x + 2* headerBoxWidth(),
           bounds.y + y + headerBoxHeight() + layerBoxHeight()*(lastLayer()-hit.layer) - viewScroll().y,
-          frameBoxWidth(), layerBoxHeight());
+          headerBoxWidth(), layerBoxHeight());
       }
       break;
 
     case PART_LAYER_TEXT:
       if (validLayer(hit.layer)) {
-        int x = frameBoxWidth()*3;
+        int x = headerBoxWidth()*3;
         return gfx::Rect(bounds.x + x,
           bounds.y + y + headerBoxHeight() + layerBoxHeight()*(lastLayer()-hit.layer) - viewScroll().y,
           m_separator_x - x, layerBoxHeight());
@@ -2735,9 +2735,14 @@ gfx::Size Timeline::celBoxSize() const
   return gfx::Size(s, s);
 }
 
+int Timeline::headerBoxWidth() const
+{
+  return int(12 * guiscale());
+}
+
 int Timeline::headerBoxHeight() const
 {
-  return int(m_zoom*12*guiscale());
+  return int(12 * guiscale());
 }
 
 int Timeline::layerBoxHeight() const
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index bfded399d..2a0d4ad13 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -257,6 +257,7 @@ namespace app {
     // Theme/dimensions
     skin::SkinTheme* skinTheme() const;
     gfx::Size celBoxSize() const;
+    int headerBoxWidth() const;
     int headerBoxHeight() const;
     int layerBoxHeight() const;
     int frameBoxWidth() const;

From 6820c5109ce117ca963e3ec66a1041f6d91abdf8 Mon Sep 17 00:00:00 2001
From: "Carlo \"zED\" Caputo" <carlo.caputo@gmail.com>
Date: Sun, 7 Aug 2016 08:01:44 -0300
Subject: [PATCH 3/7] thumbs on zoom or if checked and proper cel link

---
 src/app/ui/timeline.cpp | 144 +++++++++++++++++++++++++---------------
 1 file changed, 89 insertions(+), 55 deletions(-)

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 8f35f04ff..a2a608d1b 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -118,7 +118,7 @@ Timeline::Timeline()
   , m_scroll(false)
   , m_fromTimeline(false)
   , m_thumbnailsOverlayVisible(false)
-  , m_thumbnailsOverlayDirection(int(frameBoxWidth()*1.5),
+  , m_thumbnailsOverlayDirection(int(frameBoxWidth()*1.0),
                                  int(frameBoxWidth()*0.5))
 {
   enableFlags(CTRL_RIGHT_CLICK);
@@ -158,6 +158,7 @@ void Timeline::setZoom(double zoom)
 void Timeline::onThumbnailsPrefChange()
 {
   setZoom(docPref().thumbnails.zoom());
+  m_thumbnailsOverlayDirection = gfx::Point(int(frameBoxWidth()*1.0), int(frameBoxWidth()*0.5));
   invalidate();
 }
 
@@ -1478,6 +1479,7 @@ void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Ce
   bool is_active = (isLayerActive(layerIndex) || isFrameActive(frame));
   bool is_empty = (image == NULL);
   gfx::Rect bounds = getPartBounds(Hit(PART_CEL, layerIndex, frame));
+  gfx::Rect full_bounds = bounds;
   IntersectClip clip(g, bounds);
   if (!clip)
     return;
@@ -1487,62 +1489,81 @@ void Timeline::drawCel(ui::Graphics* g, LayerIndex layerIndex, frame_t frame, Ce
   else
     drawPart(g, bounds, NULL, styles.timelineBox(), is_active, is_hover);
 
-  // Fill with an user-defined custom color.
-  if (cel && cel->data()) {
-    doc::color_t celColor = cel->data()->userData().color();
-    if (doc::rgba_geta(celColor) > 0) {
-      auto b2 = bounds;
-      b2.shrink(1*guiscale()).inflate(1*guiscale());
-      g->fillRect(gfx::rgba(doc::rgba_getr(celColor),
-                            doc::rgba_getg(celColor),
-                            doc::rgba_getb(celColor),
-                            doc::rgba_geta(celColor)),
-                  b2);
+  if ((docPref().thumbnails.enabled() || m_zoom > 1) && image) {
+    gfx::Rect thumb_bounds = gfx::Rect(bounds).shrink(guiscale()).inflate(guiscale(), guiscale());
+    if(m_zoom > 1)
+      thumb_bounds.inflate(0, -headerBoxHeight()).offset(0, headerBoxHeight());
+
+    if(!thumb_bounds.isEmpty()) {
+      she::Surface* thumb_surf = thumb::get_cel_thumbnail(cel, thumb_bounds.size());
+
+      g->drawRgbaSurface(thumb_surf, thumb_bounds.x, thumb_bounds.y);
+
+      thumb_surf->dispose();
     }
   }
 
-  skin::Style* style;
-  bool fromLeft = false;
-  bool fromRight = false;
-  if (is_empty) {
-    style = styles.timelineEmptyFrame();
-  }
-  else {
-    // Calculate which cel is next to this one (in previous and next
-    // frame).
-    Cel* left = (data->prevIt != data->end ? *data->prevIt: nullptr);
-    Cel* right = (data->nextIt != data->end ? *data->nextIt: nullptr);
-    if (left && left->frame() != frame-1) left = nullptr;
-    if (right && right->frame() != frame+1) right = nullptr;
+  if (!docPref().thumbnails.enabled() || m_zoom > 1 || !image) {
+    bounds.h = headerBoxHeight();
 
-    ObjectId leftImg = (left ? left->image()->id(): 0);
-    ObjectId rightImg = (right ? right->image()->id(): 0);
-    fromLeft = (leftImg == cel->image()->id());
-    fromRight = (rightImg == cel->image()->id());
+    // Fill with an user-defined custom color.
+    if (cel && cel->data()) {
+      doc::color_t celColor = cel->data()->userData().color();
+      if (doc::rgba_geta(celColor) > 0) {
+        auto b2 = bounds;
+        b2.shrink(1 * guiscale()).inflate(1 * guiscale());
+        g->fillRect(gfx::rgba(doc::rgba_getr(celColor),
+          doc::rgba_getg(celColor),
+          doc::rgba_getb(celColor),
+          doc::rgba_geta(celColor)),
+          b2);
+      }
+    }
 
-    if (fromLeft && fromRight)
-      style = styles.timelineFromBoth();
-    else if (fromLeft)
-      style = styles.timelineFromLeft();
-    else if (fromRight)
-      style = styles.timelineFromRight();
-    else
-      style = styles.timelineKeyframe();
-  }
-  drawPart(g, bounds, NULL, style, is_active, is_hover);
+    bounds.w = headerBoxWidth();
 
-  // Draw decorators to link the activeCel with its links.
-  if (data->activeIt != data->end)
-    drawCelLinkDecorators(g, bounds, cel, frame, is_active, is_hover, data);
+    skin::Style* style;
+    bool fromLeft = false;
+    bool fromRight = false;
+    if (is_empty) {
+      style = styles.timelineEmptyFrame();
+    }
+    else {
+      // Calculate which cel is next to this one (in previous and next
+      // frame).
+      Cel* left = (data->prevIt != data->end ? *data->prevIt : nullptr);
+      Cel* right = (data->nextIt != data->end ? *data->nextIt : nullptr);
+      if (left && left->frame() != frame - 1) left = nullptr;
+      if (right && right->frame() != frame + 1) right = nullptr;
 
-  if (docPref().thumbnails.enabled() && image) {
-    gfx::Rect thumb_bounds = gfx::Rect(bounds).offset(1,1).inflate(-1,-1);
+      ObjectId leftImg = (left ? left->image()->id() : 0);
+      ObjectId rightImg = (right ? right->image()->id() : 0);
+      fromLeft = (leftImg == cel->image()->id());
+      fromRight = (rightImg == cel->image()->id());
 
-    she::Surface* thumb_surf = thumb::get_cel_thumbnail(cel, thumb_bounds.size());
+      if (fromLeft && fromRight)
+        style = styles.timelineFromBoth();
+      else if (fromLeft)
+        style = styles.timelineFromLeft();
+      else if (fromRight)
+        style = styles.timelineFromRight();
+      else
+        style = styles.timelineKeyframe();
+    }
+    drawPart(g, bounds, NULL, style, is_active, is_hover);
 
-    g->drawRgbaSurface(thumb_surf, thumb_bounds.x, thumb_bounds.y);
+    if (m_zoom > 1) {
+      if (style == styles.timelineFromBoth() || style == styles.timelineFromRight()) {
+        style = styles.timelineFromBoth();
+        while ((bounds.x += bounds.w) < full_bounds.x + full_bounds.w) {
+          drawPart(g, bounds, NULL, style, is_active, is_hover);
+        }
+      }
+    }
 
-    thumb_surf->dispose();
+    // Draw decorators to link the activeCel with its links.
+    if (data->activeIt != data->end)
+      drawCelLinkDecorators(g, full_bounds, cel, frame, is_active, is_hover, data);
   }
 }
 
@@ -1577,7 +1598,7 @@ void Timeline::updateCelOverlayBounds(const Hit& hit)
 
     if (!client_bounds.contains(inner)) {
       m_thumbnailsOverlayDirection = gfx::Point(
-        bounds_cel.x < center.x ? (int)(frameBoxWidth()*1.5) : -width -(int)(frameBoxWidth()*0.5),
+        bounds_cel.x < center.x ? (int)(frameBoxWidth()*1.0) : -width,
         bounds_cel.y < center.y ? (int)(frameBoxWidth()*0.5) : -height+(int)(frameBoxWidth()*0.5)
       );
       inner.setOrigin(gfx::Point(
@@ -1654,13 +1675,16 @@ void Timeline::drawCelOverlay(ui::Graphics* g)
   overlay_surf->dispose();
 }
 
-void Timeline::drawCelLinkDecorators(ui::Graphics* g, const gfx::Rect& bounds,
+void Timeline::drawCelLinkDecorators(ui::Graphics* g, const gfx::Rect& full_bounds,
                                      Cel* cel, frame_t frame, bool is_active, bool is_hover,
                                      DrawCelData* data)
 {
   SkinTheme::Styles& styles = skinTheme()->styles;
   ObjectId imageId = (*data->activeIt)->image()->id();
 
+  gfx::Rect bounds = gfx::Rect(full_bounds).setSize(gfx::Size(headerBoxWidth(), headerBoxHeight()));
+  skin::Style* style = NULL;
+
   // Links at the left or right side
   bool left = (data->firstLink != data->end ? frame > (*data->firstLink)->frame(): false);
   bool right = (data->lastLink != data->end ? frame < (*data->lastLink)->frame(): false);
@@ -1669,17 +1693,28 @@ void Timeline::drawCelLinkDecorators(ui::Graphics* g, const gfx::Rect& bounds,
     if (left) {
       Cel* prevCel = m_layer->cel(cel->frame()-1);
       if (!prevCel || prevCel->image()->id() != imageId)
-        drawPart(g, bounds, NULL, styles.timelineLeftLink(), is_active, is_hover);
+        style = styles.timelineLeftLink();
     }
     if (right) {
       Cel* nextCel = m_layer->cel(cel->frame()+1);
       if (!nextCel || nextCel->image()->id() != imageId)
-        drawPart(g, bounds, NULL, styles.timelineRightLink(), is_active, is_hover);
+        style = styles.timelineRightLink();
     }
   }
   else {
     if (left && right)
-      drawPart(g, bounds, NULL, styles.timelineBothLinks(), is_active, is_hover);
+      style = styles.timelineBothLinks();
+  }
+
+  if (style) {
+    drawPart(g, bounds, NULL, style, is_active, is_hover);
+
+    if (m_zoom > 1 && (style == styles.timelineBothLinks() || style == styles.timelineRightLink())) {
+      style = styles.timelineBothLinks();
+      while ((bounds.x += bounds.w) < full_bounds.x + full_bounds.w) {
+        drawPart(g, bounds, NULL, style, is_active, is_hover);
+      }
+    }
   }
 }
 
@@ -2731,8 +2766,7 @@ skin::SkinTheme* Timeline::skinTheme() const
 
 gfx::Size Timeline::celBoxSize() const
 {
-  int s = int(m_zoom*12*guiscale());
-  return gfx::Size(s, s);
+  return gfx::Size(frameBoxWidth(), layerBoxHeight());
 }
 
 int Timeline::headerBoxWidth() const
@@ -2747,7 +2781,7 @@ int Timeline::headerBoxHeight() const
 
 int Timeline::layerBoxHeight() const
 {
-  return int(m_zoom*12*guiscale());
+  return int(m_zoom*12*guiscale() + (int)(m_zoom > 1) * headerBoxHeight());
 }
 
 int Timeline::frameBoxWidth() const

From 9ec5587d725352cbe3ae778cc3061ccc0209220a Mon Sep 17 00:00:00 2001
From: "Carlo \"zED\" Caputo" <carlo.caputo@gmail.com>
Date: Sun, 7 Aug 2016 08:10:38 -0300
Subject: [PATCH 4/7] removed thumb opacity setting

---
 data/pref.xml                           | 1 -
 data/widgets/timeline_conf.xml          | 7 ++-----
 src/app/thumbnails.cpp                  | 2 +-
 src/app/ui/configure_timeline_popup.cpp | 7 -------
 src/app/ui/configure_timeline_popup.h   | 1 -
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/data/pref.xml b/data/pref.xml
index 281f19a9a..90c12fcd4 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -262,7 +262,6 @@
       <option id="overlay_enabled" type="bool" default="false" />
       <option id="overlay_size" type="int" default="5" />
       <option id="quality" type="doc::algorithm::ResizeMethod" default="doc::algorithm::RESIZE_METHOD_NEAREST_NEIGHBOR" />
-      <option id="opacity" type="int" default="255" />
       <option id="background" type="app::Color" default="app::Color::fromRgb(180, 180, 180, 220)" />
     </section>
     <section id="onionskin">
diff --git a/data/widgets/timeline_conf.xml b/data/widgets/timeline_conf.xml
index 0e30bab91..9dfddb53d 100644
--- a/data/widgets/timeline_conf.xml
+++ b/data/widgets/timeline_conf.xml
@@ -4,12 +4,9 @@
 <vbox id="timeline_conf">
   <separator cell_hspan="2" text="Thumbnails:" left="true" horizontal="true" />
   <grid columns="3">
+    <check id="thumb_enabled" text="Force" />
     <label text="Zoom:" />
-    <slider min="10" max="100" id="zoom" cell_align="horizontal" width="128" cell_hspan="2" />
-
-    <check id="thumb_enabled" text="Enabled" />
-    <label text="Opacity:" />
-    <slider min="0" max="255" id="thumb_opacity" cell_align="horizontal" width="128" />
+    <slider min="10" max="100" id="zoom" cell_align="horizontal" width="128" />
 
     <check id="thumb_overlay_enabled" text="Overlay"/>
     <label text="Size:" />
diff --git a/src/app/thumbnails.cpp b/src/app/thumbnails.cpp
index 82d75fec1..9939e837f 100644
--- a/src/app/thumbnails.cpp
+++ b/src/app/thumbnails.cpp
@@ -79,7 +79,7 @@ namespace app {
         sprite->palette(frame),
         cel_image_on_thumb.x,
         cel_image_on_thumb.y,
-        opacity, BlendMode::NORMAL);
+        255, BlendMode::NORMAL);
 
       she::Surface* thumb_surf = she::instance()->createRgbaSurface(
         thumb_img->width(), thumb_img->height());
diff --git a/src/app/ui/configure_timeline_popup.cpp b/src/app/ui/configure_timeline_popup.cpp
index 44d3aeddc..3c0d41583 100644
--- a/src/app/ui/configure_timeline_popup.cpp
+++ b/src/app/ui/configure_timeline_popup.cpp
@@ -63,7 +63,6 @@ ConfigureTimelinePopup::ConfigureTimelinePopup()
   m_box->infront()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onPositionChange, this));
 
   m_box->zoom()->Change.connect(base::Bind<void>(&ConfigureTimelinePopup::onZoomChange, this));
-  m_box->thumbOpacity()->Change.connect(base::Bind<void>(&ConfigureTimelinePopup::onThumbOpacityChange, this));
   m_box->thumbBackground()->Change.connect(&ConfigureTimelinePopup::onThumbBackgroundChange, this);
   m_box->thumbEnabled()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onThumbEnabledChange, this));
   m_box->thumbOverlayEnabled()->Click.connect(base::Bind<void>(&ConfigureTimelinePopup::onThumbOverlayEnabledChange, this));
@@ -135,7 +134,6 @@ void ConfigureTimelinePopup::updateWidgetsFromCurrentSettings()
   }
 
   m_box->zoom()->setValue(docPref.thumbnails.zoom() * 10.0);
-  m_box->thumbOpacity()->setValue(docPref.thumbnails.opacity());
   m_box->thumbBackground()->setColor(docPref.thumbnails.background());
   m_box->thumbEnabled()->setSelected(docPref.thumbnails.enabled());
   m_box->thumbOverlayEnabled()->setSelected(docPref.thumbnails.overlayEnabled());
@@ -216,11 +214,6 @@ void ConfigureTimelinePopup::onZoomChange()
   docPref().thumbnails.zoom(m_box->zoom()->getValue()/10.0);
 }
 
-void ConfigureTimelinePopup::onThumbOpacityChange()
-{
-  docPref().thumbnails.opacity(m_box->thumbOpacity()->getValue());
-}
-
 void ConfigureTimelinePopup::onThumbQualityChange()
 {
   switch (m_box->thumbQuality()->getSelectedItemIndex()) {
diff --git a/src/app/ui/configure_timeline_popup.h b/src/app/ui/configure_timeline_popup.h
index 272da991a..cb8b9abe8 100644
--- a/src/app/ui/configure_timeline_popup.h
+++ b/src/app/ui/configure_timeline_popup.h
@@ -42,7 +42,6 @@ namespace app {
     void onPositionChange();
 
     void onZoomChange();
-    void onThumbOpacityChange();
     void onThumbQualityChange();
     void onThumbBackgroundChange(const app::Color& color);
     void onThumbEnabledChange();

From 2075109a5ae09e64865d20b7844d80f998652732 Mon Sep 17 00:00:00 2001
From: "Carlo \"zED\" Caputo" <carlo.caputo@gmail.com>
Date: Sun, 7 Aug 2016 08:13:18 -0300
Subject: [PATCH 5/7] only integer timeline zoom sizes to fit the style

---
 data/widgets/timeline_conf.xml          | 2 +-
 src/app/ui/configure_timeline_popup.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/widgets/timeline_conf.xml b/data/widgets/timeline_conf.xml
index 9dfddb53d..ebb9e7ce8 100644
--- a/data/widgets/timeline_conf.xml
+++ b/data/widgets/timeline_conf.xml
@@ -6,7 +6,7 @@
   <grid columns="3">
     <check id="thumb_enabled" text="Force" />
     <label text="Zoom:" />
-    <slider min="10" max="100" id="zoom" cell_align="horizontal" width="128" />
+    <slider min="1" max="10" id="zoom" cell_align="horizontal" width="128" />
 
     <check id="thumb_overlay_enabled" text="Overlay"/>
     <label text="Size:" />
diff --git a/src/app/ui/configure_timeline_popup.cpp b/src/app/ui/configure_timeline_popup.cpp
index 3c0d41583..844e40c64 100644
--- a/src/app/ui/configure_timeline_popup.cpp
+++ b/src/app/ui/configure_timeline_popup.cpp
@@ -133,7 +133,7 @@ void ConfigureTimelinePopup::updateWidgetsFromCurrentSettings()
       break;
   }
 
-  m_box->zoom()->setValue(docPref.thumbnails.zoom() * 10.0);
+  m_box->zoom()->setValue(docPref.thumbnails.zoom());
   m_box->thumbBackground()->setColor(docPref.thumbnails.background());
   m_box->thumbEnabled()->setSelected(docPref.thumbnails.enabled());
   m_box->thumbOverlayEnabled()->setSelected(docPref.thumbnails.overlayEnabled());
@@ -211,7 +211,7 @@ void ConfigureTimelinePopup::onPositionChange()
 
 void ConfigureTimelinePopup::onZoomChange()
 {
-  docPref().thumbnails.zoom(m_box->zoom()->getValue()/10.0);
+  docPref().thumbnails.zoom(m_box->zoom()->getValue());
 }
 
 void ConfigureTimelinePopup::onThumbQualityChange()

From d7347d87204e7551f0b282956a0f8489a75d022d Mon Sep 17 00:00:00 2001
From: "Carlo \"zED\" Caputo" <carlo.caputo@gmail.com>
Date: Sun, 7 Aug 2016 08:16:48 -0300
Subject: [PATCH 6/7] size of the overlay should not be zoomed

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

diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index a2a608d1b..f99a739c2 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -1574,7 +1574,7 @@ void Timeline::updateCelOverlayBounds(const Hit& hit)
   if (docPref().thumbnails.overlayEnabled() && hit.part == PART_CEL) {
     m_thumbnailsOverlayHit = hit;
 
-    int max_size = frameBoxWidth() * docPref().thumbnails.overlaySize();
+    int max_size = headerBoxWidth() * docPref().thumbnails.overlaySize();
     int width, height;
     if (m_sprite->width() > m_sprite->height()) {
       width  = max_size;

From eca0ac22e80c816f9c8167ac96868b4308b7925a Mon Sep 17 00:00:00 2001
From: "Carlo \"zED\" Caputo" <carlo.caputo@gmail.com>
Date: Sun, 7 Aug 2016 08:49:58 -0300
Subject: [PATCH 7/7] merge fix

---
 src/app/thumbnails.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/thumbnails.cpp b/src/app/thumbnails.cpp
index 9939e837f..303fd5b86 100644
--- a/src/app/thumbnails.cpp
+++ b/src/app/thumbnails.cpp
@@ -32,7 +32,6 @@ namespace app {
 
       DocumentPreferences& docPref = Preferences::instance().document(document);
 
-      int opacity = docPref.thumbnails.opacity();
       gfx::Color background = color_utils::color_for_ui(docPref.thumbnails.background());
       doc::algorithm::ResizeMethod resize_method = docPref.thumbnails.quality();