diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-09-07 21:52:12 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-09-07 21:52:12 +0000 |
commit | 32340186c7ceee00e2a9da644fdf7f5d1fc002bf (patch) | |
tree | 4796f8753587c5541b05369175350019713ce4d1 /apps/gui/viewport.c | |
parent | 8ad60026fefdf1c4c4704b05b384abc1e881b535 (diff) | |
download | rockbox-32340186c7ceee00e2a9da644fdf7f5d1fc002bf.tar.gz rockbox-32340186c7ceee00e2a9da644fdf7f5d1fc002bf.zip |
Fix viewport_set_defaults giving the wrong dimensions if the ui vp is overridden (as done in plugins atm), and notify other code if the ui vp was overridden.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22657 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/viewport.c')
-rw-r--r-- | apps/gui/viewport.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 281c04b2c5..06caa2379d 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -140,7 +140,7 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen) | |||
140 | { | 140 | { |
141 | #ifdef HAVE_LCD_BITMAP | 141 | #ifdef HAVE_LCD_BITMAP |
142 | if (ui_vp_info.active[screen]) | 142 | if (ui_vp_info.active[screen]) |
143 | *vp = custom_vp[screen]; | 143 | *vp = ui_vp_info.vp[screen]; |
144 | else | 144 | else |
145 | #endif | 145 | #endif |
146 | viewport_set_fullscreen(vp, screen); | 146 | viewport_set_fullscreen(vp, screen); |
@@ -280,6 +280,9 @@ void viewport_set_current_vp(struct viewport* vp) | |||
280 | ui_vp_info.vp = vp; | 280 | ui_vp_info.vp = vp; |
281 | else | 281 | else |
282 | ui_vp_info.vp = custom_vp; | 282 | ui_vp_info.vp = custom_vp; |
283 | |||
284 | /* must be done after the assignment above or event handler get old vps */ | ||
285 | send_event(GUI_EVENT_THEME_CHANGED, NULL); | ||
283 | } | 286 | } |
284 | 287 | ||
285 | struct viewport* viewport_get_current_vp(void) | 288 | struct viewport* viewport_get_current_vp(void) |