[griffin.display] make the return entry a regular button

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

1 files changed, 18 insertions, 5 deletions

diff --git a/src/eulogium.c b/src/eulogium.c
index 22f05a7..78d0ce8 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -430,6 +430,15 @@ static struct menu_def menu_settings_network = {
 	.title = "NETWORK",
 	.entry = {
 		{
+			.icon = "user-home",
+			.label = "Return",
+			.end = NULL,
+			.footer = "Return to Main menu",
+			.footer_alt = NULL,
+			.func = &_cb_content_prev_set,
+			.toggle_timer = NULL,
+			.data = NULL,
+		}, {
 			.icon = NULL,
 			.label = "Network info",
 			.end = NULL,
@@ -661,10 +670,12 @@ static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, v
 			content = eulogium_tripple_button_menu(eulogium->navi, &but_print_local, &but_print_mmc, &but_return);
 		if (eeze_disk_type_get(mount->disk) == EEZE_DISK_TYPE_USB)
 			content = eulogium_tripple_button_menu(eulogium->navi, &but_print_local, &but_print_usb, &but_return);
+		if (!content)
+			return;
+		elm_naviframe_item_simple_push(eulogium->navi, content);
 	}
 	if (!content)
 		return;
-
 	elm_naviframe_item_simple_push(eulogium->navi, content);
 }
 
@@ -1452,12 +1463,14 @@ Evas_Object *eulogium_print_menu(struct eulogium_data *eulogium, char *filepath)
 	return box;
 }
 
-static void _update_footer_unfocus_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+static void _update_menu_footer_unfocus_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
 	struct menu_entry_def *entry = data;
 
-	if (entry->toggle_timer)
+	if (entry->toggle_timer) {
 		ecore_timer_del(entry->toggle_timer);
+		entry->toggle_timer = NULL;
+	}
 }
 
 static Eina_Bool _timer_footer_toggle_cb(void *data)
@@ -1475,7 +1488,7 @@ static Eina_Bool _timer_footer_toggle_cb(void *data)
 	return ECORE_CALLBACK_RENEW;
 }
 
-static void _update_footer_focus_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+static void _update_menu_footer_focus_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
 	struct menu_entry_def *entry = data;
 	Evas_Object *footer = entry->data;
@@ -1537,8 +1550,8 @@ Evas_Object *menu_widget_list(struct eulogium_data *eulogium, Evas_Object *paren
 	}
 
 	eulogium_button_list_go(list);
-//	evas_object_smart_callback_add(list, "longpressed", _cb_filelist_filedetails, NULL); /* TODO, use inwin */
 	evas_object_show(list);
+	elm_box_pack_end(box, list);
 
 	obj = elm_separator_add(box);
 	elm_separator_horizontal_set(obj, EINA_TRUE);