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

fix tapetool crash (#2352)

Browse source
This commit is contained in:
shun-iwasawa 2018-11-05 14:37:12 +09:00 committed by Jeremy Bullock
parent 6985407a96
commit 102e065515
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/toonzqt/styleindexlineedit.h
View file

@ -25,6 +25,8 @@ class TPaletteHandle;
namespace DVGui {
class DVAPI StyleIndexLineEdit : public LineEdit {
Q_OBJECT
TPaletteHandle *m_pltHandle;
public:

15
toonz/sources/tnztools/tooloptionscontrols.cpp
View file

@ -868,15 +868,16 @@ void StyleIndexFieldAndChip::onValueChanged(const QString &changedText) {
// Aware of both "current" and translated string
if (!QString("current").contains(changedText) &&
!StyleIndexLineEdit::tr("current").contains(changedText)) {
int index = changedText.toInt();
TPalette *plt = m_pltHandle->getPalette();
int indexCount = plt->getStyleCount();
if (index > indexCount)
style = QString::number(indexCount - 1);
int index = changedText.toInt();
TPalette *plt = m_pltHandle->getPalette();
if (plt && index > plt->getStyleCount())
style = QString::number(plt->getStyleCount() - 1);
else
style = text();
}
m_property->setValue(style.toStdWString());
m_property->setValue(style.toStdWString());
} else
m_property->setValue(changedText.toStdWString());
repaint();
// synchronize the state with the same widgets in other tool option bars
if (m_toolHandle) m_toolHandle->notifyToolChanged();

2
toonz/sources/toonzqt/styleindexlineedit.cpp
View file

@ -30,6 +30,8 @@ StyleIndexLineEdit::~StyleIndexLineEdit() {}
void StyleIndexLineEdit::paintEvent(QPaintEvent *pe) {
QLineEdit::paintEvent(pe);
if (!m_pltHandle->getPalette()) return;
TColorStyle *style;
// Aware of both "current" and translated string
if (QString("current").contains(text()) || tr("current").contains(text()))