Ticket #12484: mythuishape_qt5_v1.patch

mythtv/libs/libmythui/mythuishape.cpp

@@ -26 +26 @@
     m_linePen = QPen(Qt::NoPen);
     m_cornerRadius = 10;
     m_cropRect = MythRect(0, 0, 0, 0);
+    m_parsedLine = false;
 }
 
 void MythUIShape::SetCropRect(int x, int y, int width, int height)
@@ -130 +131 @@
         }
         else
             m_linePen.setStyle(Qt::NoPen);
+        m_parsedLine = true;
     }
     else if (element.tagName() == "cornerradius")
     {
@@ -161 +163 @@
     m_linePen = shape->m_linePen;
     m_cornerRadius = shape->m_cornerRadius;
     m_cropRect = shape->m_cropRect;
+    m_parsedLine = shape->m_parsedLine;
 
     MythUIType::CopyFrom(base);
 }
@@ -173 +176 @@
     MythUIShape *shape = new MythUIShape(parent, objectName());
     shape->CopyFrom(this);
 }
+
+/**
+ *  \copydoc MythUIType::Finalize()
+ */
+void MythUIShape::Finalize(void)
+{
+    if (!m_parsedLine)
+    {
+        // If no <line> element was specified in the xml, explicitly set
+        // the line pen, otherwise Qt5 steals one pixel all the way
+        // around for an invisible border.
+        m_linePen.setColor(m_fillBrush.color());
+        m_linePen.setWidth(0);
+        m_linePen.setStyle(Qt::SolidLine);
+    }
+    MythUIType::Finalize();
+}

mythtv/libs/libmythui/mythuishape.h

@@ -36 +36 @@
         const QString &filename, QDomElement &element, bool showWarnings);
     virtual void CopyFrom(MythUIType *base);
     virtual void CreateCopy(MythUIType *parent);
+    virtual void Finalize(void);
 
   private:
     QString        m_type;
@@ -43 +44 @@
     QPen           m_linePen;
     int            m_cornerRadius;
     MythRect       m_cropRect;
+    bool           m_parsedLine;
 
     friend class MythUIProgressBar;
     friend class MythUIEditBar;