Ticket #762: progdetails-speed.patch

libs/libmyth/uitypes.h

@@ -666 +666 @@
     protected:
         void refreshImage();
         void updateBackground();
+        void loadBackgroundImg(bool &changed);
 
         QRect m_displayArea;
         QRect m_textArea;
@@ -684 +685 @@
                                   // widget background image 
         QPixmap *m_image;         // the completed image including the rich text
 
+        QString m_backgroundFile; //< current source of background image
+        QImage  m_backgroundImage; //< background image (only m_bgImage*)
+
         bool     m_showScrollArrows;
         bool     m_showUpArrow;
         bool     m_showDnArrow;

libs/libmyth/uitypes.cpp

@@ -3 +3 @@
 #include <qapplication.h>
 #include <qsimplerichtext.h>
 #include <qbitmap.h>
+#include <sys/time.h>
 
 using namespace std;
 
@@ -2053 +2054 @@
     m_image = new QPixmap(m_displayArea.width(), m_displayArea.height(), 24);
     m_background = new QPixmap(m_displayArea.width(), m_displayArea.height(), 24);
     m_compBackground = new QPixmap(m_displayArea.width(), m_displayArea.height(), 24);
+    m_backgroundFile = "";
 
     m_bgImageReg = m_bgImageSel = "";
     m_showScrollArrows = true;
@@ -2087 +2089 @@
     m_bgImageReg = bgImageReg;
     m_bgImageSel = bgImageSel;
 
-    updateBackground();
+    bool needreload = false;
+    loadBackgroundImg(needreload);
+    if (needreload) updateBackground();
 }
 
 void UIRichTextType::SetBackground(QPixmap *background)
@@ -2098 +2102 @@
     updateBackground();
 }
 
-void UIRichTextType::updateBackground(void)
+void UIRichTextType::loadBackgroundImg(bool &changed)
 {
     QString file = "";
+    changed = false;
 
     file = isFocused() ? m_bgImageSel : m_bgImageReg;
 
     // paint our background image over the window background
     if (file != "")
     {
-        if (gContext->FindThemeFile(file))
+        if (gContext->FindThemeFile(file) && file != m_backgroundFile)
         {
-            QImage *sourceImg = new QImage();
-            if (sourceImg->load(file))
+            QImage sourceImg;
+            if (sourceImg.load(file))
             {
-                QImage scalerImg;
-                scalerImg = sourceImg->smoothScale(
+                m_backgroundImage = sourceImg.smoothScale(
                         (int)(m_displayArea.width()),
                         (int)(m_displayArea.height()));
-                QPainter p(m_compBackground);
-                p.drawPixmap(QPoint(0, 0), *m_background);
-                p.drawImage(QPoint(0, 0), scalerImg);
+                m_backgroundFile = file;
+                changed = true;
             }
-            delete sourceImg;
         }
     }
+}
+
+void UIRichTextType::updateBackground(void)
+{
+    // paint our background image over the window background
+    QPainter p(m_compBackground);
+    if (m_background) p.drawPixmap(QPoint(0, 0), *m_background);
+    if (!m_backgroundFile.isEmpty())
+        p.drawImage(QPoint(0, 0), m_backgroundImage);
     refreshImage();
 }
 
@@ -2248 +2259 @@
 bool UIRichTextType::takeFocus()
 {
     bool res = UIType::takeFocus();
-    updateBackground();
+    bool needreload = false;
+    loadBackgroundImg(needreload);
+    if (needreload) updateBackground();
 
     return res;
 }
@@ -2256 +2269 @@
 void UIRichTextType::looseFocus()
 {
     UIType::looseFocus();
-
-    updateBackground();
+    bool needreload = false;
+    loadBackgroundImg(needreload);
+    if (needreload) updateBackground();
 }
 
 // ******************************************************************

libs/libmythtv/progdetails.cpp

@@ -34 +34 @@
     if (m_richText)
     {
         m_richText->SetText(m_details);
-        m_richText->SetBackground(&my_background);
     }
 }