Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

disable edit shift when deactivating shift & trace

shun-iwasawa1e3399bdbe5c
diff --git a/toonz/sources/tnztools/shifttracetool.cpp b/toonz/sources/tnztools/shifttracetool.cpp
index 4738d63aa..d7f0265b6 100644
--- a/toonz/sources/tnztools/shifttracetool.cpp
+++ b/toonz/sources/tnztools/shifttracetool.cpp
@@ -348,6 +348,10 @@ void ShiftTraceTool::onActivate() {
}
void ShiftTraceTool::onDeactivate() {
+ // Deactivating Shift and Trace mode resets the pseudo tool with keeping the
+ // Edit Shift checkbox unchanged
+ QAction *shiftTrace = CommandManager::instance()->getAction("MI_ShiftTrace");
+ if (!shiftTrace->isChecked()) return;
QAction *action = CommandManager::instance()->getAction("MI_EditShift");
action->setChecked(false);
}
diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
index 01c7d4528..40fd9d651 100644
--- a/toonz/sources/toonz/sceneviewer.cpp
+++ b/toonz/sources/toonz/sceneviewer.cpp
@@ -404,7 +404,17 @@ public:
if (std::string(m_cmdId) == MI_ShiftTrace) {
cm->enable(MI_EditShift, checked);
cm->enable(MI_NoShift, checked);
- if (checked) OnioniSkinMaskGUI::resetShiftTraceFrameOffset();
+ if (checked) {
+ OnioniSkinMaskGUI::resetShiftTraceFrameOffset();
+ // activate edit shift
+ if (isChecked(MI_EditShift))
+ TApp::instance()->getCurrentTool()->setPseudoTool("T_ShiftTrace");
+ } else {
+ // deactivate edit shift
+ if (isChecked(MI_EditShift))
+ TApp::instance()->getCurrentTool()->unsetPseudoTool();
+ }
+
// cm->getAction(MI_NoShift)->setChecked(false);
TApp::instance()->getCurrentOnionSkin()->notifyOnionSkinMaskChanged();
} else if (std::string(m_cmdId) == MI_EditShift) {