diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-21 20:11:58 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-21 20:11:58 +0000 |
commit | e1d8a3dc63391098f9381a3cb33d73e69b46c006 (patch) | |
tree | 0f503320d4fda330a003fe88ae7482537037db85 /utils/themeeditor/graphics/rbrenderinfo.cpp | |
parent | bd380b399323d15a1572cdc017e0f95b1b9db151 (diff) | |
download | rockbox-e1d8a3dc63391098f9381a3cb33d73e69b46c006.tar.gz rockbox-e1d8a3dc63391098f9381a3cb33d73e69b46c006.zip |
Theme Editor: Reworked information passing among render functions, now loads all viewports and shows Custom UI viewport in blue
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27026 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/graphics/rbrenderinfo.cpp')
-rw-r--r-- | utils/themeeditor/graphics/rbrenderinfo.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/themeeditor/graphics/rbrenderinfo.cpp b/utils/themeeditor/graphics/rbrenderinfo.cpp index 468533628f..ca9f2b632d 100644 --- a/utils/themeeditor/graphics/rbrenderinfo.cpp +++ b/utils/themeeditor/graphics/rbrenderinfo.cpp | |||
@@ -21,15 +21,17 @@ | |||
21 | 21 | ||
22 | #include "rbrenderinfo.h" | 22 | #include "rbrenderinfo.h" |
23 | 23 | ||
24 | RBRenderInfo::RBRenderInfo(ParseTreeModel* model, | 24 | RBRenderInfo::RBRenderInfo(ParseTreeModel* model, ProjectModel* project, |
25 | ProjectModel* project, RBScreen* screen) | 25 | QMap<QString, QString>* settings, RBScreen* screen) |
26 | :mProject(project), mScreen(screen), mModel(model) | 26 | :mProject(project), mSettings(settings), |
27 | mScreen(screen), mModel(model) | ||
27 | { | 28 | { |
28 | } | 29 | } |
29 | 30 | ||
30 | RBRenderInfo::RBRenderInfo(const RBRenderInfo &other) | 31 | RBRenderInfo::RBRenderInfo(const RBRenderInfo &other) |
31 | { | 32 | { |
32 | mProject = other.mProject; | 33 | mProject = other.mProject; |
34 | mSettings = other.mSettings; | ||
33 | mScreen = other.mScreen; | 35 | mScreen = other.mScreen; |
34 | mModel = other.mModel; | 36 | mModel = other.mModel; |
35 | } | 37 | } |
@@ -37,6 +39,7 @@ RBRenderInfo::RBRenderInfo(const RBRenderInfo &other) | |||
37 | const RBRenderInfo& RBRenderInfo::operator=(const RBRenderInfo& other) | 39 | const RBRenderInfo& RBRenderInfo::operator=(const RBRenderInfo& other) |
38 | { | 40 | { |
39 | mProject = other.mProject; | 41 | mProject = other.mProject; |
42 | mSettings = other.mSettings; | ||
40 | mScreen = other.mScreen; | 43 | mScreen = other.mScreen; |
41 | mModel = other.mModel; | 44 | mModel = other.mModel; |
42 | 45 | ||