Ticket #6055: autosize.diff

libs/libmythui/mythuitext.cpp

@@ -24 +24 @@
             incR(0.0),              incG(0.0),             incB(0.0)
 {
     m_MultiLine = false;
+    m_AutoSize  = false;
     m_scrolling = false;
     m_scrollDirection = ScrollLeft;
 
@@ -47 +48 @@
              incR(0.0),      incG(0.0),      incB(0.0)
 {
     m_MultiLine = false;
+    m_AutoSize  = false;
+    
     SetArea(displayRect);
     m_FontStates.insert("default", font);
     *m_Font = m_FontStates["default"];
@@ -101 +104 @@
 
     m_Message = newtext;
     m_CutMessage = "";
+
+    if (m_AutoSize)
+    {
+        QFontMetrics fm(GetFontProperties()->face());
+        QSize stringSize = fm.size(Qt::TextSingleLine, m_Message);
+        SetDrawRectSize(stringSize.width(), m_Area.height());
+    }
+    
     SetRedraw();
 }
 
@@ -173 +184 @@
     SetRedraw();
 }
 
+void MythUIText::SetAutoSize(bool autosize)
+{
+    m_AutoSize = autosize;
+    SetRedraw();
+}
+
 void MythUIText::SetArea(const MythRect &rect)
 {
     MythUIType::SetArea(rect);
@@ -396 +413 @@
 }
 
 bool MythUIText::ParseElement(QDomElement &element)
-{
+{   
     if (element.tagName() == "area")
     {
         SetArea(parseRect(element));
@@ -452 +469 @@
     {
         SetMultiLine(parseBool(element));
     }
+    else if (element.tagName() == "autosize")
+    {
+        SetAutoSize(parseBool(element));
+    }   
     else if (element.tagName() == "align")
     {
         QString align = getFirstText(element).toLower();
@@ -533 +554 @@
 
     m_Cutdown = text->m_Cutdown;
     m_MultiLine = text->m_MultiLine;
+    m_AutoSize = text->m_AutoSize;
 
     QMutableMapIterator<QString, MythFontProperties> it(text->m_FontStates);
     while (it.hasNext())

libs/libmythui/mythuitext.h

@@ -66 +66 @@
     bool GetCutDown(void) const { return m_Cutdown; }
     void SetMultiLine(bool multiline);
     bool GetMultiLine(void) const { return m_MultiLine; }
-
+    void SetAutoSize(bool autosize);
+    bool GetAutoSize(void) const { return m_AutoSize; }
+        
     void SetArea(const MythRect &rect);
     void SetPosition(const MythPoint &pos);
     MythRect GetDrawRect(void) { return m_drawRect; }
@@ -90 +92 @@
 
     bool m_Cutdown;
     bool m_MultiLine;
+    bool m_AutoSize;
 
     MythFontProperties* m_Font;
     QMap<QString, MythFontProperties> m_FontStates;