razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix selection after Decrease Step, undo and redo

Browse source
This commit is contained in:
manongjohn 2022-04-06 13:57:52 -04:00
parent 7e7bcaebe4
commit 58d8ba72af
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
toonz/sources/toonz/cellselectioncommand.cpp
View file

@ -1153,6 +1153,10 @@ void DecreaseStepUndo::redo() const {
TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
TApp::instance()->getCurrentScene()->setDirtyFlag(true); TApp::instance()->getCurrentScene()->setDirtyFlag(true);
TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
TApp::instance()->getCurrentSelection()->getSelection());
if (cellSelection) cellSelection->selectCells(m_r0, m_c0, m_newR1, m_c1);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1171,6 +1175,11 @@ void DecreaseStepUndo::undo() const {
app->getCurrentXsheet()->notifyXsheetChanged(); app->getCurrentXsheet()->notifyXsheetChanged();
app->getCurrentScene()->setDirtyFlag(true); app->getCurrentScene()->setDirtyFlag(true);
TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
TApp::instance()->getCurrentSelection()->getSelection());
if (cellSelection)
cellSelection->selectCells(m_r0, m_c0, (m_r0 + (m_rowsCount - 1)), m_c1);
} }
} // namespace } // namespace
@ -1202,18 +1211,12 @@ void TCellSelection::decreaseStepCells() {
m_range.m_r1 = r1; m_range.m_r1 = r1;
m_range.m_c0 = col; m_range.m_c0 = col;
m_range.m_c1 = col; m_range.m_c1 = col;
TApp::instance()->getCurrentSelection()->notifySelectionChanged();
} }
DecreaseStepUndo *undo = new DecreaseStepUndo(m_range.m_r0, m_range.m_c0, DecreaseStepUndo *undo = new DecreaseStepUndo(m_range.m_r0, m_range.m_c0,
m_range.m_r1, m_range.m_c1); m_range.m_r1, m_range.m_c1);
TUndoManager::manager()->add(undo); TUndoManager::manager()->add(undo);
undo->redo(); undo->redo();
if (undo->m_newR1 != m_range.m_r1) {
m_range.m_r1 = undo->m_newR1;
TApp::instance()->getCurrentSelection()->notifySelectionChanged();
}
} }
//********************************************************************************* //*********************************************************************************