summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-12 19:26:26 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-12 19:26:26 -0400
commitf68463c53e1fe8c292dcb66098a1caf4c688e1d2 (patch)
tree5b50fd05b7be17ccbdb507dbbd4aabe9ee5a902b
parent688575368c45a2a30a6dbfeffff07a7595024a53 (diff)
downloadrockbox-f68463c53e1fe8c292dcb66098a1caf4c688e1d2.tar.gz
rockbox-f68463c53e1fe8c292dcb66098a1caf4c688e1d2.zip
quickscreen: Get rid of a vestigal remnant of the Archos code.
Change-Id: I1dd7e82edfdbcc3a79aa5deaa604ac1623aa16d4
-rw-r--r--apps/gui/quickscreen.c30
-rw-r--r--apps/gui/quickscreen.h3
2 files changed, 2 insertions, 31 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 87eb134c78..704133c1c4 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -174,7 +174,7 @@ static void gui_quickscreen_draw(const struct gui_quickscreen *qs,
174 int temp; 174 int temp;
175 display->set_viewport(parent); 175 display->set_viewport(parent);
176 display->clear_viewport(); 176 display->clear_viewport();
177 177
178 for (i = 0; i < QUICKSCREEN_ITEM_COUNT; i++) 178 for (i = 0; i < QUICKSCREEN_ITEM_COUNT; i++)
179 { 179 {
180 struct viewport *vp = &vps[i]; 180 struct viewport *vp = &vps[i];
@@ -318,7 +318,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente
318 bool can_quit = false; 318 bool can_quit = false;
319 319
320 push_current_activity(ACTIVITY_QUICKSCREEN); 320 push_current_activity(ACTIVITY_QUICKSCREEN);
321 321
322 FOR_NB_SCREENS(i) 322 FOR_NB_SCREENS(i)
323 { 323 {
324 screens[i].set_viewport(NULL); 324 screens[i].set_viewport(NULL);
@@ -435,32 +435,6 @@ bool quick_screen_quick(int button_enter)
435 return usb; 435 return usb;
436} 436}
437 437
438#ifdef BUTTON_F3
439bool quick_screen_f3(int button_enter)
440{
441 struct gui_quickscreen qs;
442 bool usb = false;
443 qs.items[QUICKSCREEN_TOP] = NULL;
444 qs.items[QUICKSCREEN_LEFT] =
445 find_setting(&global_settings.scrollbar, NULL);
446 qs.items[QUICKSCREEN_RIGHT] =
447 find_setting(&global_settings.statusbar, NULL);
448 qs.items[QUICKSCREEN_BOTTOM] =
449#ifdef HAVE_LCD_FLIP
450 find_setting(&global_settings.flip_display, NULL);
451#else
452 NULL;
453#endif
454 qs.callback = NULL;
455 if (gui_syncquickscreen_run(&qs, button_enter, &usb))
456 {
457 settings_save();
458 settings_apply(false);
459 }
460 return usb;
461}
462#endif /* BUTTON_F3 */
463
464/* stuff to make the quickscreen configurable */ 438/* stuff to make the quickscreen configurable */
465bool is_setting_quickscreenable(const struct settings_list *setting) 439bool is_setting_quickscreenable(const struct settings_list *setting)
466{ 440{
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h
index c725eae60a..acce5cf9bf 100644
--- a/apps/gui/quickscreen.h
+++ b/apps/gui/quickscreen.h
@@ -43,9 +43,6 @@ struct gui_quickscreen
43 item is changed */ 43 item is changed */
44}; 44};
45 45
46#ifdef BUTTON_F3
47extern bool quick_screen_f3(int button_enter);
48#endif
49extern bool quick_screen_quick(int button_enter); 46extern bool quick_screen_quick(int button_enter);
50int quickscreen_set_option(void *data); 47int quickscreen_set_option(void *data);
51bool is_setting_quickscreenable(const struct settings_list *setting); 48bool is_setting_quickscreenable(const struct settings_list *setting);