libmythui: Fix rendering of MythUIEditBar

Some cropping adjustments were lost when the painter classes where re-factored and MythUIShape rendering was moved into the painters. Closes #9674. Signed-off-by: Mark Kendall <mkendall@mythtv.org>
MythTV · Mar 28, 2011 · 95a9b5d · 95a9b5d
1 parent a640aaa
commit 95a9b5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/mythtv/libs/libmythui/mythuieditbar.cpp b/mythtv/libs/libmythui/mythuieditbar.cpp
@@ -188,9 +188,9 @@ void MythUIEditBar::AddBar(MythUIShape *shape, MythUIImage *image,
         MythUIShape *shape = dynamic_cast<MythUIShape*>(add);
         MythUIImage *image = dynamic_cast<MythUIImage*>(add);
         if (shape)
-            shape->SetCropRect(area.left(), 0, area.width(), area.height());
+            shape->SetCropRect(area.left(), area.top(), area.width(), area.height());
         if (image)
-            image->SetCropRect(area.left(), 0, area.width(), area.height());
+            image->SetCropRect(area.left(), area.top(), area.width(), area.height());
         add->SetPosition(area.left(), area.top());
     }
 }

diff --git a/mythtv/libs/libmythui/mythuishape.cpp b/mythtv/libs/libmythui/mythuishape.cpp
@@ -56,6 +56,9 @@ void MythUIShape::DrawSelf(MythPainter *p, int xoffset, int yoffset,
                           int alphaMod, QRect clipRect)
 {
     QRect area = GetArea();
+    m_cropRect.CalculateArea(area);
+    if (!m_cropRect.isEmpty())
+        area &= m_cropRect.toQRect();
     area.translate(xoffset, yoffset);
 
     if (m_type == "box")