devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

themeeditor: Fix compilation

Browse source 
This thing is suffering from some serious bitrot, but at least
it compiles again.

Change-Id: Ie2c55697dddbca3a758ace5047d1c372ee478a07
This commit is contained in:
Solomon Peachy 2024-12-03 20:15:18 -05:00
parent 2ce1a1e638
commit 00d7a93987
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/skin_parser/tag_table.c
View file

@ -21,7 +21,6 @@
#include <string.h> #include <string.h>
#include "tag_table.h" #include "tag_table.h"
#include "debug.h"
#define BAR_PARAMS "?[iP][iP][iP][iP]|s*" #define BAR_PARAMS "?[iP][iP][iP][iP]|s*"
/* The tag definition table */ /* The tag definition table */

18
utils/themeeditor/models/parsetreenode.cpp
View file

@ -87,8 +87,7 @@ ParseTreeNode::ParseTreeNode(struct skin_element* data, ParseTreeNode* parent,
case VIEWPORT: case VIEWPORT:
for(int i = 0; i < element->params_count; i++) for(int i = 0; i < element->params_count; i++)
children.append(new ParseTreeNode(&data->params[i], this, model)); children.append(new ParseTreeNode(&data->params[i], this, model));
/* Deliberate fall-through here */ /* Intentional fallthrough */
case LINE: case LINE:
for(int i = 0; i < data->children_count; i++) for(int i = 0; i < data->children_count; i++)
{ {
@ -224,8 +223,12 @@ QString ParseTreeNode::genCode() const
} }
buffer.append(ARGLISTCLOSESYM); buffer.append(ARGLISTCLOSESYM);
} }
if(element->tag->params[strlen(element->tag->params) - 1] == '\n') if (element->tag->param_pos > 1)
buffer.append('\n'); {
const char *param = element->tag->name + element->tag->param_pos;
if(param[strlen(param) - 1] == '\n')
buffer.append('\n');
}
break; break;
case TEXT: case TEXT:
@ -262,6 +265,7 @@ QString ParseTreeNode::genCode() const
break; break;
case skin_tag_parameter::DECIMAL: case skin_tag_parameter::DECIMAL:
case skin_tag_parameter::PERCENT:
buffer.append(QString::number(param->data.number / 10., 'f', 1)); buffer.append(QString::number(param->data.number / 10., 'f', 1));
break; break;
@ -348,6 +352,7 @@ int ParseTreeNode::genHash() const
break; break;
case skin_tag_parameter::DECIMAL: case skin_tag_parameter::DECIMAL:
case skin_tag_parameter::PERCENT:
hash += param->data.number; hash += param->data.number;
break; break;
} }
@ -421,6 +426,9 @@ QVariant ParseTreeNode::data(int column) const
case skin_tag_parameter::DECIMAL: case skin_tag_parameter::DECIMAL:
return QObject::tr("Decimal"); return QObject::tr("Decimal");
case skin_tag_parameter::PERCENT:
return QObject::tr("Percent");
case skin_tag_parameter::DEFAULT: case skin_tag_parameter::DEFAULT:
return QObject::tr("Default Argument"); return QObject::tr("Default Argument");
@ -471,6 +479,7 @@ QVariant ParseTreeNode::data(int column) const
return QString::number(param->data.number, 10); return QString::number(param->data.number, 10);
case skin_tag_parameter::DECIMAL: case skin_tag_parameter::DECIMAL:
case skin_tag_parameter::PERCENT:
return QString::number(param->data.number / 10., 'f', 1); return QString::number(param->data.number / 10., 'f', 1);
case skin_tag_parameter::CODE: case skin_tag_parameter::CODE:
@ -825,6 +834,7 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
case 'l': case 'l':
/* %xl */ /* %xl */
id = element->params[0].data.text; id = element->params[0].data.text;
tiles = 0;
if(element->params[1].data.text == QString("__list_icons__")) if(element->params[1].data.text == QString("__list_icons__"))
{ {
filename = info.settings()->value("iconset", ""); filename = info.settings()->value("iconset", "");