X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ffontutils.cpp;h=505e8d91536792728f213ca3e960b47473b8099f;hb=434d88418722fd7717038e44bd74271ca1d92771;hp=dc56dd5f983aea0d64cf6bce0c854b06b6ee3c13;hpb=29f9a13b38a0547b70236d24300668385e1dbf6e;p=minitube
diff --git a/src/fontutils.cpp b/src/fontutils.cpp
index dc56dd5..505e8d9 100644
--- a/src/fontutils.cpp
+++ b/src/fontutils.cpp
@@ -19,6 +19,9 @@ along with Minitube. If not, see .
$END_LICENSE */
#include "fontutils.h"
+#ifdef APP_MAC
+#include "macutils.h"
+#endif
namespace {
@@ -30,14 +33,13 @@ QFont createFont(bool isBold, double sizeScale) {
}
QFont createFontWithMinSize(bool isBold, double sizeScale) {
- const int MIN_PIXEL_SIZE = 12;
+ const int minPixels = 11;
QFont font = createFont(isBold, sizeScale);
- if (font.pixelSize() < MIN_PIXEL_SIZE)
- font.setPixelSize(MIN_PIXEL_SIZE);
+ if (font.pixelSize() < minPixels) font.setPixelSize(minPixels);
return font;
}
-}
+} // namespace
const QFont &FontUtils::small() {
static const QFont font = createFontWithMinSize(false, .9);
@@ -50,12 +52,12 @@ const QFont &FontUtils::smallBold() {
}
const QFont &FontUtils::medium() {
- static const QFont font = createFont(false, 1.1);
+ static const QFont font = createFont(false, 1.15);
return font;
}
const QFont &FontUtils::mediumBold() {
- static const QFont font = createFont(true, 1.1);
+ static const QFont font = createFont(true, 1.15);
return font;
}
@@ -68,3 +70,18 @@ const QFont &FontUtils::bigBold() {
static const QFont font = createFont(true, 1.5);
return font;
}
+
+QFont FontUtils::light(int pointSize) {
+#ifdef APP_MAC
+ QVariant v = mac::lightFont(pointSize);
+ if (!v.isNull()) return qvariant_cast(v);
+#endif
+ QFont f;
+#ifdef APP_WIN
+ f.setFamily(QStringLiteral("Segoe UI Light"));
+#endif
+ f.setPointSize(pointSize);
+ f.setStyleName(QStringLiteral("Light"));
+ f.setWeight(QFont::Light);
+ return f;
+}