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

fix enabling unit preferences

Browse source
This commit is contained in:
shun-iwasawa 2023-03-31 12:13:40 +09:00 committed by manongjohn
parent 41b40fa4b3
commit cc3ca30a84
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toonz/sources/include/toonz/preferences.h
View file

@ -199,8 +199,8 @@ public:
// Interface tab
QStringList getStyleSheetList() const { return m_styleSheetList; }
bool getIconTheme() const { return getBoolValue(iconTheme); }
void storeOldUnits(); // OK
void resetOldUnits(); // OK
void storeOldUnits();
void resetOldUnits();
QStringList getLanguageList() const { return m_languageList; }
QMap<int, QString> getRoomMap() const { return m_roomMaps; }

6
toonz/sources/toonz/preferencespopup.cpp
View file

@ -617,6 +617,10 @@ void PreferencesPopup::onPixelsOnlyChanged() {
//-----------------------------------------------------------------------------
void PreferencesPopup::beforeUnitChanged() { m_pref->storeOldUnits(); }
//-----------------------------------------------------------------------------
void PreferencesPopup::onUnitChanged() {
CheckBox* pixelsOnlyCB = getUI<CheckBox*>(pixelsOnly);
if (!pixelsOnlyCB->isChecked() &&
@ -1791,7 +1795,9 @@ QWidget* PreferencesPopup::createInterfacePage() {
m_onEditedFuncMap.insert(CurrentStyleSheetName,
&PreferencesPopup::onStyleSheetTypeChanged);
m_onEditedFuncMap.insert(pixelsOnly, &PreferencesPopup::onPixelsOnlyChanged);
m_preEditedFuncMap.insert(linearUnits, &PreferencesPopup::beforeUnitChanged);
m_onEditedFuncMap.insert(linearUnits, &PreferencesPopup::onUnitChanged);
m_preEditedFuncMap.insert(cameraUnits, &PreferencesPopup::beforeUnitChanged);
m_onEditedFuncMap.insert(cameraUnits, &PreferencesPopup::onUnitChanged);
m_preEditedFuncMap.insert(CurrentRoomChoice,
&PreferencesPopup::beforeRoomChoiceChanged);

1
toonz/sources/toonz/preferencespopup.h
View file

@ -145,6 +145,7 @@ private:
void onStyleSheetTypeChanged();
// void onIconThemeChanged();
void onPixelsOnlyChanged();
void beforeUnitChanged();
void onUnitChanged();
void beforeRoomChoiceChanged();
void onColorCalibrationChanged();

6
toonz/sources/toonzlib/preferences.cpp
View file

@ -989,8 +989,10 @@ void Preferences::setRasterBackgroundColor() {
//-----------------------------------------------------------------
void Preferences::storeOldUnits() {
setValue(oldUnits, getStringValue(linearUnits));
setValue(oldCameraUnits, getStringValue(cameraUnits));
QString linearU = getStringValue(linearUnits);
if (linearU != "pixel") setValue(oldUnits, linearU);
QString cameraU = getStringValue(cameraUnits);
if (cameraU != "pixel") setValue(oldCameraUnits, cameraU);
}
//-----------------------------------------------------------------