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

Fix level create popup units (#3266)

Browse source
This commit is contained in:
Jeremy Bullock 2020-05-05 13:11:32 -06:00 committed by GitHub
parent 8313e81965
commit ad857dcd0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -345,15 +345,11 @@ void LevelCreatePopup::showEvent(QShowEvent *) {
m_dpiLabel->hide();
m_widthFld->setDecimals(0);
m_heightFld->setDecimals(0);
m_widthFld->setMeasure("camera.lx");
m_heightFld->setMeasure("camera.ly");
} else {
m_dpiFld->show();
m_dpiLabel->show();
m_widthFld->setDecimals(4);
m_heightFld->setDecimals(4);
m_widthFld->setMeasure("level.lx");
m_heightFld->setMeasure("level.ly");
}
}
@ -604,6 +600,13 @@ bool LevelCreatePopup::apply() {
void LevelCreatePopup::update() {
updatePath();
Preferences *pref = Preferences::instance();
if (pref->getUnits() == "pixel") {
m_widthFld->setMeasure("camera.lx");
m_heightFld->setMeasure("camera.ly");
} else {
m_widthFld->setMeasure("level.lx");
m_heightFld->setMeasure("level.ly");
}
if (pref->isNewLevelSizeToCameraSizeEnabled()) {
TCamera *currCamera =
TApp::instance()->getCurrentScene()->getScene()->getCurrentCamera();