diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-22 08:50:24 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-22 08:50:24 +0000 |
commit | 9d3694ced6bd3a00ef9fca2522cf9821f945cba7 (patch) | |
tree | 6b68b816b868549bb4f17daaccf5731fcaba685d /apps/filetypes.c | |
parent | 814d402d4c9c011ee7e357e74cca6a64176a33d8 (diff) | |
download | rockbox-9d3694ced6bd3a00ef9fca2522cf9821f945cba7.tar.gz rockbox-9d3694ced6bd3a00ef9fca2522cf9821f945cba7.zip |
Fix FS#7056 - dont display garbage if the viewer icon set and the main iconset have different icon heights
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13237 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/filetypes.c')
-rw-r--r-- | apps/filetypes.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c index 0daae1b617..69448a7946 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -145,10 +145,7 @@ void read_viewer_theme_file(void) | |||
145 | custom_filetype_icons[0] = Icon_Folder; | 145 | custom_filetype_icons[0] = Icon_Folder; |
146 | for (i=1; i<filetype_count; i++) | 146 | for (i=1; i<filetype_count; i++) |
147 | { | 147 | { |
148 | if (filetypes[i].icon < Icon_Last_Themeable) | 148 | custom_filetype_icons[i] = filetypes[i].icon; |
149 | custom_filetype_icons[i] = filetypes[i].icon; | ||
150 | else | ||
151 | custom_filetype_icons[i] = Icon_Questionmark; | ||
152 | } | 149 | } |
153 | 150 | ||
154 | snprintf(buffer, MAX_PATH, "%s/%s.icons", ICON_DIR, | 151 | snprintf(buffer, MAX_PATH, "%s/%s.icons", ICON_DIR, |
@@ -181,6 +178,7 @@ void read_viewer_theme_file(void) | |||
181 | 178 | ||
182 | void filetype_init(void) | 179 | void filetype_init(void) |
183 | { | 180 | { |
181 | int i; | ||
184 | /* set the directory item first */ | 182 | /* set the directory item first */ |
185 | filetypes[0].extension = NULL; | 183 | filetypes[0].extension = NULL; |
186 | filetypes[0].plugin = NULL; | 184 | filetypes[0].plugin = NULL; |
@@ -193,6 +191,14 @@ void filetype_init(void) | |||
193 | #ifdef HAVE_LCD_BITMAP | 191 | #ifdef HAVE_LCD_BITMAP |
194 | read_viewer_theme_file(); | 192 | read_viewer_theme_file(); |
195 | #endif | 193 | #endif |
194 | /* figure out how many viewer icons have been loaded */ | ||
195 | global_status.viewer_icon_count = Icon_Last_Themeable; | ||
196 | for (i=1; i<filetype_count; i++) | ||
197 | { | ||
198 | if (custom_filetype_icons[i] > global_status.viewer_icon_count) | ||
199 | global_status.viewer_icon_count = custom_filetype_icons[i]; | ||
200 | } | ||
201 | global_status.viewer_icon_count -= Icon_Last_Themeable; | ||
196 | } | 202 | } |
197 | 203 | ||
198 | /* remove all white spaces from string */ | 204 | /* remove all white spaces from string */ |