summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-03-11 22:31:53 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-03-11 22:31:53 +0000
commitdd939aa4d73a6328f6f3245dd3b3c9de35338f5b (patch)
tree992ae174fbd7ffa1da1cafd85ab593b7bff7397c
parent1a66809ce11ba3056853bb98f39edc260e6b6db5 (diff)
downloadrockbox-dd939aa4d73a6328f6f3245dd3b3c9de35338f5b.zip
rockbox-dd939aa4d73a6328f6f3245dd3b3c9de35338f5b.tar.gz
rockbox-dd939aa4d73a6328f6f3245dd3b3c9de35338f5b.tar.bz2
rockbox-dd939aa4d73a6328f6f3245dd3b3c9de35338f5b.tar.xz
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
-rw-r--r--apps/recorder/keyboard.c8
-rw-r--r--docs/CREDITS1
2 files changed, 9 insertions, 0 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index d1756ac..cb982e3 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -259,6 +259,8 @@ int kbd_input(char* text, int buflen)
int button, lastbutton = 0;
#ifdef HAS_BUTTONBAR
struct gui_buttonbar buttonbar;
+ bool buttonbar_config = global_settings.buttonbar;
+ global_settings.buttonbar = true;
gui_buttonbar_init(&buttonbar);
gui_buttonbar_set_display(&buttonbar, &(screens[SCREEN_MAIN]) );
#endif
@@ -401,6 +403,9 @@ int kbd_input(char* text, int buflen)
case KBD_ABORT:
lcd_setfont(FONT_UI);
+#ifdef HAS_BUTTONBAR
+ global_settings.buttonbar=buttonbar_config;
+#endif
return -1;
break;
@@ -734,6 +739,9 @@ int kbd_input(char* text, int buflen)
if (button != BUTTON_NONE)
lastbutton = button;
}
+#ifdef HAS_BUTTONBAR
+ global_settings.buttonbar=buttonbar_config;
+#endif
lcd_setfont(FONT_UI);
return 0;
diff --git a/docs/CREDITS b/docs/CREDITS
index 8408491..e6fcf91 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -181,3 +181,4 @@ Nils Wallménius
Naoaki Okazaki
Will Dyson
Matthias Mohr
+Christian Marg