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

Expand timeline range outline for layers/frames to all cels

Browse Source
This commit is contained in:
David Capello 2021-03-31 19:27:43 -03:00
parent 1b0466af17
commit 5e98b39944
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2867,14 +2867,17 @@ gfx::Rect Timeline::getRangeBounds(const Range& range) const
}
break;
case Range::kFrames: {
for (auto frame : range.selectedFrames())
for (auto frame : range.selectedFrames()) {
rc |= getPartBounds(Hit(PART_HEADER_FRAME, 0, frame));
rc |= getPartBounds(Hit(PART_CEL, 0, frame));
}
break;
}
case Range::kLayers:
for (auto layer : range.selectedLayers()) {
layer_t layerIdx = getLayerIndex(layer);
rc |= getPartBounds(Hit(PART_ROW_TEXT, layerIdx));
rc |= getPartBounds(Hit(PART_CEL, layerIdx, m_sprite->lastFrame()));
}
break;
}
@ -2883,11 +2886,28 @@ gfx::Rect Timeline::getRangeBounds(const Range& range) const
gfx::Rect Timeline::getRangeClipBounds(const Range& range) const
{
gfx::Rect clipBounds;
gfx::Rect celBounds = getCelsBounds();
gfx::Rect clipBounds, unionBounds;
switch (range.type()) {
case Range::kCels: clipBounds = getCelsBounds(); break;
case Range::kFrames: clipBounds = getFrameHeadersBounds(); break;
case Range::kLayers: clipBounds = getLayerHeadersBounds(); break;
case Range::kCels:
clipBounds = celBounds;
break;
case Range::kFrames: {
clipBounds = getFrameHeadersBounds();
unionBounds = (clipBounds | celBounds);
clipBounds.y = unionBounds.y;
clipBounds.h = unionBounds.h;
break;
}
case Range::kLayers: {
clipBounds = getLayerHeadersBounds();
unionBounds = (clipBounds | celBounds);
clipBounds.x = unionBounds.x;
clipBounds.w = unionBounds.w;
break;
}
}
return clipBounds;
}