summaryrefslogtreecommitdiffstats
path: root/utils/themeeditor
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2011-03-20 04:20:13 +0000
committerRobert Bieber <robby@bieberphoto.com>2011-03-20 04:20:13 +0000
commit5c47872b9c91d28268ccd27c2890a5642550ad4d (patch)
tree20c7fcfbadd601de288c5485c6b7e9417a2df4e9 /utils/themeeditor
parentfa565048f6b6d1928a216246619ad52b607ac7c2 (diff)
downloadrockbox-5c47872b9c91d28268ccd27c2890a5642550ad4d.tar.gz
rockbox-5c47872b9c91d28268ccd27c2890a5642550ad4d.tar.bz2
rockbox-5c47872b9c91d28268ccd27c2890a5642550ad4d.zip
Theme Editor: Made touch area position relative to enclosing viewports
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29618 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor')
-rw-r--r--utils/themeeditor/graphics/rbtoucharea.cpp4
-rw-r--r--utils/themeeditor/graphics/rbtoucharea.h2
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp3
3 files changed, 5 insertions, 4 deletions
diff --git a/utils/themeeditor/graphics/rbtoucharea.cpp b/utils/themeeditor/graphics/rbtoucharea.cpp
index e41129a213..eee858e28f 100644
--- a/utils/themeeditor/graphics/rbtoucharea.cpp
+++ b/utils/themeeditor/graphics/rbtoucharea.cpp
@@ -28,8 +28,8 @@
#include <QGraphicsSceneMouseEvent>
RBTouchArea::RBTouchArea(int width, int height, QString action,
- const RBRenderInfo& info)
- : QGraphicsItem(info.screen()),
+ const RBRenderInfo& info, QGraphicsItem* parent)
+ : QGraphicsItem(parent),
size(QRectF(0, 0, width, height)), action(action),
device(info.device())
{
diff --git a/utils/themeeditor/graphics/rbtoucharea.h b/utils/themeeditor/graphics/rbtoucharea.h
index ccc3edb272..91d9ef24ac 100644
--- a/utils/themeeditor/graphics/rbtoucharea.h
+++ b/utils/themeeditor/graphics/rbtoucharea.h
@@ -31,7 +31,7 @@ class RBTouchArea : public QGraphicsItem
{
public:
RBTouchArea(int width, int height, QString action,
- const RBRenderInfo& info);
+ const RBRenderInfo& info, QGraphicsItem* parent = 0);
virtual ~RBTouchArea();
QRectF boundingRect() const;
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 03f1b21444..1c7de7cc25 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -930,7 +930,8 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
int width = element->params[2].data.number;
int height = element->params[3].data.number;
QString action(element->params[4].data.text);
- RBTouchArea* temp = new RBTouchArea(width, height, action, info);
+ RBTouchArea* temp = new RBTouchArea(width, height, action, info,
+ viewport);
temp->setPos(x, y);
return true;
}