summaryrefslogtreecommitdiff
path: root/render/theme.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-08-04 23:35:36 -0400
committerDana Jansens <danakj@orodu.net>2007-08-04 23:35:36 -0400
commitf55ae9e56945892825928cfb021b5e739d0d5224 (patch)
tree19a26efae2532bc046160289adca8a8dc45ac3a7 /render/theme.c
parent98b9ed97ebbcf22185359c8f6f1d539a105cd258 (diff)
parentfa085b73389de3af8236919f4e39c4c20d16ed7c (diff)
Merge branch 'backport'
Diffstat (limited to 'render/theme.c')
-rw-r--r--render/theme.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/render/theme.c b/render/theme.c
index a793ced7..0de3dc74 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -186,7 +186,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
if (!read_int(db, "padding.width", &theme->paddingx) ||
theme->paddingx < 0 || theme->paddingx > 100)
theme->paddingx = 3;
- theme->paddingy = theme->paddingx;
+ if (!read_int(db, "padding.height", &theme->paddingy) ||
+ theme->paddingy < 0 || theme->paddingy > 100)
+ theme->paddingy = theme->paddingx;
if (!read_int(db, "border.width", &theme->fbwidth) ||
theme->fbwidth < 0 || theme->fbwidth > 100)
theme->fbwidth = 1;