root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Reference frame tags with an ObjectId in Timeline::Hit::frameTag instead of a FrameTag* 

With this we avoid strange states where the Timeline is redraw after a
undo/redo and the referenced FrameTag was just deleted.
This commit is contained in:
David Capello 2015-03-12 15:31:34 -03:00
parent e6dc94ddb2
commit c7e37910e5
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,10 +597,11 @@ bool Timeline::onProcessMessage(Message* msg)
break; break;
} }
case PART_FRAME_TAG: case PART_FRAME_TAG: {
if (m_clk.frameTag) { FrameTag* frameTag = m_clk.getFrameTag();
if (frameTag) {
Params params; Params params;
params.set("id", base::convert_to<std::string>(m_clk.frameTag->id()).c_str()); params.set("id", base::convert_to<std::string>(frameTag->id()).c_str());
// As the m_clk.frameTag can be deleted with // As the m_clk.frameTag can be deleted with
// RemoveFrameTag command, we've to clean all references // RemoveFrameTag command, we've to clean all references
@ -622,6 +623,7 @@ bool Timeline::onProcessMessage(Message* msg)
} }
} }
break; break;
}
} }
@ -1332,13 +1334,13 @@ void Timeline::drawFrameTags(ui::Graphics* g)
} }
{ {
bounds = getPartBounds(Hit(PART_FRAME_TAG, LayerIndex(0), 0, frameTag)); bounds = getPartBounds(Hit(PART_FRAME_TAG, LayerIndex(0), 0, frameTag->id()));
gfx::Color bg = frameTag->color(); gfx::Color bg = frameTag->color();
if (m_clk.part == PART_FRAME_TAG && m_clk.frameTag == frameTag) { if (m_clk.part == PART_FRAME_TAG && m_clk.frameTag == frameTag->id()) {
bg = color_utils::blackandwhite_neg(bg); bg = color_utils::blackandwhite_neg(bg);
} }
else if (m_hot.part == PART_FRAME_TAG && m_hot.frameTag == frameTag) { else if (m_hot.part == PART_FRAME_TAG && m_hot.frameTag == frameTag->id()) {
int r, g, b; int r, g, b;
r = gfx::getr(bg)+32; r = gfx::getr(bg)+32;
g = gfx::getg(bg)+32; g = gfx::getg(bg)+32;
@ -1618,21 +1620,24 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
return rc; return rc;
} }
case PART_FRAME_TAG: case PART_FRAME_TAG: {
if (hit.frameTag) { FrameTag* frameTag = hit.getFrameTag();
gfx::Rect bounds1 = getPartBounds(Hit(PART_HEADER_FRAME, firstLayer(), hit.frameTag->fromFrame())); if (frameTag) {
gfx::Rect bounds2 = getPartBounds(Hit(PART_HEADER_FRAME, firstLayer(), hit.frameTag->toFrame())); gfx::Rect bounds1 = getPartBounds(Hit(PART_HEADER_FRAME, firstLayer(), frameTag->fromFrame()));
gfx::Rect bounds2 = getPartBounds(Hit(PART_HEADER_FRAME, firstLayer(), frameTag->toFrame()));
gfx::Rect bounds = bounds1.createUnion(bounds2); gfx::Rect bounds = bounds1.createUnion(bounds2);
bounds.y -= skinTheme()->dimensions.timelineTagsAreaHeight(); bounds.y -= skinTheme()->dimensions.timelineTagsAreaHeight();
int textHeight = getFont()->height(); int textHeight = getFont()->height();
bounds.y -= textHeight + 2*ui::guiscale(); bounds.y -= textHeight + 2*ui::guiscale();
bounds.x += 3*ui::guiscale(); bounds.x += 3*ui::guiscale();
bounds.w = getFont()->textLength(hit.frameTag->name().c_str()) + 4*ui::guiscale(); bounds.w = getFont()->textLength(frameTag->name().c_str()) + 4*ui::guiscale();
bounds.h = getFont()->height() + 2*ui::guiscale(); bounds.h = getFont()->height() + 2*ui::guiscale();
return bounds; return bounds;
} }
break; break;
}
} }
return gfx::Rect(); return gfx::Rect();
@ -1747,10 +1752,10 @@ Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
// Is the mouse on the frame tags area? // Is the mouse on the frame tags area?
else if (getPartBounds(Hit(PART_HEADER_FRAME_TAGS)).contains(mousePos)) { else if (getPartBounds(Hit(PART_HEADER_FRAME_TAGS)).contains(mousePos)) {
for (FrameTag* frameTag : m_sprite->frameTags()) { for (FrameTag* frameTag : m_sprite->frameTags()) {
gfx::Rect bounds = getPartBounds(Hit(PART_FRAME_TAG, LayerIndex(0), 0, frameTag)); gfx::Rect bounds = getPartBounds(Hit(PART_FRAME_TAG, LayerIndex(0), 0, frameTag->id()));
if (bounds.contains(mousePos)) { if (bounds.contains(mousePos)) {
hit.part = PART_FRAME_TAG; hit.part = PART_FRAME_TAG;
hit.frameTag = frameTag; hit.frameTag = frameTag->id();
break; break;
} }
} }
@ -2283,4 +2288,9 @@ int Timeline::topHeight() const
return h; return h;
} }
FrameTag* Timeline::Hit::getFrameTag() const
{
return get<FrameTag>(frameTag);
}
} // namespace app } // namespace app

6
src/app/ui/timeline.h
View File

@ -120,9 +120,9 @@ namespace app {
int part; int part;
LayerIndex layer; LayerIndex layer;
frame_t frame; frame_t frame;
FrameTag* frameTag; ObjectId frameTag;
Hit(int part = 0, LayerIndex layer = LayerIndex(0), frame_t frame = 0, FrameTag* frameTag = nullptr) Hit(int part = 0, LayerIndex layer = LayerIndex(0), frame_t frame = 0, ObjectId frameTag = NullId)
: part(part), layer(layer), frame(frame), frameTag(frameTag) { : part(part), layer(layer), frame(frame), frameTag(frameTag) {
} }
@ -133,6 +133,8 @@ namespace app {
frame != other.frame || frame != other.frame ||
frameTag != other.frameTag; frameTag != other.frameTag;
} }
FrameTag* getFrameTag() const;
}; };
struct DropTarget { struct DropTarget {