From 20b92ca745b17e9b3044eab3d8f62f44e4302e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <martin@igara.com>
Date: Mon, 6 Jan 2025 18:33:30 -0300
Subject: [PATCH] Fix timeline drawing issues (fix #3678)

---
 src/app/ui/timeline/timeline.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/app/ui/timeline/timeline.cpp b/src/app/ui/timeline/timeline.cpp
index 5a973f4a3..739e5ab04 100644
--- a/src/app/ui/timeline/timeline.cpp
+++ b/src/app/ui/timeline/timeline.cpp
@@ -235,7 +235,7 @@ Timeline::Timeline(TooltipManager* tooltipManager)
   , m_tagBands(0)
   , m_tagFocusBand(-1)
   , m_separator_x(Preferences::instance().general.timelineLayerPanelWidth())
-  , m_separator_w(1)
+  , m_separator_w(guiscale())
   , m_confPopup(nullptr)
   , m_clipboard_timer(100, this)
   , m_offset_count(0)
@@ -1600,6 +1600,8 @@ void Timeline::onInitTheme(ui::InitThemeEvent& ev)
 
   if (m_confPopup)
     m_confPopup->initTheme();
+
+  m_separator_w = guiscale();
 }
 
 void Timeline::onInvalidateRegion(const gfx::Region& region)
@@ -2057,6 +2059,9 @@ void Timeline::getDrawableFrames(frame_t* firstFrame, frame_t* lastFrame)
 {
   *firstFrame = frame_t(viewScroll().x / frameBoxWidth());
   *lastFrame = frame_t((viewScroll().x + getCelsBounds().w) / frameBoxWidth());
+  // Last drawable frame cannot be greater than the sprite's last frame.
+  if (m_sprite && m_sprite->lastFrame() < *lastFrame)
+    *lastFrame = m_sprite->lastFrame();
 }
 
 void Timeline::drawPart(ui::Graphics* g,
@@ -2930,7 +2935,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
                        headerBoxHeight());
 
     case PART_HEADER_FRAME:
-      return gfx::Rect(bounds.x + separatorX() + m_separator_w - 1 +
+      return gfx::Rect(bounds.x + separatorX() + m_separator_w - guiscale() +
                          frameBoxWidth() * std::max(firstFrame(), hit.frame) - viewScroll().x,
                        bounds.y + y,
                        frameBoxWidth(),
@@ -2989,8 +2994,8 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
 
     case PART_CEL:
       if (validLayer(hit.layer) && hit.frame >= frame_t(0)) {
-        return gfx::Rect(bounds.x + separatorX() + m_separator_w - 1 + frameBoxWidth() * hit.frame -
-                           viewScroll().x,
+        return gfx::Rect(bounds.x + separatorX() + m_separator_w - guiscale() +
+                           frameBoxWidth() * hit.frame - viewScroll().x,
                          bounds.y + y + headerBoxHeight() +
                            layerBoxHeight() * (lastLayer() - hit.layer) - viewScroll().y,
                          frameBoxWidth(),
@@ -3001,7 +3006,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
     case PART_RANGE_OUTLINE: {
       gfx::Rect rc = getRangeBounds(m_range);
       int s = outlineWidth();
-      rc.enlarge(gfx::Border(s - 1, s - 1, s, s));
+      rc.enlarge(gfx::Border(s - guiscale(), s - guiscale(), s, s));
       if (rc.x < bounds.x)
         rc.offset(s, 0).inflate(-s, 0);
       if (rc.y < bounds.y)
@@ -3044,15 +3049,15 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
     }
 
     case PART_TAGS:
-      return gfx::Rect(bounds.x + separatorX() + m_separator_w - 1,
+      return gfx::Rect(bounds.x + separatorX() + m_separator_w - guiscale(),
                        bounds.y,
-                       bounds.w - separatorX() - m_separator_w + 1,
+                       bounds.w - separatorX() - m_separator_w + guiscale(),
                        y);
 
     case PART_TAG_BAND:
-      return gfx::Rect(bounds.x + separatorX() + m_separator_w - 1,
+      return gfx::Rect(bounds.x + separatorX() + m_separator_w - guiscale(),
                        bounds.y + (m_tagFocusBand < 0 ? oneTagHeight() * std::max(0, hit.band) : 0),
-                       bounds.w - separatorX() - m_separator_w + 1,
+                       bounds.w - separatorX() - m_separator_w + guiscale(),
                        oneTagHeight());
 
     case PART_TAG_SWITCH_BUTTONS: {