diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 10:51:35 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 19:43:02 +0100 |
| commit | 1124d1036984f920dcd5b2caec9ff8fe2d788b8a (patch) | |
| tree | 6e0c626f33ee58e5888ceb4a11608f2103a34d16 /render/theme.c | |
| parent | bbf0eed8d146602e81e64e9bc6d1c451c260b52f (diff) | |
| parent | f1f61ff703db72cc1db7f834c9cb45616d55da10 (diff) | |
Merge branch 'backport' into work
Diffing against the old work branch where most of the changes
in backport were cherry-picked from indicates this should be
alright. (0de9097017d4d1991388a35e380a57dc1135b431)
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/render/theme.c b/render/theme.c index e1cff0cd..ec12dafb 100644 --- a/render/theme.c +++ b/render/theme.c @@ -177,9 +177,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_font = RrFontOpenDefault(inst); /* load direct dimensions */ - if (!read_int(db, "menu.overlap", &theme->menu_overlap) || - theme->menu_overlap < -100 || theme->menu_overlap > 100) - theme->menu_overlap = 0; + if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) && + !read_int(db, "menu.overlap", &theme->menu_overlap_x)) || + theme->menu_overlap_x < -100 || theme->menu_overlap_x > 100) + theme->menu_overlap_x = 0; + if ((!read_int(db, "menu.overlap.y", &theme->menu_overlap_y) && + !read_int(db, "menu.overlap", &theme->menu_overlap_y)) || + theme->menu_overlap_y < -100 || theme->menu_overlap_y > 100) + theme->menu_overlap_y = 0; if (!read_int(db, "window.handle.width", &theme->handle_height) || theme->handle_height < 0 || theme->handle_height > 100) theme->handle_height = 6; |