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

open fx settings from xsheet (#2337)

Browse source
This commit is contained in:
shun-iwasawa 2018-10-24 11:58:07 +09:00 committed by Jeremy Bullock
parent c39a2a132a
commit cc8bfe7b33
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -3046,10 +3046,8 @@ void CellArea::contextMenuEvent(QContextMenuEvent *event) {
m_viewer->getCellSelection()->selectCell(row, col);
m_viewer->setCurrentColumn(col);
}
if (!xsh->getCell(row, col).isEmpty())
createCellMenu(menu, true, cell);
else
createCellMenu(menu, false, cell);
createCellMenu(menu, !cell.isEmpty(), cell);
}
if (!menu.isEmpty()) menu.exec(event->globalPos());
@ -3139,7 +3137,12 @@ void CellArea::createCellMenu(QMenu &menu, bool isCellSelected, TXshCell cell) {
}
if (isCellSelected) {
menu.addAction(cmdManager->getAction(MI_LevelSettings));
// open fx settings instead of level settings when clicked on zerary fx
// level
if (cell.m_level && cell.m_level->getZeraryFxLevel())
menu.addAction(cmdManager->getAction(MI_FxParamEditor));
else
menu.addAction(cmdManager->getAction(MI_LevelSettings));
menu.addSeparator();
if (!soundCellsSelected) {