diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-03-11 22:31:53 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-03-11 22:31:53 +0000 |
commit | dd939aa4d73a6328f6f3245dd3b3c9de35338f5b (patch) | |
tree | 992ae174fbd7ffa1da1cafd85ab593b7bff7397c /apps/recorder/keyboard.c | |
parent | 1a66809ce11ba3056853bb98f39edc260e6b6db5 (diff) | |
download | rockbox-dd939aa4d73a6328f6f3245dd3b3c9de35338f5b.tar.gz rockbox-dd939aa4d73a6328f6f3245dd3b3c9de35338f5b.zip |
Patch #2839 by Christian Marg - Always show the buttonbar in the keyboard screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9008 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/keyboard.c')
-rw-r--r-- | apps/recorder/keyboard.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index d1756ace2c..cb982e38e6 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -259,6 +259,8 @@ int kbd_input(char* text, int buflen) | |||
259 | int button, lastbutton = 0; | 259 | int button, lastbutton = 0; |
260 | #ifdef HAS_BUTTONBAR | 260 | #ifdef HAS_BUTTONBAR |
261 | struct gui_buttonbar buttonbar; | 261 | struct gui_buttonbar buttonbar; |
262 | bool buttonbar_config = global_settings.buttonbar; | ||
263 | global_settings.buttonbar = true; | ||
262 | gui_buttonbar_init(&buttonbar); | 264 | gui_buttonbar_init(&buttonbar); |
263 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); | 265 | gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) ); |
264 | #endif | 266 | #endif |
@@ -401,6 +403,9 @@ int kbd_input(char* text, int buflen) | |||
401 | 403 | ||
402 | case KBD_ABORT: | 404 | case KBD_ABORT: |
403 | lcd_setfont(FONT_UI); | 405 | lcd_setfont(FONT_UI); |
406 | #ifdef HAS_BUTTONBAR | ||
407 | global_settings.buttonbar=buttonbar_config; | ||
408 | #endif | ||
404 | return -1; | 409 | return -1; |
405 | break; | 410 | break; |
406 | 411 | ||
@@ -734,6 +739,9 @@ int kbd_input(char* text, int buflen) | |||
734 | if (button != BUTTON_NONE) | 739 | if (button != BUTTON_NONE) |
735 | lastbutton = button; | 740 | lastbutton = button; |
736 | } | 741 | } |
742 | #ifdef HAS_BUTTONBAR | ||
743 | global_settings.buttonbar=buttonbar_config; | ||
744 | #endif | ||
737 | lcd_setfont(FONT_UI); | 745 | lcd_setfont(FONT_UI); |
738 | 746 | ||
739 | return 0; | 747 | return 0; |