diff --git a/toonz/sources/toonz/Resources/filmstrip_inbetween.svg b/toonz/sources/toonz/Resources/filmstrip_inbetween.svg deleted file mode 100644 index a83303d..0000000 --- a/toonz/sources/toonz/Resources/filmstrip_inbetween.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/toonz/sources/toonz/filmstrip.cpp b/toonz/sources/toonz/filmstrip.cpp index b7378a0..5fc9009 100644 --- a/toonz/sources/toonz/filmstrip.cpp +++ b/toonz/sources/toonz/filmstrip.cpp @@ -780,21 +780,21 @@ void FilmstripFrames::drawFrameIcon(QPainter &p, const QRect &r, int index, p.setPen(Qt::black); p.drawLine(x0 - 1, y0, x0 - 1, y1); - QPixmap inbetweenPixmap( - svgToPixmap(":Resources/filmstrip_inbetween.svg")); - - if (r.height() - 6 < inbetweenPixmap.height()) { - QSize rectSize(inbetweenPixmap.size()); - rectSize.setHeight(r.height() - 6); - inbetweenPixmap = inbetweenPixmap.scaled( - rectSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - } - - p.drawPixmap( - x0 + 2, - y1 - inbetweenPixmap.height() / inbetweenPixmap.devicePixelRatio() - - 3, - inbetweenPixmap); + QRectF txtRect(y0 + 1, -x1, y1 - y0 - 1, x1 - x0 + 1); + 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()); + + p.save(); + p.setRenderHint(QPainter::TextAntialiasing); + p.rotate(90.0); + p.scale(ratio, 1.0); + p.drawText(QRectF(txtRect.left() / ratio, txtRect.top(), + txtRect.width() / ratio, txtRect.height()), + tr("INBETWEEN"), + QTextOption(Qt::AlignBottom | Qt::AlignHCenter)); + p.restore(); } else { int x1 = r.right(); int x0 = r.left(); diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index af5a77b..2985300 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -636,7 +636,6 @@ Resources/plus.png Resources/forbidden.png Resources/init.js - Resources/filmstrip_inbetween.svg Resources/history_normal.png Resources/history_brush.png Resources/history_eraser.png