Ticket #1840: interactive.diff

mythtv/libs/libmythtv/mhi.cpp

@@ -627 +627 @@
 }
 
 // Draw a rectangle.  This is complicated if we want to get transparency right.
-void MHIContext::DrawRect(int xPos, int yPos, int width, int height,
-                          MHRgba colour)
+void MHIContext::DrawRect(int xPos, int yPos, int width, int height, MHRgba colour)
 {
     if (colour.alpha() == 0 || height == 0 || width == 0)
         return; // Fully transparent
+    QRgb qColour = qRgba(colour.red(), colour.green(), colour.blue(), colour.alpha());
+    QRgb qTransparent = qRgba(0,0,0,0);
 
-    QRgb qColour = qRgba(colour.red(), colour.green(),
-                         colour.blue(), colour.alpha());
+    int scaledxPos = xPos * GetWidth() / MHIContext::StdDisplayWidth;
+    int scaledyPos = yPos * GetHeight() / MHIContext::StdDisplayHeight;
+    int xboundary = scaledxPos % 2;
+    int yboundary = scaledyPos % 2;
 
-    // This is a bit of a mess: we should be able to create a rectangle object.
-    // Scale the image to the current display size
     int scaledWidth = width * GetWidth() / MHIContext::StdDisplayWidth;
     int scaledHeight = height * GetHeight() / MHIContext::StdDisplayHeight;
+
+    if (xboundary)
+    {
+        scaledxPos --;
+        scaledWidth ++;
+    }
+    if (yboundary)
+    {
+        scaledyPos --;
+        scaledHeight ++;
+    }
+
     QImage qImage(scaledWidth, scaledHeight, 32);
     qImage.setAlphaBuffer(true);
-
-    // As far as I can tell this is the only way to draw with an
-    // intermediate transparency.
-    for (int i = 0; i < scaledHeight; i++)
+    if (xboundary)
     {
+        for (int i = 0; i < scaledHeight; i++)
+        {
+             qImage.setPixel(0, i, qTransparent);
+        }
+    }
+    if (yboundary)
+    {
         for (int j = 0; j < scaledWidth; j++)
         {
+             qImage.setPixel(j, 0, qTransparent);
+        }
+    }
+    // As far as I can tell this is the only way to draw with an intermediate transparency.
+    for (int i = yboundary; i < scaledHeight; i++)
+    {
+        for (int j = xboundary; j < scaledWidth; j++)
+        {
             qImage.setPixel(j, i, qColour);
         }
     }
-
     AddToDisplay(qImage,
-        xPos * GetWidth() / MHIContext::StdDisplayWidth,
-        yPos * GetHeight() / MHIContext::StdDisplayHeight);
+        scaledxPos,
+        scaledyPos);
 }
 
+
 // Draw an image at the specified position.
 // Generally the whole of the image is drawn but sometimes the
 // image may be clipped. x and y define the origin of the bitmap