mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-05 18:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timeline drawing issues (fix #3678)

Browse Source
This commit is contained in:
Martín Capello 2025-01-06 18:33:30 -03:00 committed by David Capello
parent dedfdce705
commit 20b92ca745
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/ui/timeline/timeline.cpp
View File

@ -235,7 +235,7 @@ Timeline::Timeline(TooltipManager* tooltipManager)
, m_tagBands(0) , m_tagBands(0)
, m_tagFocusBand(-1) , m_tagFocusBand(-1)
, m_separator_x(Preferences::instance().general.timelineLayerPanelWidth()) , m_separator_x(Preferences::instance().general.timelineLayerPanelWidth())
, m_separator_w(1) , m_separator_w(guiscale())
, m_confPopup(nullptr) , m_confPopup(nullptr)
, m_clipboard_timer(100, this) , m_clipboard_timer(100, this)
, m_offset_count(0) , m_offset_count(0)
@ -1600,6 +1600,8 @@ void Timeline::onInitTheme(ui::InitThemeEvent& ev)
if (m_confPopup) if (m_confPopup)
m_confPopup->initTheme(); m_confPopup->initTheme();
m_separator_w = guiscale();
} }
void Timeline::onInvalidateRegion(const gfx::Region& region) 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()); *firstFrame = frame_t(viewScroll().x / frameBoxWidth());
*lastFrame = frame_t((viewScroll().x + getCelsBounds().w) / 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, void Timeline::drawPart(ui::Graphics* g,
@ -2930,7 +2935,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
headerBoxHeight()); headerBoxHeight());
case PART_HEADER_FRAME: 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, frameBoxWidth() * std::max(firstFrame(), hit.frame) - viewScroll().x,
bounds.y + y, bounds.y + y,
frameBoxWidth(), frameBoxWidth(),
@ -2989,8 +2994,8 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
case PART_CEL: case PART_CEL:
if (validLayer(hit.layer) && hit.frame >= frame_t(0)) { if (validLayer(hit.layer) && hit.frame >= frame_t(0)) {
return gfx::Rect(bounds.x + separatorX() + m_separator_w - 1 + frameBoxWidth() * hit.frame - return gfx::Rect(bounds.x + separatorX() + m_separator_w - guiscale() +
viewScroll().x, frameBoxWidth() * hit.frame - viewScroll().x,
bounds.y + y + headerBoxHeight() + bounds.y + y + headerBoxHeight() +
layerBoxHeight() * (lastLayer() - hit.layer) - viewScroll().y, layerBoxHeight() * (lastLayer() - hit.layer) - viewScroll().y,
frameBoxWidth(), frameBoxWidth(),
@ -3001,7 +3006,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
case PART_RANGE_OUTLINE: { case PART_RANGE_OUTLINE: {
gfx::Rect rc = getRangeBounds(m_range); gfx::Rect rc = getRangeBounds(m_range);
int s = outlineWidth(); 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) if (rc.x < bounds.x)
rc.offset(s, 0).inflate(-s, 0); rc.offset(s, 0).inflate(-s, 0);
if (rc.y < bounds.y) if (rc.y < bounds.y)
@ -3044,15 +3049,15 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
} }
case PART_TAGS: 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.y,
bounds.w - separatorX() - m_separator_w + 1, bounds.w - separatorX() - m_separator_w + guiscale(),
y); y);
case PART_TAG_BAND: 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.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()); oneTagHeight());
case PART_TAG_SWITCH_BUTTONS: { case PART_TAG_SWITCH_BUTTONS: {