blinken does not like the wordwrapping text so make it configurable with a flags...

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=743916

diff --git a/kdeeduui/kedufontutils.cpp b/kdeeduui/kedufontutils.cpp
index 9d0e9e9ab09d5364b6d9af4c211dd9b90a04ab81..b75be7d06b5a1947c03b48b6109885bdf93a0c53 100644 (file)
--- a/kdeeduui/kedufontutils.cpp
+++ b/kdeeduui/kedufontutils.cpp
@@ -11,7 +11,7 @@
 
 #include <qpainter.h>
 
-int fontUtils::fontSize(QPainter &p, const QString &s1, int w, int h)
+int fontUtils::fontSize(QPainter &p, const QString &s1, int w, int h, Flags flags)
 {
     int size;
     QRect aux1;
@@ -24,7 +24,9 @@ int fontUtils::fontSize(QPainter &p, const QString &s1, int w, int h)
         QFont f = p.font();
         f.setPointSize(size);
         p.setFont(f);
-        aux1 = p.boundingRect(QRect(0, 0, w, h), Qt::TextWordWrap | Qt::AlignCenter, s1);
+        int qtFlags = Qt::AlignCenter | Qt::TextWordWrap;
+        if (flags & DoNotAllowWordWrap) qtFlags = qtFlags & ~Qt::TextWordWrap;
+        aux1 = p.boundingRect(QRect(0, 0, w, h), qtFlags, s1);
         if (aux1.width() == 0 || aux1.height() == 0) return -1;
         else if (aux1.width() > w || aux1.height() > h) size = qMin(w * size / aux1.width(), h * size / aux1.height());
         else done = true;

diff --git a/kdeeduui/kedufontutils.h b/kdeeduui/kedufontutils.h
index a0f8bed845a524876fcc20742daa87a1831cc2d8..de8861f252ea1d6b3bdaf596e1c627f38ab2b052 100644 (file)
--- a/kdeeduui/kedufontutils.h
+++ b/kdeeduui/kedufontutils.h
@@ -17,7 +17,13 @@ class QString;
 
 namespace fontUtils
 {
-       int KDEEDUUI_EXPORT fontSize(QPainter &p, const QString &s1, int w, int h);
+       enum Flags
+       {
+               NoFlags = 1,
+               DoNotAllowWordWrap = 2
+       };
+
+       int KDEEDUUI_EXPORT fontSize(QPainter &p, const QString &s1, int w, int h, Flags flags = NoFlags);
 }
 
 #endif