diff options
Diffstat (limited to 'apps/screen_access.c')
-rw-r--r-- | apps/screen_access.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c index fe5e943cca..a966d07876 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -61,10 +61,6 @@ static int screen_helper_getnblines(void) | |||
61 | #ifdef HAVE_LCD_BITMAP | 61 | #ifdef HAVE_LCD_BITMAP |
62 | if(global_settings.statusbar != STATUSBAR_OFF) | 62 | if(global_settings.statusbar != STATUSBAR_OFF) |
63 | height -= STATUSBAR_HEIGHT; | 63 | height -= STATUSBAR_HEIGHT; |
64 | #ifdef HAVE_BUTTONBAR | ||
65 | if(global_settings.buttonbar && screens[0].has_buttonbar) | ||
66 | height -= BUTTONBAR_HEIGHT; | ||
67 | #endif | ||
68 | #endif | 64 | #endif |
69 | return height / screens[0].getcharheight(); | 65 | return height / screens[0].getcharheight(); |
70 | } | 66 | } |
@@ -134,10 +130,6 @@ static int screen_helper_remote_getnblines(void) | |||
134 | #ifdef HAVE_LCD_BITMAP | 130 | #ifdef HAVE_LCD_BITMAP |
135 | if(global_settings.statusbar != STATUSBAR_OFF) | 131 | if(global_settings.statusbar != STATUSBAR_OFF) |
136 | height -= STATUSBAR_HEIGHT; | 132 | height -= STATUSBAR_HEIGHT; |
137 | #ifdef HAVE_BUTTONBAR | ||
138 | if(global_settings.buttonbar && screens[1].has_buttonbar) | ||
139 | height -= BUTTONBAR_HEIGHT; | ||
140 | #endif | ||
141 | #endif | 133 | #endif |
142 | return height / screens[1].getcharheight(); | 134 | return height / screens[1].getcharheight(); |
143 | } | 135 | } |
@@ -276,9 +268,6 @@ struct screen screens[NB_SCREENS] = | |||
276 | .backdrop_load=&backdrop_load, | 268 | .backdrop_load=&backdrop_load, |
277 | .backdrop_show=&backdrop_show, | 269 | .backdrop_show=&backdrop_show, |
278 | #endif | 270 | #endif |
279 | #ifdef HAVE_BUTTONBAR | ||
280 | .has_buttonbar=false, | ||
281 | #endif | ||
282 | #if defined(HAVE_LCD_BITMAP) | 271 | #if defined(HAVE_LCD_BITMAP) |
283 | .set_framebuffer = (void*)lcd_set_framebuffer, | 272 | .set_framebuffer = (void*)lcd_set_framebuffer, |
284 | #if defined(HAVE_LCD_COLOR) | 273 | #if defined(HAVE_LCD_COLOR) |
@@ -369,14 +358,11 @@ struct screen screens[NB_SCREENS] = | |||
369 | .backlight_off=&remote_backlight_off, | 358 | .backlight_off=&remote_backlight_off, |
370 | .is_backlight_on=&is_remote_backlight_on, | 359 | .is_backlight_on=&is_remote_backlight_on, |
371 | .backlight_set_timeout=&remote_backlight_set_timeout, | 360 | .backlight_set_timeout=&remote_backlight_set_timeout, |
372 | 361 | ||
373 | #if LCD_DEPTH > 1 | 362 | #if LCD_DEPTH > 1 |
374 | .backdrop_load=&remote_backdrop_load, | 363 | .backdrop_load=&remote_backdrop_load, |
375 | .backdrop_show=&remote_backdrop_show, | 364 | .backdrop_show=&remote_backdrop_show, |
376 | #endif | 365 | #endif |
377 | #ifdef HAVE_BUTTONBAR | ||
378 | .has_buttonbar=false, | ||
379 | #endif | ||
380 | #if defined(HAVE_LCD_BITMAP) | 366 | #if defined(HAVE_LCD_BITMAP) |
381 | .set_framebuffer = (void*)lcd_remote_set_framebuffer, | 367 | .set_framebuffer = (void*)lcd_remote_set_framebuffer, |
382 | #endif | 368 | #endif |