diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-07-12 06:07:50 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-07-12 06:07:50 +0000 |
commit | 64af2b3a16c1fc9968b50223b79321ca04cc53e4 (patch) | |
tree | a34a9330f320846e07479791c7a664e3f8d979e9 /utils/themeeditor/graphics/rbprogressbar.cpp | |
parent | bae183633705b087f80afe11a36772f553a5cb26 (diff) | |
download | rockbox-64af2b3a16c1fc9968b50223b79321ca04cc53e4.tar.gz rockbox-64af2b3a16c1fc9968b50223b79321ca04cc53e4.zip |
Theme Editor: Made %pv tag display bar and select from conditional branches correctly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27398 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/graphics/rbprogressbar.cpp')
-rw-r--r-- | utils/themeeditor/graphics/rbprogressbar.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/utils/themeeditor/graphics/rbprogressbar.cpp b/utils/themeeditor/graphics/rbprogressbar.cpp index 1c14acfc5a..027520f4da 100644 --- a/utils/themeeditor/graphics/rbprogressbar.cpp +++ b/utils/themeeditor/graphics/rbprogressbar.cpp | |||
@@ -25,7 +25,8 @@ | |||
25 | #include "projectmodel.h" | 25 | #include "projectmodel.h" |
26 | 26 | ||
27 | RBProgressBar::RBProgressBar(RBViewport *parent, const RBRenderInfo &info, | 27 | RBProgressBar::RBProgressBar(RBViewport *parent, const RBRenderInfo &info, |
28 | int paramCount, skin_tag_parameter *params) | 28 | int paramCount, skin_tag_parameter *params, |
29 | bool pv) | ||
29 | :QGraphicsItem(parent) | 30 | :QGraphicsItem(parent) |
30 | { | 31 | { |
31 | /* First we set everything to defaults */ | 32 | /* First we set everything to defaults */ |
@@ -72,7 +73,20 @@ RBProgressBar::RBProgressBar(RBViewport *parent, const RBRenderInfo &info, | |||
72 | 73 | ||
73 | 74 | ||
74 | /* Finally, we scale the width according to the amount played */ | 75 | /* Finally, we scale the width according to the amount played */ |
75 | int percent = info.device()->data("px").toInt(); | 76 | int percent; |
77 | if(pv) | ||
78 | { | ||
79 | percent = (info.device()->data("pv").toInt() + 50) * 100 / 56; | ||
80 | } | ||
81 | else | ||
82 | { | ||
83 | percent = info.device()->data("px").toInt(); | ||
84 | } | ||
85 | if(percent > 100) | ||
86 | percent = 100; | ||
87 | if(percent < 0) | ||
88 | percent = 0; | ||
89 | |||
76 | w = w * percent / 100; | 90 | w = w * percent / 100; |
77 | 91 | ||
78 | size = QRectF(0, 0, w, h); | 92 | size = QRectF(0, 0, w, h); |