summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-07 22:25:42 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-07 22:25:42 +0000
commit13e97cd5f5330e5c7f52f243ddee5cdce61edfa6 (patch)
treeee53f022c50fc005665597b4f8146809a053016f /utils
parentd4f4104a4ab04cbca75dff874e57dbe34002ded7 (diff)
downloadrockbox-13e97cd5f5330e5c7f52f243ddee5cdce61edfa6.tar.gz
rockbox-13e97cd5f5330e5c7f52f243ddee5cdce61edfa6.tar.bz2
rockbox-13e97cd5f5330e5c7f52f243ddee5cdce61edfa6.zip
Theme Editor: Implemented line scrolling
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27344 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r--utils/themeeditor/graphics/rbtext.cpp9
-rw-r--r--utils/themeeditor/graphics/rbtext.h4
-rw-r--r--utils/themeeditor/graphics/rbviewport.cpp90
-rw-r--r--utils/themeeditor/graphics/rbviewport.h6
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp20
5 files changed, 126 insertions, 3 deletions
diff --git a/utils/themeeditor/graphics/rbtext.cpp b/utils/themeeditor/graphics/rbtext.cpp
index 4666f9ae99..8de5d57897 100644
--- a/utils/themeeditor/graphics/rbtext.cpp
+++ b/utils/themeeditor/graphics/rbtext.cpp
@@ -24,7 +24,7 @@
#include <QPainter>
RBText::RBText(QImage* image, int maxWidth, QGraphicsItem *parent)
- :QGraphicsItem(parent), image(image), maxWidth(maxWidth)
+ :QGraphicsItem(parent), image(image), maxWidth(maxWidth), offset(0)
{
}
@@ -39,8 +39,13 @@ QRectF RBText::boundingRect() const
void RBText::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget)
{
+ /* Making sure the offset is within bounds */
+ if(image->width() > maxWidth)
+ if(offset > image->width() - maxWidth)
+ offset = image->width() - maxWidth;
+
if(image->width() < maxWidth)
painter->drawImage(0, 0, *image, 0, 0, image->width(), image->height());
else
- painter->drawImage(0, 0, *image, 0, 0, maxWidth, image->height());
+ painter->drawImage(0, 0, *image, offset, 0, maxWidth, image->height());
}
diff --git a/utils/themeeditor/graphics/rbtext.h b/utils/themeeditor/graphics/rbtext.h
index 936a809f6c..b4d9ae3c54 100644
--- a/utils/themeeditor/graphics/rbtext.h
+++ b/utils/themeeditor/graphics/rbtext.h
@@ -34,9 +34,13 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
+ int realWidth(){ return image->width(); }
+ void setOffset(int offset){ this->offset = offset; }
+
private:
QImage* image;
int maxWidth;
+ int offset;
};
diff --git a/utils/themeeditor/graphics/rbviewport.cpp b/utils/themeeditor/graphics/rbviewport.cpp
index 18029a57f6..3a239c7f35 100644
--- a/utils/themeeditor/graphics/rbviewport.cpp
+++ b/utils/themeeditor/graphics/rbviewport.cpp
@@ -21,6 +21,7 @@
#include <QPainter>
#include <QPainterPath>
+#include <cmath>
#include "rbviewport.h"
#include "rbscreen.h"
@@ -29,12 +30,17 @@
#include "tag_table.h"
#include "skin_parser.h"
+/* Pause at beginning/end of scroll */
+const double RBViewport::scrollPause = 0.5;
+/* Pixels/second of text scrolling */
+const double RBViewport::scrollRate = 30;
+
RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
: QGraphicsItem(info.screen()), foreground(info.screen()->foreground()),
background(info.screen()->background()), textOffset(0,0),
screen(info.screen()), textAlign(Left), showStatusBar(false),
statusBarTexture(":/render/statusbar.png"),
- leftGraphic(0), centerGraphic(0), rightGraphic(0)
+ leftGraphic(0), centerGraphic(0), rightGraphic(0), scrollTime(0)
{
if(!node->tag)
{
@@ -191,6 +197,8 @@ void RBViewport::newLine()
leftGraphic = 0;
centerGraphic = 0;
rightGraphic = 0;
+
+ scrollTime = 0;
}
void RBViewport::write(QString text)
@@ -287,6 +295,32 @@ void RBViewport::alignLeft()
leftGraphic = font->renderText(leftText, foreground, size.width(), this);
leftGraphic->setPos(0, y);
+
+ /* Setting scroll position if necessary */
+ int difference = leftGraphic->realWidth()
+ - leftGraphic->boundingRect().width();
+ if(difference > 0)
+ {
+ /* Subtracting out complete cycles */
+ double totalTime = 2 * scrollPause + difference / scrollRate;
+ scrollTime -= totalTime * std::floor(scrollTime / totalTime);
+
+ /* Calculating the offset */
+ if(scrollTime < scrollPause)
+ {
+ return;
+ }
+ else if(scrollTime < scrollPause + difference / scrollRate)
+ {
+ scrollTime -= scrollPause;
+ int offset = scrollRate * scrollTime;
+ leftGraphic->setOffset(offset);
+ }
+ else
+ {
+ leftGraphic->setOffset(difference);
+ }
+ }
}
void RBViewport::alignCenter()
@@ -311,6 +345,33 @@ void RBViewport::alignCenter()
}
centerGraphic->setPos(x, y);
+
+ /* Setting scroll position if necessary */
+ int difference = centerGraphic->realWidth()
+ - centerGraphic->boundingRect().width();
+ if(difference > 0)
+ {
+ /* Subtracting out complete cycles */
+ double totalTime = 2 * scrollPause + difference / scrollRate;
+ scrollTime -= totalTime * std::floor(scrollTime / totalTime);
+
+ /* Calculating the offset */
+ if(scrollTime < scrollPause)
+ {
+ return;
+ }
+ else if(scrollTime < scrollPause + difference / scrollRate)
+ {
+ scrollTime -= scrollPause;
+ int offset = scrollRate * scrollTime;
+ centerGraphic->setOffset(offset);
+ }
+ else
+ {
+ centerGraphic->setOffset(difference);
+ }
+ }
+
}
void RBViewport::alignRight()
@@ -329,5 +390,32 @@ void RBViewport::alignRight()
x = 0;
rightGraphic->setPos(x, y);
+
+ /* Setting scroll position if necessary */
+ int difference = rightGraphic->realWidth()
+ - rightGraphic->boundingRect().width();
+ if(difference > 0)
+ {
+ /* Subtracting out complete cycles */
+ double totalTime = 2 * scrollPause + difference / scrollRate;
+ scrollTime -= totalTime * std::floor(scrollTime / totalTime);
+
+ /* Calculating the offset */
+ if(scrollTime < scrollPause)
+ {
+ return;
+ }
+ else if(scrollTime < scrollPause + difference / scrollRate)
+ {
+ scrollTime -= scrollPause;
+ int offset = scrollRate * scrollTime;
+ rightGraphic->setOffset(offset);
+ }
+ else
+ {
+ rightGraphic->setOffset(difference);
+ }
+ }
+
}
diff --git a/utils/themeeditor/graphics/rbviewport.h b/utils/themeeditor/graphics/rbviewport.h
index c557632a40..eeeb7191ef 100644
--- a/utils/themeeditor/graphics/rbviewport.h
+++ b/utils/themeeditor/graphics/rbviewport.h
@@ -40,6 +40,9 @@ public:
Right
};
+ static const double scrollRate;
+ static const double scrollPause;
+
RBViewport(skin_element* node, const RBRenderInfo& info);
virtual ~RBViewport();
@@ -66,6 +69,7 @@ public:
alignRight();
alignCenter();
}
+ void scrollText(double time){ scrollTime = time; }
void enableStatusBar(){ showStatusBar = true; }
@@ -101,6 +105,8 @@ private:
RBText* leftGraphic;
RBText* centerGraphic;
RBText* rightGraphic;
+
+ double scrollTime;
};
#endif // RBVIEWPORT_H
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index b2b5fbbdb4..e5eb9df9b3 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -29,6 +29,7 @@
#include "rbprogressbar.h"
#include <iostream>
+#include <cmath>
int ParseTreeNode::openConditionals = 0;
bool ParseTreeNode::breakFlag = false;
@@ -552,8 +553,16 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
for(int i = 0; i < children.count() ; i++)
times.append(findBranchTime(children[i], info));
+ double totalTime = 0;
+ for(int i = 0; i < children.count(); i++)
+ totalTime += times[i];
+
/* Now we figure out which branch to select */
double timeLeft = info.device()->data(QString("simtime")).toDouble();
+
+ /* Skipping any full cycles */
+ timeLeft -= totalTime * std::floor(timeLeft / totalTime);
+
int branch = 0;
while(timeLeft > 0)
{
@@ -654,6 +663,17 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
return false;
+ case 's':
+ switch(element->tag->name[1])
+ {
+ case '\0':
+ /* %s */
+ viewport->scrollText(info.device()->data("simtime").toDouble());
+ return true;
+ }
+
+ return false;
+
case 'w':
switch(element->tag->name[1])
{