s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix XML serialization of EekOutline to include corner_radius.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-03 14:37:57 +09:00
parent b25a9a5407
commit a9c0356611
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eek/eek-xml-layout.c
View File

@ -62,6 +62,7 @@ struct _ParseCallbackData {
EekKey *key;
gint num_columns;
EekOrientation orientation;
gdouble corner_radius;
GSList *points;
GSList *symbols;
gchar *label;
@ -70,6 +71,7 @@ struct _ParseCallbackData {
gint groups, levels;
EekOutline outline;
gchar *oref;
GHashTable *key_oref_hash;
GHashTable *oref_outline_hash;
};
@ -97,7 +99,8 @@ static const gchar *valid_path_list[] = {
"icon/symbols/key/section/keyboard",
"invalid/symbols/key/section/keyboard",
"index/key/section/keyboard",
"point/outline/keyboard"
"point/outline/keyboard",
"corner-radius/outline/keyboard",
};
static gchar *
@ -298,7 +301,10 @@ end_element_callback (GMarkupParseContext *pcontext,
if (g_strcmp0 (element_name, "outline") == 0) {
EekOutline *outline = g_slice_new (EekOutline);
outline->corner_radius = data->corner_radius;
data->corner_radius = 0.0;
outline->num_points = g_slist_length (data->points);
outline->points = g_slice_alloc0 (sizeof (EekPoint) *
outline->num_points);
@ -318,6 +324,11 @@ end_element_callback (GMarkupParseContext *pcontext,
goto out;
}
if (g_strcmp0 (element_name, "corner-radius") == 0) {
data->corner_radius = g_strtod (text, NULL);
goto out;
}
if (g_strcmp0 (element_name, "point") == 0) {
EekPoint *point;