MythUI: Make buttonitem 'relative' offsets/sizes, relative to the buttonarea,

instead of the "full" area.

This has no impact if absolute offset/sizes are used.  Any existing theme
that uses 'relative' offset/sizes for a button item, will need tweaked.

Author: jpoet

mythtv/libs/libmythui/mythuibuttonlist.cpp

@@ -1565,6 +1565,13 @@ QVariant MythUIButtonList::GetDataValue() const
     return QVariant();
 }
 
+MythRect MythUIButtonList::GetButtonArea(void) const
+{
+    if (m_contentsRect.isValid())
+        return m_contentsRect;
+    return m_Area;
+}
+
 MythUIButtonListItem *MythUIButtonList::GetItemFirst() const
 {
     if (!m_itemList.empty())
@@ -2500,14 +2507,29 @@ void MythUIButtonList::CalculateVisibleItems(void)
     m_itemsVisible = m_columns * m_rows;
 }
 
+void MythUIButtonList::SetButtonArea(const MythRect &rect)
+{
+    if (rect == m_contentsRect)
+        return;
+
+    m_contentsRect = rect;
+
+    if (m_Area.isValid())
+        m_contentsRect.CalculateArea(m_Area);
+    else if (m_Parent)
+        m_contentsRect.CalculateArea(m_Parent->GetFullArea());
+    else
+        m_contentsRect.CalculateArea(GetMythMainWindow()->GetUIScreenRect());
+}
+
 /**
  *  \copydoc MythUIType::ParseElement()
  */
 bool MythUIButtonList::ParseElement(
     const QString &filename, QDomElement &element, bool showWarnings)
 {
     if (element.tagName() == "buttonarea")
-        m_contentsRect = parseRect(element);
+        SetButtonArea(parseRect(element));
     else if (element.tagName() == "layout")
     {
         QString layout = getFirstText(element).toLower();

mythtv/libs/libmythui/mythuibuttonlist.h

@@ -142,6 +142,7 @@ class MUI_PUBLIC MythUIButtonList : public MythUIType
     virtual int  GetIntValue() const;
     virtual QString  GetValue() const;
     QVariant GetDataValue() const;
+    MythRect GetButtonArea(void) const;
 
     void SetItemCurrent(MythUIButtonListItem* item);
     void SetItemCurrent(int pos, int topPos = -1);
@@ -239,6 +240,7 @@ class MUI_PUBLIC MythUIButtonList : public MythUIType
     virtual void CalculateVisibleItems(void);
     virtual QPoint GetButtonPosition(int column, int row) const;
 
+    void SetButtonArea(const MythRect &rect);
     virtual bool ParseElement(
         const QString &filename, QDomElement &element, bool showWarnings);
     virtual void CopyFrom(MythUIType *base);

mythtv/libs/libmythui/mythuistatetype.cpp

@@ -1,6 +1,6 @@
-
 // Own header
 #include "mythuistatetype.h"
+#include "mythuibuttonlist.h"
 
 // Qt headers
 #include <QDomDocument>
@@ -48,11 +48,7 @@ bool MythUIStateType::AddObject(const QString &name, MythUIType *object)
     m_ObjectsByName[key] = object;
 
     MythRect objectArea = object->GetArea();
-
-    if (m_Parent)
-        objectArea.CalculateArea(m_Parent->GetFullArea());
-    else
-        objectArea.CalculateArea(GetMythMainWindow()->GetUIScreenRect());
+    objectArea.CalculateArea(m_ParentArea);
 
     ExpandArea(objectArea);
 
@@ -81,11 +77,7 @@ bool MythUIStateType::AddObject(StateType type, MythUIType *object)
     m_ObjectsByState[(int)type] = object;
 
     MythRect objectArea = object->GetArea();
-
-    if (m_Parent)
-        objectArea.CalculateArea(m_Parent->GetFullArea());
-    else
-        objectArea.CalculateArea(GetMythMainWindow()->GetUIScreenRect());
+    objectArea.CalculateArea(m_ParentArea);
 
     ExpandArea(objectArea);
 
@@ -342,3 +334,31 @@ void MythUIStateType::LoadNow(void)
         MythUIType::LoadNow();
 }
 
+void MythUIStateType::RecalculateArea(bool recurse)
+{
+    if (m_Parent)
+    {
+        if (objectName().startsWith("buttonlist button"))
+        {
+            MythUIButtonList *list = dynamic_cast<MythUIButtonList *>(m_Parent);
+            m_ParentArea = list->GetButtonArea();
+        }
+        else
+            m_ParentArea = m_Parent->GetFullArea();
+    }
+    else
+        m_ParentArea = GetMythMainWindow()->GetUIScreenRect();
+
+    m_Area.CalculateArea(m_ParentArea);
+
+    if (recurse)
+    {
+        QList<MythUIType *>::iterator it;
+
+        for (it = m_ChildrenList.begin(); it != m_ChildrenList.end(); ++it)
+        {
+            (*it)->RecalculateArea(recurse);
+        }
+    }
+}
+

mythtv/libs/libmythui/mythuistatetype.h

@@ -48,6 +48,7 @@ class MUI_PUBLIC MythUIStateType : public MythUIType
     void EnsureStateLoaded(StateType type);
 
     virtual void LoadNow(void);
+    virtual void RecalculateArea(bool recurse = true);
 
   protected:
     virtual bool ParseElement(
@@ -60,6 +61,7 @@ class MUI_PUBLIC MythUIStateType : public MythUIType
     QMap<int, MythUIType *> m_ObjectsByState;
 
     MythUIType *m_CurrentState;
+    MythRect    m_ParentArea;
 
     bool m_ShowEmpty;
 

mythtv/themes/MythCenter-wide/base.xml

@@ -494,7 +494,7 @@
         <statetype name="buttonitem">
             <area>0,0,100%,100%</area>
             <state name="active">
-                <area>0,0,-20,100%</area>
+                <area>0,0,100%,100%</area>
                 <shape name="background" from="basewidgetshape" />
                 <textarea name="buttontext">
                     <area>10,4,-40,-4</area>