From 07f151d906d3a760436c614ccee594539b32a614 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 19 Mar 2022 09:55:05 +0100
Subject: [PATCH] Moved TextListComponent and CarouselComponent from es-core to
 es-app.

---
 es-app/CMakeLists.txt                                    | 8 ++++++++
 {es-core => es-app}/src/components/CarouselComponent.cpp | 0
 {es-core => es-app}/src/components/CarouselComponent.h   | 0
 es-app/src/components/TextListComponent.cpp              | 9 +++++++++
 {es-core => es-app}/src/components/TextListComponent.h   | 0
 es-core/CMakeLists.txt                                   | 3 ---
 6 files changed, 17 insertions(+), 3 deletions(-)
 rename {es-core => es-app}/src/components/CarouselComponent.cpp (100%)
 rename {es-core => es-app}/src/components/CarouselComponent.h (100%)
 create mode 100644 es-app/src/components/TextListComponent.cpp
 rename {es-core => es-app}/src/components/TextListComponent.h (100%)

diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 7018fa207..159fc44c8 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -25,6 +25,10 @@ set(ES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/UIModeController.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h
 
+    # Primary GUI components
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/CarouselComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextListComponent.h
+
     # GUIs
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.h
@@ -72,6 +76,10 @@ set(ES_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/UIModeController.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp
 
+    # Primary GUI components
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/CarouselComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextListComponent.cpp
+
     # GUIs
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.cpp
diff --git a/es-core/src/components/CarouselComponent.cpp b/es-app/src/components/CarouselComponent.cpp
similarity index 100%
rename from es-core/src/components/CarouselComponent.cpp
rename to es-app/src/components/CarouselComponent.cpp
diff --git a/es-core/src/components/CarouselComponent.h b/es-app/src/components/CarouselComponent.h
similarity index 100%
rename from es-core/src/components/CarouselComponent.h
rename to es-app/src/components/CarouselComponent.h
diff --git a/es-app/src/components/TextListComponent.cpp b/es-app/src/components/TextListComponent.cpp
new file mode 100644
index 000000000..9ff694dd4
--- /dev/null
+++ b/es-app/src/components/TextListComponent.cpp
@@ -0,0 +1,9 @@
+//  SPDX-License-Identifier: MIT
+//
+//  EmulationStation Desktop Edition
+//  TextListComponent.cpp
+//
+//  Text list used for displaying and navigating the gamelist views.
+//
+
+#include "components/TextListComponent.h"
diff --git a/es-core/src/components/TextListComponent.h b/es-app/src/components/TextListComponent.h
similarity index 100%
rename from es-core/src/components/TextListComponent.h
rename to es-app/src/components/TextListComponent.h
diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt
index 856c57bfe..9f5470f06 100644
--- a/es-core/CMakeLists.txt
+++ b/es-core/CMakeLists.txt
@@ -36,7 +36,6 @@ set(CORE_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BadgeComponent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BusyComponent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ButtonComponent.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/CarouselComponent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentGrid.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentList.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/DateTimeComponent.h
@@ -60,7 +59,6 @@ set(CORE_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SwitchComponent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextComponent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextEditComponent.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextListComponent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoComponent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoFFmpegComponent.h
 
@@ -118,7 +116,6 @@ set(CORE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BadgeComponent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BusyComponent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ButtonComponent.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/CarouselComponent.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentGrid.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentList.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/components/DateTimeComponent.cpp