Ticket #9295: mythtv-0.24-stretching-cutdown-code.diff

libs/libmythui/mythuitext.h

@@ -74 +74 @@
     bool GetCutDown(void) const { return m_Cutdown; }
     void SetMultiLine(bool multiline);
     bool GetMultiLine(void) const { return m_MultiLine; }
+    void SetStretch(bool stretch);
+    bool GetStretch(void) const { return m_Stretch; }
 
     void SetArea(const MythRect &rect);
     void SetPosition(const MythPoint &pos);
@@ -85 +87 @@
 
     bool MakeNarrow(QRect &min_rect);
     void FillCutMessage(void);
-    QString cutDown(const QString &data, MythFontProperties *font,
+    bool IsTextFitting(const QString &text, MythFontProperties *font, 
                     bool multiline = false);
 
     int m_Justification;
@@ -100 +102 @@
 
     bool m_Cutdown;
     bool m_MultiLine;
+    bool m_Stretch;
+    int m_minStretch;
+    int m_maxStretch;
 
     MythFontProperties* m_Font;
     QMap<QString, MythFontProperties> m_FontStates;

libs/libmythui/mythuitext.cpp

@@ -35 +35 @@
     m_scrolling = false;
     m_scrollDirection = ScrollLeft;
     m_textCase = CaseNormal;
+    m_Stretch = false;
+    m_minStretch = 100;
+    m_maxStretch = 100;
 
     m_FontStates.insert("default", MythFontProperties());
     *m_Font = m_FontStates["default"];
@@ -59 +62 @@
     m_scrolling = false;
     m_scrollDirection = ScrollLeft;
     m_textCase = CaseNormal;
+    m_Stretch = false;
+    m_minStretch = 100;
+    m_maxStretch = 100;
 
     SetArea(displayRect);
     m_FontStates.insert("default", font);
@@ -222 +228 @@
     SetRedraw();
 }
 
+void MythUIText::SetStretch(bool stretch)
+{
+    m_Stretch = stretch;
+    FillCutMessage();
+    SetRedraw();
+}
+
 void MythUIText::SetArea(const MythRect &rect)
 {
     MythUIType::SetArea(rect);
@@ -380 +393 @@
     }
 }
 
+bool MythUIText::IsTextFitting(const QString &text, MythFontProperties *font, bool multiline) {
+    if (multiline) {
+        int maxwidth = GetArea().width();
+        int maxheight = GetArea().height();
+        int justification = Qt::AlignLeft | Qt::TextWordWrap;
+        QFontMetrics fm(font->face());
+
+        int height = fm.boundingRect(0, 0, maxwidth, maxheight,
+                                           justification, text
+                                           ).height();
+        return height <= maxheight;
+    } else {
+        int maxwidth = GetArea().width();
+        QFontMetrics fm = QFontMetrics(m_Font->face());
+        int width=fm.width(text, text.length());
+        return width <= maxwidth;
+    }
+}
+
 void MythUIText::FillCutMessage()
 {
     m_CutMessage.clear();
@@ -445 +477 @@
             SetDrawRectSize(m_MinArea.width(), m_MinArea.height());
     }
 
-    if (m_Cutdown)
-        m_CutMessage = cutDown(m_CutMessage, m_Font, m_MultiLine);
+    // If we played with stretch, we need to reset to 100% before continuing
+    // This is because sometime, the font may not resetted correctly when
+    // switching text with SetText or other calls.
+    int stretch = 100;
+    if (m_Stretch)
+        m_Font->AdjustStretch(100);
+    bool fit = IsTextFitting(m_CutMessage, m_Font, m_MultiLine);
+
+    if (m_Stretch) {
+        // Can we extend the text ?
+        while (fit && stretch < m_maxStretch) {
+            m_Font->AdjustStretch(++stretch);
+            fit = IsTextFitting(m_CutMessage, m_Font, m_MultiLine);
+        }
+        // Can we shrink the text ?
+        // This will correct the 'overextend' above as extend will always
+        // extend a little to much (loop until it doesn't fit).
+        while (!fit && stretch > m_minStretch) {
+            m_Font->AdjustStretch(--stretch);
+            fit = IsTextFitting(m_CutMessage, m_Font, m_MultiLine);
+        }
+    }
+
+    // Do we need to cut the text ?
+    if (!fit && m_Cutdown) {
+        QString dotdotdot = QString("...");
+        for (int index=m_CutMessage.length() - 1; index>0 && !fit; index--) {
+            m_CutMessage.truncate(index);
+            m_CutMessage.append(dotdotdot);
+            fit = IsTextFitting(m_CutMessage, m_Font, m_MultiLine);
+        }
+    }
 }
 
 void MythUIText::Pulse(void)
@@ -540 +602 @@
     SetRedraw();
 }
 
-QString MythUIText::cutDown(const QString &data, MythFontProperties *font,
-                            bool multiline)
-{
-    int length = data.length();
-    if (length == 0)
-        return data;
-
-    int maxwidth = GetArea().width();
-    int maxheight = GetArea().height();
-    int justification = Qt::AlignLeft | Qt::TextWordWrap;
-    QFontMetrics fm(font->face());
-
-    int margin = length - 1;
-    int index = 0;
-    int diff = 0;
-
-    while (margin > 0)
-    {
-        if (multiline)
-            diff = maxheight - fm.boundingRect(0, 0, maxwidth, maxheight,
-                                               justification,
-                                               data.left(index + margin + 1)
-                                               ).height();
-        else
-            diff = maxwidth - fm.width(data, index + margin + 1);
-        if (diff >= 0)
-            index += margin;
-
-        margin /= 2;
-
-        if (index + margin >= length - 1)
-            margin = (length - 1) - index;
-    }
-
-    if (index < length - 1)
-    {
-        QString tmpStr(data);
-        tmpStr.truncate(index);
-        if (index >= 3)
-            tmpStr.replace(index - 3, 3, "...");
-        return tmpStr;
-    }
-
-    return data;
-
-}
-
 bool MythUIText::ParseElement(
     const QString &filename, QDomElement &element, bool showWarnings)
 {
@@ -721 +736 @@
             m_textCase = CaseNormal;
         FillCutMessage();
     }
+    else if (element.tagName() == "stretch")
+    {
+        QString stretch = getFirstText(element);
+        if (!stretch.isEmpty())
+            m_Stretch = parseBool(stretch);
+        QString tmp = element.attribute("min");
+        if (!tmp.isEmpty())
+            m_minStretch = tmp.toInt();
+        tmp = element.attribute("max");
+        if (!tmp.isEmpty())
+            m_maxStretch = tmp.toInt();
+    }
     else
     {
         return MythUIType::ParseElement(filename, element, showWarnings);
@@ -750 +777 @@
 
     m_Cutdown = text->m_Cutdown;
     m_MultiLine = text->m_MultiLine;
+    m_Stretch = text->m_Stretch;
+    m_minStretch = text->m_minStretch;
+    m_maxStretch = text->m_maxStretch;
 
     QMutableMapIterator<QString, MythFontProperties> it(text->m_FontStates);
     while (it.hasNext())