forked from len0rd/rockbox
removed a few ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8367 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
cedba8830f
commit
30dbb957fe
1 changed files with 5 additions and 10 deletions
|
|
@ -827,6 +827,8 @@ static void init_need_scrollbar(void) {
|
||||||
draw_columns = need_scrollbar? display_columns-glyph_width['o'] : display_columns;
|
draw_columns = need_scrollbar? display_columns-glyph_width['o'] : display_columns;
|
||||||
par_indent_spaces = draw_columns/(5*glyph_width[' ']);
|
par_indent_spaces = draw_columns/(5*glyph_width[' ']);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
#define init_need_scrollbar()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static bool viewer_init(void)
|
static bool viewer_init(void)
|
||||||
|
|
@ -885,10 +887,8 @@ static bool viewer_init(void)
|
||||||
init file_pos, buffer_end, screen_top_ptr */
|
init file_pos, buffer_end, screen_top_ptr */
|
||||||
viewer_top();
|
viewer_top();
|
||||||
|
|
||||||
#ifdef HAVE_LCD_BITMAP
|
|
||||||
/* Init need_scrollbar value */
|
/* Init need_scrollbar value */
|
||||||
init_need_scrollbar();
|
init_need_scrollbar();
|
||||||
#endif
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -935,9 +935,7 @@ static void viewer_load_settings(void)
|
||||||
line_mode = rb->atoi(prefs->line_mode);
|
line_mode = rb->atoi(prefs->line_mode);
|
||||||
view_mode = rb->atoi(prefs->view_mode);
|
view_mode = rb->atoi(prefs->view_mode);
|
||||||
|
|
||||||
#ifdef HAVE_LCD_BITMAP
|
|
||||||
init_need_scrollbar();
|
init_need_scrollbar();
|
||||||
#endif
|
|
||||||
/* the following settings are safety checked
|
/* the following settings are safety checked
|
||||||
* (file may have changed on disk)
|
* (file may have changed on disk)
|
||||||
*/
|
*/
|
||||||
|
|
@ -1062,9 +1060,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
|
||||||
if (++word_mode == WORD_MODES)
|
if (++word_mode == WORD_MODES)
|
||||||
word_mode = 0;
|
word_mode = 0;
|
||||||
|
|
||||||
#ifdef HAVE_LCD_BITMAP
|
|
||||||
init_need_scrollbar();
|
init_need_scrollbar();
|
||||||
#endif
|
|
||||||
viewer_draw(col);
|
viewer_draw(col);
|
||||||
|
|
||||||
rb->splash(HZ, true, "%s %s",
|
rb->splash(HZ, true, "%s %s",
|
||||||
|
|
@ -1088,9 +1085,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
|
||||||
line_mode = 0;
|
line_mode = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_LCD_BITMAP
|
|
||||||
init_need_scrollbar();
|
init_need_scrollbar();
|
||||||
#endif
|
|
||||||
viewer_draw(col);
|
viewer_draw(col);
|
||||||
|
|
||||||
rb->splash(HZ, true, "%s %s",
|
rb->splash(HZ, true, "%s %s",
|
||||||
|
|
@ -1125,9 +1121,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file)
|
||||||
}
|
}
|
||||||
***********/
|
***********/
|
||||||
|
|
||||||
#ifdef HAVE_LCD_BITMAP
|
|
||||||
init_need_scrollbar();
|
init_need_scrollbar();
|
||||||
#endif
|
|
||||||
viewer_draw(col);
|
viewer_draw(col);
|
||||||
|
|
||||||
rb->splash(HZ, true, "%s %s",
|
rb->splash(HZ, true, "%s %s",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue