Theme Editor: SBS will now render underneath WPS, if both are present in project

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27265 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 46 insertions, 7 deletions

diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp
index 054e8fee37..c212a6c1fc 100644
--- a/utils/themeeditor/graphics/rbscreen.cpp
+++ b/utils/themeeditor/graphics/rbscreen.cpp
@@ -29,18 +29,18 @@
 RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
                    QGraphicsItem *parent)
                        :QGraphicsItem(parent), backdrop(0), project(project),
-                       albumArt(0)
+                       albumArt(0), customUI(0)
 {
 
     if(remote)
     {
-        width = info.device()->data("remotewidth").toInt();
-        height = info.device()->data("remoteheight").toInt();
+        fullWidth = info.device()->data("remotewidth").toInt();
+        fullHeight = info.device()->data("remoteheight").toInt();
     }
     else
     {
-        width = info.device()->data("screenwidth").toInt();
-        height = info.device()->data("screenheight").toInt();
+        fullWidth = info.device()->data("screenwidth").toInt();
+        fullHeight = info.device()->data("screenheight").toInt();
     }
 
     QString bg = info.settings()->value("background color", "FFFFFF");
@@ -63,8 +63,8 @@ RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
         /* If a backdrop has been found, use its width and height */
         if(!backdrop->isNull())
         {
-            width = backdrop->width();
-            height = backdrop->height();
+            fullWidth = backdrop->width();
+            fullHeight = backdrop->height();
         }
         else
         {
@@ -74,6 +74,17 @@ RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
     }
 
     fonts.insert(0, new RBFont("Nothin'"));
+
+    if(parent == 0)
+    {
+        width = fullWidth;
+        height = fullHeight;
+    }
+    else
+    {
+        width = parent->boundingRect().width();
+        height = parent->boundingRect().height();
+    }
 }
 
 RBScreen::~RBScreen()
@@ -108,6 +119,9 @@ QRectF RBScreen::boundingRect() const
 void RBScreen::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                      QWidget *widget)
 {
+    if(parentItem() != 0)
+        return;
+
     if(backdrop)
     {
         painter->drawPixmap(0, 0, width, height, *backdrop);
@@ -191,9 +205,18 @@ void RBScreen::makeCustomUI(QString id)
             namedViewports.value(id)->at(i)->makeCustomUI();
         for(int i = 0; i < namedViewports.value(id)->count(); i++)
             namedViewports.value(id)->at(i)->show();
+
+        customUI = namedViewports.value(id)->at(0);
     }
 }
 
+void RBScreen::breakSBS()
+{
+    width = fullWidth;
+    height = fullHeight;
+    setParentItem(0);
+}
+
 QColor RBScreen::stringToColor(QString str, QColor fallback)
 {
 
diff --git a/utils/themeeditor/graphics/rbscreen.h b/utils/themeeditor/graphics/rbscreen.h
index b472e8eae4..5bb8ab1602 100644
--- a/utils/themeeditor/graphics/rbscreen.h
+++ b/utils/themeeditor/graphics/rbscreen.h
@@ -67,6 +67,8 @@ public:
     void setBackdrop(QString filename);
     bool hasBackdrop(){ return backdrop != 0; }
     void makeCustomUI(QString id);
+    void setCustomUI(RBViewport* viewport){ customUI = viewport; }
+    RBViewport* getCustomUI(){ return customUI; }
 
     static QColor stringToColor(QString str, QColor fallback);
 
@@ -84,10 +86,13 @@ public:
         }
     }
 
+    void breakSBS();
 
 private:
     int width;
     int height;
+    int fullWidth;
+    int fullHeight;
     QColor bgColor;
     QColor fgColor;
     QPixmap* backdrop;
@@ -102,6 +107,7 @@ private:
     QList<QString> displayedViewports;
 
     RBAlbumArt* albumArt;
+    RBViewport* customUI;
 };
 
 #endif // RBSCREEN_H
diff --git a/utils/themeeditor/graphics/rbviewport.cpp b/utils/themeeditor/graphics/rbviewport.cpp
index b620e1b554..a92825362d 100644
--- a/utils/themeeditor/graphics/rbviewport.cpp
+++ b/utils/themeeditor/graphics/rbviewport.cpp
@@ -113,12 +113,22 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
         if(h < 0)
             h = info.screen()->getHeight() + h - y;
 
+        /* Adjusting to screen coordinates if necessary */
+        if(screen->parentItem() != 0)
+        {
+            x -= screen->parentItem()->pos().x();
+            y -= screen->parentItem()->pos().y();
+        }
+
+
         setPos(x, y);
         size = QRectF(0, 0, w, h);
     }
 
     debug = info.device()->data("showviewports").toBool();
     lineHeight = font->lineHeight();
+    if(customUI)
+        screen->setCustomUI(this);
 }
 
 RBViewport::~RBViewport()