mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Timeline::regenerateLayers -> regenerateRows

Browse Source
This commit is contained in:
David Capello 2017-04-12 16:46:40 -03:00
parent 36f775c555
commit 42b8570635
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,7 +329,7 @@ void Timeline::updateUsingEditor(Editor* editor)
.timeline.firstFrame.AfterChange.connect(base::Bind<void>(&Timeline::invalidate, this)); .timeline.firstFrame.AfterChange.connect(base::Bind<void>(&Timeline::invalidate, this));
setFocusStop(true); setFocusStop(true);
regenerateLayers(); regenerateRows();
setViewScroll(viewScroll()); setViewScroll(viewScroll());
showCurrentCel(); showCurrentCel();
} }
@ -389,7 +389,7 @@ void Timeline::setLayer(Layer* layer)
group->setCollapsed(false); group->setCollapsed(false);
group = group->parent(); group = group->parent();
} }
regenerateLayers(); regenerateRows();
} }
invalidate(); invalidate();
@ -449,7 +449,7 @@ void Timeline::prepareToMoveRange()
void Timeline::moveRange(Range& range) void Timeline::moveRange(Range& range)
{ {
regenerateLayers(); regenerateRows();
// We have to change the range before we generate an // We have to change the range before we generate an
// onActiveSiteChange() event so observers (like cel properties // onActiveSiteChange() event so observers (like cel properties
@ -798,7 +798,7 @@ bool Timeline::onProcessMessage(Message* msg)
return true; return true;
} }
bool regenLayers = false; bool regenRows = false;
bool relayout = false; bool relayout = false;
setHot(hitTest(msg, mouseMsg->position() - bounds().origin())); setHot(hitTest(msg, mouseMsg->position() - bounds().origin()));
@ -820,7 +820,7 @@ bool Timeline::onProcessMessage(Message* msg)
if (topLayer->isVisible() != newVisibleState) { if (topLayer->isVisible() != newVisibleState) {
topLayer->setVisible(newVisibleState); topLayer->setVisible(newVisibleState);
if (topLayer->isGroup()) if (topLayer->isGroup())
regenLayers = true; regenRows = true;
} }
} }
@ -839,7 +839,7 @@ bool Timeline::onProcessMessage(Message* msg)
if (topLayer->isEditable() != newEditableState) { if (topLayer->isEditable() != newEditableState) {
topLayer->setEditable(newEditableState); topLayer->setEditable(newEditableState);
if (topLayer->isGroup()) if (topLayer->isGroup())
regenLayers = true; regenRows = true;
} }
} }
break; break;
@ -920,7 +920,7 @@ bool Timeline::onProcessMessage(Message* msg)
// Show parents // Show parents
if (!row.parentVisible()) { if (!row.parentVisible()) {
regenLayers = true; regenRows = true;
layer->setVisible(true); layer->setVisible(true);
layer = layer->parent(); layer = layer->parent();
@ -933,7 +933,7 @@ bool Timeline::onProcessMessage(Message* msg)
else { else {
layer->setVisible(!layer->isVisible()); layer->setVisible(!layer->isVisible());
if (layer->isGroup() && layer->isExpanded()) if (layer->isGroup() && layer->isExpanded())
regenLayers = true; regenRows = true;
} }
// Redraw all views. // Redraw all views.
@ -950,7 +950,7 @@ bool Timeline::onProcessMessage(Message* msg)
// Unlock parents // Unlock parents
if (!row.parentEditable()) { if (!row.parentEditable()) {
regenLayers = true; regenRows = true;
layer->setEditable(true); layer->setEditable(true);
layer = layer->parent(); layer = layer->parent();
@ -963,7 +963,7 @@ bool Timeline::onProcessMessage(Message* msg)
else { else {
layer->setEditable(!layer->isEditable()); layer->setEditable(!layer->isEditable());
if (layer->isGroup() && layer->isExpanded()) if (layer->isGroup() && layer->isExpanded())
regenLayers = true; regenRows = true;
} }
} }
break; break;
@ -978,7 +978,7 @@ bool Timeline::onProcessMessage(Message* msg)
else if (layer->isGroup()) { else if (layer->isGroup()) {
layer->setCollapsed(!layer->isCollapsed()); layer->setCollapsed(!layer->isCollapsed());
regenerateLayers(); regenerateRows();
invalidate(); invalidate();
updateByMousePos( updateByMousePos(
@ -1051,15 +1051,15 @@ bool Timeline::onProcessMessage(Message* msg)
else { else {
m_tagFocusBand = -1; m_tagFocusBand = -1;
} }
regenLayers = true; regenRows = true;
relayout = true; relayout = true;
} }
break; break;
} }
if (regenLayers) { if (regenRows) {
regenerateLayers(); regenerateRows();
invalidate(); invalidate();
} }
if (relayout) if (relayout)
@ -1405,7 +1405,7 @@ void Timeline::onAfterCommandExecution(CommandExecutionEvent& ev)
if (!m_document) if (!m_document)
return; return;
regenerateLayers(); regenerateRows();
showCurrentCel(); showCurrentCel();
invalidate(); invalidate();
} }
@ -1428,7 +1428,7 @@ void Timeline::onAddLayer(doc::DocumentEvent& ev)
setLayer(ev.layer()); setLayer(ev.layer());
regenerateLayers(); regenerateRows();
showCurrentCel(); showCurrentCel();
clearClipboardRange(); clearClipboardRange();
invalidate(); invalidate();
@ -1456,7 +1456,7 @@ void Timeline::onAfterRemoveLayer(doc::DocumentEvent& ev)
setLayer(layer_select); setLayer(layer_select);
} }
regenerateLayers(); regenerateRows();
showCurrentCel(); showCurrentCel();
clearClipboardRange(); clearClipboardRange();
invalidate(); invalidate();
@ -1509,7 +1509,7 @@ void Timeline::onAddFrameTag(DocumentEvent& ev)
{ {
if (m_tagFocusBand >= 0) { if (m_tagFocusBand >= 0) {
m_tagFocusBand = -1; m_tagFocusBand = -1;
regenerateLayers(); regenerateRows();
layout(); layout();
} }
} }
@ -2595,7 +2595,7 @@ void Timeline::invalidateHit(const Hit& hit)
invalidateRect(getPartBounds(hit).offset(origin())); invalidateRect(getPartBounds(hit).offset(origin()));
} }
void Timeline::regenerateLayers() void Timeline::regenerateRows()
{ {
ASSERT(m_document); ASSERT(m_document);
ASSERT(m_sprite); ASSERT(m_sprite);

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

@ -257,7 +257,7 @@ namespace app {
gfx::Rect getPartBounds(const Hit& hit) const; gfx::Rect getPartBounds(const Hit& hit) const;
gfx::Rect getRangeBounds(const Range& range) const; gfx::Rect getRangeBounds(const Range& range) const;
void invalidateHit(const Hit& hit); void invalidateHit(const Hit& hit);
void regenerateLayers(); void regenerateRows();
void regenerateTagBands(); void regenerateTagBands();
int visibleTagBands() const; int visibleTagBands() const;
void updateScrollBars(); void updateScrollBars();