From 13e97cd5f5330e5c7f52f243ddee5cdce61edfa6 Mon Sep 17 00:00:00 2001 From: Robert Bieber Date: Wed, 7 Jul 2010 22:25:42 +0000 Subject: Theme Editor: Implemented line scrolling git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27344 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/models/parsetreenode.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'utils/themeeditor/models/parsetreenode.cpp') diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index b2b5fbb..e5eb9df 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -29,6 +29,7 @@ #include "rbprogressbar.h" #include +#include 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]) { -- cgit v1.1