forked from len0rd/rockbox
temporarilty disable the statusbar in the keyboard because it doesnt use viewports and this is the easier fix than reworking the screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19683 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
1c924dbf08
commit
45aa9a22f9
1 changed files with 5 additions and 3 deletions
|
@ -37,6 +37,7 @@
|
||||||
#include "pcmbuf.h"
|
#include "pcmbuf.h"
|
||||||
#include "lang.h"
|
#include "lang.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
|
#include "viewport.h"
|
||||||
|
|
||||||
#ifndef O_BINARY
|
#ifndef O_BINARY
|
||||||
#define O_BINARY 0
|
#define O_BINARY 0
|
||||||
|
@ -287,8 +288,7 @@ int kbd_input(char* text, int buflen)
|
||||||
int l; /* screen loop variable */
|
int l; /* screen loop variable */
|
||||||
int text_w = 0;
|
int text_w = 0;
|
||||||
int editpos; /* Edit position on all screens */
|
int editpos; /* Edit position on all screens */
|
||||||
const int statusbar_size = global_settings.statusbar
|
const int statusbar_size = 0;
|
||||||
? STATUSBAR_HEIGHT : 0;
|
|
||||||
unsigned short ch;
|
unsigned short ch;
|
||||||
unsigned char *utf8;
|
unsigned char *utf8;
|
||||||
bool cur_blink = true; /* Cursor on/off flag */
|
bool cur_blink = true; /* Cursor on/off flag */
|
||||||
|
@ -298,7 +298,7 @@ int kbd_input(char* text, int buflen)
|
||||||
int morse_tick = 0;
|
int morse_tick = 0;
|
||||||
char buf[2];
|
char buf[2];
|
||||||
#endif
|
#endif
|
||||||
|
bool oldbars = viewportmanager_set_statusbar(false);
|
||||||
FOR_NB_SCREENS(l)
|
FOR_NB_SCREENS(l)
|
||||||
{
|
{
|
||||||
struct keyboard_parameters *pm = ¶m[l];
|
struct keyboard_parameters *pm = ¶m[l];
|
||||||
|
@ -773,6 +773,7 @@ int kbd_input(char* text, int buflen)
|
||||||
#ifdef HAVE_BUTTONBAR
|
#ifdef HAVE_BUTTONBAR
|
||||||
global_settings.buttonbar=buttonbar_config;
|
global_settings.buttonbar=buttonbar_config;
|
||||||
#endif
|
#endif
|
||||||
|
viewportmanager_set_statusbar(oldbars);
|
||||||
return -1;
|
return -1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1241,6 +1242,7 @@ int kbd_input(char* text, int buflen)
|
||||||
|
|
||||||
FOR_NB_SCREENS(l)
|
FOR_NB_SCREENS(l)
|
||||||
screens[l].setfont(FONT_UI);
|
screens[l].setfont(FONT_UI);
|
||||||
|
viewportmanager_set_statusbar(oldbars);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue