forked from len0rd/rockbox
Theme Editor: Altered implementation of %ax tag so that viewport now simply mirrors itself across the screen.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27798 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
9ba67fb35e
commit
b477463d9c
1 changed files with 11 additions and 12 deletions
|
@ -48,8 +48,6 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info,
|
||||||
leftGraphic(0), centerGraphic(0), rightGraphic(0), scrollTime(0),
|
leftGraphic(0), centerGraphic(0), rightGraphic(0), scrollTime(0),
|
||||||
node(pNode), doc(info.document())
|
node(pNode), doc(info.document())
|
||||||
{
|
{
|
||||||
mirrored = info.screen()->isRtlMirrored()
|
|
||||||
&& info.device()->data("rtl").toBool();
|
|
||||||
|
|
||||||
if(!node->tag)
|
if(!node->tag)
|
||||||
{
|
{
|
||||||
|
@ -150,12 +148,6 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info,
|
||||||
y -= screen->parentItem()->pos().y();
|
y -= screen->parentItem()->pos().y();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Mirroring if necessary */
|
|
||||||
if(mirrored)
|
|
||||||
{
|
|
||||||
x = parentItem()->boundingRect().width() - w - x;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(node->params[++param].type == skin_tag_parameter::DEFAULT)
|
if(node->params[++param].type == skin_tag_parameter::DEFAULT)
|
||||||
font = screen->getFont(1);
|
font = screen->getFont(1);
|
||||||
else
|
else
|
||||||
|
@ -167,6 +159,17 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info,
|
||||||
|
|
||||||
debug = info.device()->data("showviewports").toBool();
|
debug = info.device()->data("showviewports").toBool();
|
||||||
lineHeight = font->lineHeight();
|
lineHeight = font->lineHeight();
|
||||||
|
|
||||||
|
if(info.screen()->isRtlMirrored() && info.device()->data("rtl").toBool())
|
||||||
|
{
|
||||||
|
/* Mirroring the viewport */
|
||||||
|
double x = screen->boundingRect().width() - 2 * pos().x();
|
||||||
|
QTransform t;
|
||||||
|
t.translate(x, 0);
|
||||||
|
t.scale(-1, 1);
|
||||||
|
setTransform(t);
|
||||||
|
}
|
||||||
|
|
||||||
if(customUI)
|
if(customUI)
|
||||||
screen->setCustomUI(this);
|
screen->setCustomUI(this);
|
||||||
}
|
}
|
||||||
|
@ -236,10 +239,6 @@ void RBViewport::write(QString text)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Alignment align = textAlign;
|
Alignment align = textAlign;
|
||||||
if(mirrored && align == Left)
|
|
||||||
align = Right;
|
|
||||||
else if(mirrored && align == Right)
|
|
||||||
align = Left;
|
|
||||||
|
|
||||||
if(align == Left)
|
if(align == Left)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue