mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-10 12:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deselect timeline range in "auto select layer" mode if we just click the active layer

Browse Source 
Fix: https://community.aseprite.org/t/8610
This commit is contained in:
David Capello 2021-04-08 15:21:11 -03:00
parent f91c07825b
commit f1b02a3347
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/ui/editor/moving_cel_state.cpp
View File

@ -88,8 +88,6 @@ MovingCelState::MovingCelState(Editor* editor,
, m_celList(collect.celList()) , m_celList(collect.celList())
, m_celOffset(0.0, 0.0) , m_celOffset(0.0, 0.0)
, m_celScale(1.0, 1.0) , m_celScale(1.0, 1.0)
, m_hasReference(false)
, m_scaled(false)
, m_handle(handle) , m_handle(handle)
, m_editor(editor) , m_editor(editor)
{ {
@ -190,6 +188,13 @@ bool MovingCelState::onMouseUp(Editor* editor, MouseMessage* msg)
// like to update all the editors. // like to update all the editors.
document->notifyGeneralUpdate(); document->notifyGeneralUpdate();
} }
// Just a click in the current layer
else if (!m_moved & !m_scaled) {
// Deselect the whole range if we are in "Auto Select Layer"
if (editor->isAutoSelectLayer()) {
App::instance()->timeline()->clearAndInvalidateRange();
}
}
// Restore the mask visibility. // Restore the mask visibility.
if (m_maskVisible) { if (m_maskVisible) {
@ -220,6 +225,8 @@ bool MovingCelState::onMouseMove(Editor* editor, MouseMessage* msg)
m_celOffset.y = 0; m_celOffset.y = 0;
} }
} }
if (!m_moved && intCelOffset() != gfx::Point(0, 0))
m_moved = true;
break; break;
case ScaleSEHandle: { case ScaleSEHandle: {
@ -248,6 +255,7 @@ bool MovingCelState::onMouseMove(Editor* editor, MouseMessage* msg)
if (cel->layer()->isReference()) { if (cel->layer()->isReference()) {
celBounds.x += m_celOffset.x; celBounds.x += m_celOffset.x;
celBounds.y += m_celOffset.y; celBounds.y += m_celOffset.y;
m_moved = true;
if (m_scaled) { if (m_scaled) {
celBounds.w *= m_celScale.w; celBounds.w *= m_celScale.w;
celBounds.h *= m_celScale.h; celBounds.h *= m_celScale.h;

5
src/app/ui/editor/moving_cel_state.h
View File

@ -68,8 +68,9 @@ namespace app {
gfx::SizeF m_celMainSize; gfx::SizeF m_celMainSize;
gfx::SizeF m_celScale; gfx::SizeF m_celScale;
bool m_maskVisible; bool m_maskVisible;
bool m_hasReference; bool m_hasReference = false;
bool m_scaled; bool m_moved = false;
bool m_scaled = false;
HandleType m_handle; HandleType m_handle;
Editor* m_editor; Editor* m_editor;