Ticket #12489: mythui.diff

mythtv/libs/libmythui/mythuiimage.cpp

@@ -85 +85 @@
     preserveAspect = other.preserveAspect;
     isGreyscale = other.isGreyscale;
     isReflected = other.isReflected;
-    isMasked = other.isMasked;
 
     reflectAxis = other.reflectAxis;
     reflectScale = other.reflectScale;
@@ -94 +93 @@
     reflectSpacing = other.reflectSpacing;
 
     SetMaskImage(other.maskImage);
+        isMasked = other.isMasked;
+        maskImageFilename = other.maskImageFilename;
+    maskImageFilename.detach();
 }
 
 void ImageProperties::SetMaskImage(MythImage *image)
@@ -306 +308 @@
 
             if (imProps.isMasked)
             {
+                                MythImage *newMaskImage = painter->GetFormatImage();
+                                if (newMaskImage->Load(imProps.GetMaskImageFilename()))
+                                        imProps.SetMaskImage(newMaskImage);
+                                else
+                                        imProps.SetMaskImage(NULL);
+                                newMaskImage->DecrRef();
+                
+                if (imProps.isMasked)
+                                {
                 QRect imageArea = image->rect();
                 QRect maskArea = imProps.GetMaskImageRect();
 
@@ -325 +336 @@
                 QImage mask = imProps.GetMaskImageSubset(imageArea);
                 image->setAlphaChannel(mask.alphaChannel());
             }
+            }
 
             if (imProps.isReflected)
                 image->Reflect(imProps.reflectAxis, imProps.reflectShear,
@@ -1363 +1375 @@
     }
     else if (element.tagName() == "mask")
     {
-        QString maskfile = getFirstText(element);
-
-        MythImage *newMaskImage = GetPainter()->GetFormatImage();
-        if (newMaskImage->Load(maskfile))
-            m_imageProperties.SetMaskImage(newMaskImage);
-        else
-            m_imageProperties.SetMaskImage(NULL);
-        newMaskImage->DecrRef();
+        m_imageProperties.SetMaskImageFilename(getFirstText(element));
+                m_imageProperties.isMasked = true;
     }
     else if (element.tagName() == "grayscale" ||
              element.tagName() == "greyscale")

mythtv/libs/libmythui/mythuiimage.h

@@ -30 +30 @@
     ImageProperties &operator=(const ImageProperties &other);
 
     void SetMaskImage(MythImage *image);
+        void SetMaskImageFilename(const QString &filename)
+        {
+                maskImageFilename=filename;
+        }
+        QString GetMaskImageFilename()
+        {
+                return maskImageFilename;
+        }
     QRect GetMaskImageRect(void)
     {
         QRect rect;
@@ -68 +76 @@
     void Copy(const ImageProperties &other);
 
     MythImage *maskImage;
+        QString maskImageFilename;
 };
 
 typedef QPair<MythImage *, int> AnimationFrame;

mythtv/libs/libmythui/mythuitext.cpp

@@ -1176 +1176 @@
         }
     }
 
+//    if (m_scrolling && !GetMythUI()->GetScreenIsAsleep())
     if (m_scrolling)
     {
         int whole;