diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index a1bcfe2..bfa8206 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -369,10 +369,12 @@ int main(int argc, char *argv[]) { // splash screen QPixmap splashPixmap(":Resources/splash.png"); #ifdef _WIN32 - a.setFont(QFont("Arial", 10)); + QFont font("Arial", -1); #else - a.setFont(QFont("Helvetica", 10)); + QFont font("Helvetica", -1); #endif + font.setPixelSize(13); + a.setFont(font); QString offsetStr("\n\n\n\n\n\n\n\n"); diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.h index a88b78e..5596ca4 100644 --- a/toonz/sources/toonz/xsheetviewer.h +++ b/toonz/sources/toonz/xsheetviewer.h @@ -13,13 +13,8 @@ #include "cellkeyframeselection.h" #include "toonzqt/spreadsheetviewer.h" -#ifdef _WIN32 #define XSHEET_FONT_PX_SIZE 12 #define H_ADJUST 2 -#else -#define XSHEET_FONT_PX_SIZE 14 -#define H_ADJUST 0 -#endif // forward declaration class TXsheet; diff --git a/toonz/sources/toonzqt/functionsheet.cpp b/toonz/sources/toonzqt/functionsheet.cpp index 5294fcb..9d86d2d 100644 --- a/toonz/sources/toonzqt/functionsheet.cpp +++ b/toonz/sources/toonzqt/functionsheet.cpp @@ -641,10 +641,11 @@ void FunctionSheetCellViewer::drawCells(QPainter &painter, int r0, int c0, } #ifdef _WIN32 - static QFont font("Arial", 9, QFont::Normal); + static QFont font("Arial", -1, QFont::Bold); #else - static QFont font("Helvetica", 9, QFont::Normal); + static QFont font("Helvetica", -1, QFont::Bold); #endif + font.setPixelSize(12); painter.setFont(font); painter.drawText(cellRect.adjusted(10, 0, 0, 0), Qt::AlignVCenter | Qt::AlignLeft, text); diff --git a/toonz/sources/toonzqt/spreadsheetviewer.cpp b/toonz/sources/toonzqt/spreadsheetviewer.cpp index 8c375e9..3858bf2 100644 --- a/toonz/sources/toonzqt/spreadsheetviewer.cpp +++ b/toonz/sources/toonzqt/spreadsheetviewer.cpp @@ -237,10 +237,11 @@ DragTool *RowPanel::createDragTool(QMouseEvent *) { void RowPanel::drawRows(QPainter &p, int r0, int r1) { #ifdef _WIN32 - static QFont font("Arial", 9, QFont::Bold); + static QFont font("Arial", -1, QFont::Bold); #else - static QFont font("Helvetica", 9, QFont::Bold); + static QFont font("Helvetica", -1, QFont::Bold); #endif + font.setPixelSize(12); p.setFont(font); QRect visibleRect = visibleRegion().boundingRect();