mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 05:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix timeline scroll behavior when we are moving frames or layers

Browse Source 
Minor change to e8977bb6a354dfd06c28968cb6d13d258c555333 for #1780
just to avoid scrolling frames if we are moving only layers or
viceversa (don't scroll layers if we are moving frames).
This commit is contained in:
David Capello 2018-09-18 22:54:53 -03:00
parent 7984e0beb8
commit a13385a081
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1050,27 +1050,45 @@ bool Timeline::onProcessMessage(Message* msg)
switch (m_state) { switch (m_state) {
case STATE_MOVING_RANGE: { case STATE_MOVING_RANGE: {
frame_t firstDrawableFrame; frame_t newFrame;
frame_t lastDrawableFrame; if (m_range.type() == Range::kLayers) {
getDrawableFrames(&firstDrawableFrame, &lastDrawableFrame); // If we are moving only layers we don't change the
// current frame.
newFrame = m_frame;
}
else {
frame_t firstDrawableFrame;
frame_t lastDrawableFrame;
getDrawableFrames(&firstDrawableFrame, &lastDrawableFrame);
layer_t firstDrawableLayer; if (hit.frame < firstDrawableFrame)
layer_t lastDrawableLayer;
getDrawableLayers(&firstDrawableLayer, &lastDrawableLayer);
layer_t newLayer = hit.layer;
frame_t newFrame = hit.frame;
if (hit.frame < firstDrawableFrame)
newFrame = firstDrawableFrame - 1; newFrame = firstDrawableFrame - 1;
else if (hit.frame > lastDrawableFrame) else if (hit.frame > lastDrawableFrame)
newFrame = lastDrawableFrame + 1; newFrame = lastDrawableFrame + 1;
if (hit.layer < firstDrawableLayer) else
newLayer = firstDrawableLayer - 1; newFrame = hit.frame;
else if (hit.layer > lastDrawableLayer) }
newLayer = lastDrawableLayer + 1;
showCel(newLayer,newFrame); layer_t newLayer;
if (m_range.type() == Range::kFrames) {
// If we are moving only frames we don't change the
// current layer.
newLayer = getLayerIndex(m_layer);
}
else {
layer_t firstDrawableLayer;
layer_t lastDrawableLayer;
getDrawableLayers(&firstDrawableLayer, &lastDrawableLayer);
if (hit.layer < firstDrawableLayer)
newLayer = firstDrawableLayer - 1;
else if (hit.layer > lastDrawableLayer)
newLayer = lastDrawableLayer + 1;
else
newLayer = hit.layer;
}
showCel(newLayer, newFrame);
break; break;
} }