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

fix new level undo

Browse source
This commit is contained in:
shun-iwasawa 2021-02-19 11:54:33 +09:00 committed by manongjohn
parent 00280c1da5
commit 3ce5e26b2d
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
toonz/sources/toonz/levelcreatepopup.cpp
View file

@ -275,8 +275,8 @@ LevelCreatePopup::LevelCreatePopup()
bool ret = true;
ret = ret && connect(m_levelTypeOm, SIGNAL(currentIndexChanged(int)),
SLOT(onLevelTypeChanged(int)));
ret = ret && connect(okBtn, SIGNAL(clicked()), this, SLOT(onOkBtn()));
ret = ret && connect(cancelBtn, SIGNAL(clicked()), this, SLOT(reject()));
ret = ret && connect(okBtn, SIGNAL(clicked()), this, SLOT(onOkBtn()));
ret = ret && connect(cancelBtn, SIGNAL(clicked()), this, SLOT(reject()));
ret =
ret && connect(applyBtn, SIGNAL(clicked()), this, SLOT(onApplyButton()));
@ -525,23 +525,6 @@ bool LevelCreatePopup::apply() {
}
}
TXshLevel *level =
scene->createNewLevel(lType, levelName, TDimension(), 0, fp);
TXshSimpleLevel *sl = dynamic_cast<TXshSimpleLevel *>(level);
assert(sl);
// sl->setPath(fp, true);
if (lType == TZP_XSHLEVEL || lType == OVL_XSHLEVEL) {
sl->getProperties()->setDpiPolicy(LevelProperties::DP_ImageDpi);
sl->getProperties()->setDpi(dpi);
sl->getProperties()->setImageDpi(TPointD(dpi, dpi));
sl->getProperties()->setImageRes(TDimension(xres, yres));
}
if (lType == TZP_XSHLEVEL || lType == PLI_XSHLEVEL) {
TPalette *defaultPalette =
TApp::instance()->getPaletteController()->getDefaultPalette(lType);
if (defaultPalette) sl->setPalette(defaultPalette->clone());
}
/*-- これからLevelを配置しようとしているセルが空いているかどうかのチェック
* --*/
bool areColumnsShifted = false;
@ -574,6 +557,23 @@ bool LevelCreatePopup::apply() {
new CreateLevelUndo(row, col, numFrames, step, areColumnsShifted);
TUndoManager::manager()->add(undo);
TXshLevel *level =
scene->createNewLevel(lType, levelName, TDimension(), 0, fp);
TXshSimpleLevel *sl = dynamic_cast<TXshSimpleLevel *>(level);
assert(sl);
// sl->setPath(fp, true);
if (lType == TZP_XSHLEVEL || lType == OVL_XSHLEVEL) {
sl->getProperties()->setDpiPolicy(LevelProperties::DP_ImageDpi);
sl->getProperties()->setDpi(dpi);
sl->getProperties()->setImageDpi(TPointD(dpi, dpi));
sl->getProperties()->setImageRes(TDimension(xres, yres));
}
if (lType == TZP_XSHLEVEL || lType == PLI_XSHLEVEL) {
TPalette *defaultPalette =
TApp::instance()->getPaletteController()->getDefaultPalette(lType);
if (defaultPalette) sl->setPalette(defaultPalette->clone());
}
for (i = from; i <= to; i += inc) {
TFrameId fid(i);
TXshCell cell(sl, fid);