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

Merge pull request #978 from manongjohn/fix_fx_swatch_not_updating

Browse source 
Fix fx swatch not displaying initially
This commit is contained in:
manongjohn 2022-04-21 06:44:01 -04:00 committed by GitHub
commit 21fd72dbeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/toonzqt/fxsettings.cpp
View file

@ -1602,23 +1602,21 @@ void FxSettings::onViewModeChanged(QAction *triggeredAct) {
QList<QAction *> actions = m_toolBar->actions(); QList<QAction *> actions = m_toolBar->actions();
QAction *cameraAct = actions[0]; QAction *cameraAct = actions[0];
QAction *previewAct = actions[1]; QAction *previewAct = actions[1];
m_viewer->setEnable(actIsChecked);
if (name == previewAct->text()) { if (name == previewAct->text()) {
if (cameraAct->isChecked()) cameraAct->setChecked(false); if (cameraAct->isChecked()) cameraAct->setChecked(false);
if (actIsChecked) { if (actIsChecked) {
m_isCameraModeView = false; m_isCameraModeView = false;
m_paramViewer->setIsCameraViewMode(false); m_paramViewer->setIsCameraViewMode(false);
setCurrentFx();
} }
m_viewer->setEnable(actIsChecked);
} else if (name == cameraAct->text()) { } else if (name == cameraAct->text()) {
if (previewAct->isChecked()) previewAct->setChecked(false); if (previewAct->isChecked()) previewAct->setChecked(false);
if (actIsChecked) { if (actIsChecked) {
m_isCameraModeView = true; m_isCameraModeView = true;
m_paramViewer->setIsCameraViewMode(true); m_paramViewer->setIsCameraViewMode(true);
}
}
setCurrentFx(); setCurrentFx();
}
m_viewer->setEnable(actIsChecked);
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------