summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-01 02:49:44 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-01 02:49:44 +0000
commitf09370058ff170bcf99481dd8115871ba20ee816 (patch)
tree481e8c8143ac736eb2acea2c0160b40b196db829
parentc215d97b4dfdd08a59af20dacb5178087ee230c5 (diff)
downloadrockbox-f09370058ff170bcf99481dd8115871ba20ee816.tar.gz
rockbox-f09370058ff170bcf99481dd8115871ba20ee816.zip
Theme Editor: Fixed album art positioning bug, removed unneeded debug code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27207 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--utils/themeeditor/graphics/rbalbumart.h2
-rw-r--r--utils/themeeditor/graphics/rbscreen.h1
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp4
3 files changed, 3 insertions, 4 deletions
diff --git a/utils/themeeditor/graphics/rbalbumart.h b/utils/themeeditor/graphics/rbalbumart.h
index 381b715525..f32c5f9bb1 100644
--- a/utils/themeeditor/graphics/rbalbumart.h
+++ b/utils/themeeditor/graphics/rbalbumart.h
@@ -35,6 +35,8 @@ public:
35 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, 35 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
36 QWidget *widget); 36 QWidget *widget);
37 37
38 void position(){ this->setPos(size.x(), size.y()); }
39
38private: 40private:
39 QRectF size; 41 QRectF size;
40 int artWidth; 42 int artWidth;
diff --git a/utils/themeeditor/graphics/rbscreen.h b/utils/themeeditor/graphics/rbscreen.h
index 58788d463b..70df399b34 100644
--- a/utils/themeeditor/graphics/rbscreen.h
+++ b/utils/themeeditor/graphics/rbscreen.h
@@ -79,6 +79,7 @@ public:
79 if(albumArt) 79 if(albumArt)
80 { 80 {
81 albumArt->setParentItem(view); 81 albumArt->setParentItem(view);
82 albumArt->position();
82 albumArt->show(); 83 albumArt->show();
83 } 84 }
84 } 85 }
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 6d712c80e7..8edbbe9b6c 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -796,10 +796,6 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
796QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional, 796QVariant ParseTreeNode::evalTag(const RBRenderInfo& info, bool conditional,
797 int branches) 797 int branches)
798{ 798{
799 if(strcmp(element->tag->name, "mv") == 0)
800 {
801 int x = 5;
802 }
803 if(!conditional) 799 if(!conditional)
804 { 800 {
805 return info.device()->data(QString(element->tag->name)); 801 return info.device()->data(QString(element->tag->name));