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

additional mac fixes

Browse source 
By @shun-iwasawa
Fixes vertical inbetweener button and makes tasks work properly
This commit is contained in:
Artisteacher 2021-03-16 17:13:14 -04:00
parent 8e6eb1462d
commit 8caa8e5efb
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toonz/sources/tcleanupper/tcleanupper.cpp
View file

@ -491,8 +491,9 @@ int main(int argc, char *argv[]) {
// questo definisce la registry root e inizializza TEnv // questo definisce la registry root e inizializza TEnv
TEnv::setRootVarName(rootVarName); TEnv::setRootVarName(rootVarName);
TEnv::setSystemVarPrefix(systemVarPrefix); TEnv::setSystemVarPrefix(systemVarPrefix);
TEnv::setApplicationFileName(argv[0]);
QCoreApplication::setOrganizationName("OpenToonz"); QCoreApplication::setOrganizationName("Tahoma2D");
QCoreApplication::setOrganizationDomain(""); QCoreApplication::setOrganizationDomain("");
QCoreApplication::setApplicationName( QCoreApplication::setApplicationName(
QString::fromStdString(TEnv::getApplicationName())); QString::fromStdString(TEnv::getApplicationName()));

1
toonz/sources/tcomposer/tcomposer.cpp
View file

@ -663,6 +663,7 @@ int main(int argc, char *argv[]) {
// questo definisce la registry root e inizializza TEnv // questo definisce la registry root e inizializza TEnv
TEnv::setRootVarName(rootVarName); TEnv::setRootVarName(rootVarName);
TEnv::setSystemVarPrefix(systemVarPrefix); TEnv::setSystemVarPrefix(systemVarPrefix);
TEnv::setApplicationFileName(argv[0]);
QCoreApplication::setOrganizationName("Tahoma2D"); QCoreApplication::setOrganizationName("Tahoma2D");
QCoreApplication::setOrganizationDomain(""); QCoreApplication::setOrganizationDomain("");

3
toonz/sources/tconverter/tconverter.cpp
View file

@ -177,7 +177,7 @@ void convertFromVI(const TLevelReaderP &lr, const TPaletteP &plt,
} }
maxBbox = maxBbox.enlarge(2); maxBbox = maxBbox.enlarge(2);
if (width) // calcolo l'affine if (width) // calcolo l'affine
aff = TScale((double)width / maxBbox.getLx()); aff = TScale((double)width / maxBbox.getLx());
maxBbox = aff * maxBbox; maxBbox = aff * maxBbox;
for (i = 0; i < (int)images.size(); i++) { for (i = 0; i < (int)images.size(); i++) {
@ -365,6 +365,7 @@ int main(int argc, char *argv[]) {
TEnv::setRootVarName(rootVarName); TEnv::setRootVarName(rootVarName);
TEnv::setSystemVarPrefix(systemVarPrefix); TEnv::setSystemVarPrefix(systemVarPrefix);
TEnv::setApplicationFileName(argv[0]);
TFilePath fp = TEnv::getStuffDir(); TFilePath fp = TEnv::getStuffDir();
string msg; string msg;

28
toonz/sources/toonz/filmstrip.cpp
View file

@ -779,21 +779,21 @@ void FilmstripFrames::drawFrameIcon(QPainter &p, const QRect &r, int index,
p.setPen(Qt::black); p.setPen(Qt::black);
p.drawLine(x0 - 1, y0, x0 - 1, y1); p.drawLine(x0 - 1, y0, x0 - 1, y1);
QPixmap inbetweenPixmap( QRectF txtRect(y0 + 1, -x1, y1 - y0 - 1, x1 - x0 + 1);
svgToPixmap(":Resources/filmstrip_inbetween.svg")); QFontMetricsF tmpFm(p.font());
QRectF bbox = tmpFm.boundingRect(
txtRect, Qt::AlignBottom | Qt::AlignHCenter, tr("INBETWEEN"));
double ratio = std::min(1.0, txtRect.width() / bbox.width());
if (r.height() - 6 < inbetweenPixmap.height()) { p.save();
QSize rectSize(inbetweenPixmap.size()); p.setRenderHint(QPainter::TextAntialiasing);
rectSize.setHeight(r.height() - 6); p.rotate(90.0);
inbetweenPixmap = inbetweenPixmap.scaled( p.scale(ratio, 1.0);
rectSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); p.drawText(QRectF(txtRect.left() / ratio, txtRect.top(),
} txtRect.width() / ratio, txtRect.height()),
tr("INBETWEEN"),
p.drawPixmap( QTextOption(Qt::AlignBottom | Qt::AlignHCenter));
x0 + 2, p.restore();
y1 - inbetweenPixmap.height() / inbetweenPixmap.devicePixelRatio() -
3,
inbetweenPixmap);
} else { } else {
int x1 = r.right(); int x1 = r.right();
int x0 = r.left(); int x0 = r.left();