Ozone: Add a touch-sensitive "resume" button in the lower-right corner. (#17192)

This enhancement is particularly useful when using RetroArch with a touchscreen, as it allows you to resume content without needing to navigate back to the quick menu, thereby preserving the current menu screen.

menu/drivers/ozone.c

@@ -490,6 +490,7 @@ struct ozone_handle
       ozone_footer_label_t help;
       ozone_footer_label_t clear;
       ozone_footer_label_t scan;
+      ozone_footer_label_t resume;
    } footer_labels;
 
    struct
@@ -9117,6 +9118,12 @@ static void ozone_cache_footer_label(
  * menu language) and calculates pixel widths */
 static void ozone_cache_footer_labels(ozone_handle_t *ozone)
 {
+   /* Just the resume icon or text too?
+    * The former seems better to me. */
+   /* ozone_cache_footer_label(ozone,
+         &ozone->footer_labels.resume,
+         MENU_ENUM_SUBLABEL_RESUME_CONTENT);*/
+
    ozone_cache_footer_label(ozone,
          &ozone->footer_labels.ok,
          MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK);
@@ -10722,9 +10729,13 @@ static void ozone_draw_footer(
    bool manage_available                  =
          ozone_manage_available(ozone, selection);
 
+   bool resume_enabled                    =
+         !retroarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL);
+
    /* Determine x origin positions of each
     * button
     * > From right to left, these are ordered:
+    *   - resume
     *   - ok
     *   - back
     *   - (X) search
@@ -10735,9 +10746,14 @@ static void ozone_draw_footer(
     *   - (Start) reset to default (settings only)
     *   - (Start) manage playlist (sidebar only)
     *   - (Select) toggle metadata (playlists only)
-    *   - (Select) help (non-playlist only) */
-   float ok_x                             = (float)video_width
-         - footer_margin - ozone->footer_labels.ok.width - icon_size - icon_padding;
+    *   - (Select) help (non-playlist only)*/
+
+   float resume_x                    = (resume_enabled)
+         ? (float)video_width - footer_margin - ozone->footer_labels.resume.width - icon_size - icon_padding
+         : (float)video_width - footer_margin;
+
+   float ok_x                             = resume_x
+         - ozone->footer_labels.ok.width - icon_size - (2.0f * icon_padding);
    float back_x                           = ok_x
          - ozone->footer_labels.back.width - icon_size - (2.0f * icon_padding);
    float search_x                         = (search_enabled)
@@ -10795,6 +10811,25 @@ static void ozone_draw_footer(
 
       if (dispctx->draw)
       {
+         /* > Resume */
+         if (resume_enabled)
+            ozone_draw_icon(
+               p_disp,
+               userdata,
+               video_width,
+               video_height,
+               icon_size,
+               icon_size,
+               ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RESUME],
+               resume_x,
+               icon_y,
+               video_width,
+               video_height,
+               0.0f,
+               1.0f,
+               col,
+               mymat);
+
          /* > Ok */
          ozone_draw_icon(
                p_disp,
@@ -11110,6 +11145,21 @@ static void ozone_draw_footer(
             1.0f,
             false);
 
+   /* > Resume */
+      gfx_display_draw_text(
+            ozone->fonts.footer.font,
+            ozone->footer_labels.resume.str,
+            resume_x + icon_size + icon_padding_small,
+            footer_text_y,
+            video_width,
+            video_height,
+            ozone->theme->text_rgba,
+            TEXT_ALIGN_LEFT,
+            1.0f,
+            false,
+            1.0f,
+            false);
+
    /* > Reset to default */
    if (reset_to_default_available)
       gfx_display_draw_text(
@@ -12489,9 +12539,14 @@ static int ozone_tap_footer(
          && ozone_help_available(ozone, selection, settings->bools.menu_show_sublabels);
    bool manage_available                  =
          ozone_manage_available(ozone, selection);
+   bool resume_enabled                    =
+         !retroarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL);
 
-   float ok_x                             = (float)video_width
-         - footer_margin - ozone->footer_labels.ok.width - icon_size - icon_padding;
+   float resume_x                    = (resume_enabled)
+         ? (float)video_width - footer_margin - ozone->footer_labels.resume.width - icon_size - icon_padding
+         : (float)video_width - footer_margin;
+   float ok_x                             = resume_x
+         - ozone->footer_labels.ok.width - icon_size - (2.0f * icon_padding);
    float back_x                           = ok_x
          - ozone->footer_labels.back.width - icon_size - (2.0f * icon_padding);
    float search_x                         = (search_enabled)
@@ -12523,6 +12578,8 @@ static int ozone_tap_footer(
 
    if (x > (float)video_width - footer_margin)
       return ozone_menu_entry_action(ozone, entry, selection, MENU_ACTION_CANCEL);
+   else if (resume_enabled && x > resume_x)
+      return ozone_menu_entry_action(ozone, entry, selection, MENU_ACTION_RESUME);
    else if (x > ok_x)
       return ozone_menu_entry_action(ozone, entry, selection, MENU_ACTION_OK);
    else if (x > back_x)

menu/menu_defines.h

@@ -457,6 +457,7 @@ enum menu_action
    MENU_ACTION_SCROLL_HOME,
    MENU_ACTION_SCROLL_END,
    MENU_ACTION_TOGGLE,
+   MENU_ACTION_RESUME,
    MENU_ACTION_POINTER_MOVED,
    MENU_ACTION_POINTER_PRESSED,
    MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE,

menu/menu_driver.c

@@ -7714,6 +7714,9 @@ int generic_menu_entry_action(
             ret = cbs->action_scan(entry->path,
                   entry->label, entry->type, i);
          break;
+      case MENU_ACTION_RESUME:
+         command_event(CMD_EVENT_MENU_TOGGLE, NULL);
+         break;
       default:
          break;
    }