From f68463c53e1fe8c292dcb66098a1caf4c688e1d2 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 12 Oct 2020 19:26:26 -0400 Subject: quickscreen: Get rid of a vestigal remnant of the Archos code. Change-Id: I1dd7e82edfdbcc3a79aa5deaa604ac1623aa16d4 --- apps/gui/quickscreen.c | 30 ++---------------------------- apps/gui/quickscreen.h | 3 --- 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, int temp; display->set_viewport(parent); display->clear_viewport(); - + for (i = 0; i < QUICKSCREEN_ITEM_COUNT; i++) { struct viewport *vp = &vps[i]; @@ -318,7 +318,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente bool can_quit = false; push_current_activity(ACTIVITY_QUICKSCREEN); - + FOR_NB_SCREENS(i) { screens[i].set_viewport(NULL); @@ -435,32 +435,6 @@ bool quick_screen_quick(int button_enter) return usb; } -#ifdef BUTTON_F3 -bool quick_screen_f3(int button_enter) -{ - struct gui_quickscreen qs; - bool usb = false; - qs.items[QUICKSCREEN_TOP] = NULL; - qs.items[QUICKSCREEN_LEFT] = - find_setting(&global_settings.scrollbar, NULL); - qs.items[QUICKSCREEN_RIGHT] = - find_setting(&global_settings.statusbar, NULL); - qs.items[QUICKSCREEN_BOTTOM] = -#ifdef HAVE_LCD_FLIP - find_setting(&global_settings.flip_display, NULL); -#else - NULL; -#endif - qs.callback = NULL; - if (gui_syncquickscreen_run(&qs, button_enter, &usb)) - { - settings_save(); - settings_apply(false); - } - return usb; -} -#endif /* BUTTON_F3 */ - /* stuff to make the quickscreen configurable */ bool is_setting_quickscreenable(const struct settings_list *setting) { 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 item is changed */ }; -#ifdef BUTTON_F3 -extern bool quick_screen_f3(int button_enter); -#endif extern bool quick_screen_quick(int button_enter); int quickscreen_set_option(void *data); bool is_setting_quickscreenable(const struct settings_list *setting); -- cgit v1.2.3