Move menu_widgets to gfx/ and call it gfx_widgets

.vscode/settings.json

@@ -42,7 +42,7 @@
       "core_info.h": "c",
       "thread": "c",
       "xlocale": "c",
-      "menu_widgets.h": "c",
+      "gfx_widgets.h": "c",
       "message_queue.h": "c",
       "task_queue.h": "c",
       "fifo_queue.h": "c",

Makefile.common

@@ -840,7 +840,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/drivers/menu_generic.o \
 
    ifeq ($(HAVE_MENU_WIDGETS), 1)
-      OBJ += menu/widgets/menu_widgets.o
+      OBJ += gfx/gfx_widgets.o
    endif
 endif
 

cheevos-new/cheevos.c

@@ -37,7 +37,7 @@
 #include "../menu/menu_driver.h"
 #include "../menu/menu_entries.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../menu/widgets/menu_widgets.h"
+#include "../gfx/gfx_widgets.h"
 #endif
 #endif
 

gfx/common/metal_common.m

@@ -32,7 +32,7 @@
 #ifdef HAVE_MENU
 #import "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#import "../../menu/widgets/menu_widgets.h"
+#import "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/d3d10.c

@@ -42,7 +42,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/d3d11.c

@@ -32,7 +32,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/d3d12.c

@@ -38,7 +38,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/d3d9.c

@@ -59,7 +59,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/gl.c

@@ -80,7 +80,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/gl1.c

@@ -35,7 +35,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/gl_core.c

@@ -47,7 +47,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/gx2_gfx.c

@@ -34,7 +34,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/metal.m

@@ -38,7 +38,7 @@
 #ifdef HAVE_MENU
 #import "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#import "../../menu/widgets/menu_widgets.h"
+#import "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/vita2d_gfx.c

@@ -27,7 +27,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/drivers/vulkan.c

@@ -37,7 +37,7 @@
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx_widgets.h"
 #endif
 #endif
 

gfx/gfx_widgets.c

@@ -24,19 +24,19 @@
 #include <string/stdstring.h>
 #include <retro_math.h>
 
-#include "menu_widgets.h"
+#include "gfx_widgets.h"
+
+#include "gfx_animation.h"
+#include "gfx_display.h"
+#include "font_driver.h"
 
 #ifdef HAVE_ACCESSIBILITY
-#include "../../accessibility.h"
+#include "../accessibility.h"
 #endif
 
-#include "../../msg_hash.h"
+#include "../msg_hash.h"
 
-#include "../../tasks/task_content.h"
-
-#include "../../gfx/gfx_animation.h"
-#include "../../gfx/gfx_display.h"
-#include "../../gfx/font_driver.h"
+#include "../tasks/task_content.h"
 
 /* TODO: Fix context reset freezing everything in place (probably kills animations when it shouldn't anymore) */
 

griffin/griffin.c

@@ -1274,7 +1274,7 @@ MENU
 #include "../menu/widgets/menu_dialog.c"
 #include "../menu/widgets/menu_input_bind_dialog.c"
 #ifdef HAVE_MENU_WIDGETS
-#include "../menu/widgets/menu_widgets.c"
+#include "../gfx/gfx_widgets.c"
 #endif
 #include "../menu/widgets/menu_osk.c"
 #include "../menu/cbs/menu_cbs_ok.c"

menu/drivers/rgui.c

@@ -40,7 +40,7 @@
 #endif
 
 #if defined(HAVE_MENU_WIDGETS)
-#include "../widgets/menu_widgets.h"
+#include "../../gfx/gfx_widgets.h"
 #endif
 
 #include "../../playlist.h"

menu/menu_driver.c

@@ -40,7 +40,7 @@
 #include "menu_entries.h"
 #include "widgets/menu_dialog.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "widgets/menu_widgets.h"
+#include "../gfx/gfx_widgets.h"
 #endif
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
 #include "menu_shader.h"

retroarch.c

@@ -140,7 +140,7 @@
 #include "menu/widgets/menu_dialog.h"
 #include "menu/widgets/menu_input_bind_dialog.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "menu/widgets/menu_widgets.h"
+#include "gfx/gfx_widgets.h"
 #endif
 #include "menu/widgets/menu_osk.h"
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)

tasks/task_content.c

@@ -73,7 +73,7 @@
 #ifdef HAVE_MENU
 #include "../menu/menu_driver.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx/gfx_widgets.h"
 #endif
 #endif
 

tasks/task_screenshot.c

@@ -44,7 +44,7 @@
 #endif
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
-#include "../../menu/widgets/menu_widgets.h"
+#include "../gfx/gfx_widgets.h"
 #endif
 
 #include "../defaults.h"

wifi/drivers/connmanctl.c

@@ -24,7 +24,7 @@
 #include "../../retroarch.h"
 #include "../../lakka.h"
 #ifdef HAVE_MENU_WIDGETS
-#include "../../menu/widgets/menu_widgets.h"
+#include "../../gfx/gfx_widgets.h"
 #endif
 
 static bool connman_cache[256]   = {0};