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

Merge pull request #953 from manongjohn/fix_column_rename_on_clone

Browse source 
Fix renaming column with Clone Cells
This commit is contained in:
manongjohn 2022-04-12 08:50:04 -04:00 committed by GitHub
commit eab95edbe1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@
#include "toonz/childstack.h"
#include "toonz/tframehandle.h"
#include "toonz/tcolumnhandle.h"
#include "toonz/tstageobjectcmd.h"
// TnzCore includes
#include "tsystem.h"
@ -1794,9 +1795,28 @@ void CloneLevelUndo::undo() const {
//-----------------------------------------------------------------------------
void TCellSelection::cloneLevel() {
TUndoManager::manager()->beginBlock();
std::unique_ptr<CloneLevelUndo> undo(new CloneLevelUndo(m_range));
if (undo->redo(), undo->m_ok) TUndoManager::manager()->add(undo.release());
if (undo->redo(), undo->m_ok) {
TUndoManager::manager()->add(undo.release());
// Clone level always adds new columns after the column selection.
TApplication *app = TApp::instance();
for (int col = m_range.m_c0; col <= m_range.m_c1; col++) {
int newCol = col + m_range.getColCount();
TStageObjectId columnId = TStageObjectId::ColumnId(newCol);
TXsheet *xsh = app->getCurrentXsheet()->getXsheet();
TXshCell cell = xsh->getCell(m_range.m_r0, newCol);
TXshSimpleLevel *level = cell.getSimpleLevel();
std::string columnName =
QString::fromStdWString(level->getName()).toStdString();
TStageObjectCmd::rename(columnId, columnName, app->getCurrentXsheet());
}
}
TUndoManager::manager()->endBlock();
}
//=============================================================================