Add ability to set the position of the top screen cover image in custom themes

arm9/source/romBrowser/Theme/IRomBrowserViewFactory.h

@@ -35,6 +35,8 @@ public:
     virtual FileRecyclerAdapter* CreateCoverFlowRecyclerAdapter(
         RomBrowserViewModel* viewModel, const IThemeFileIconFactory* themeFileIconFactory,
         VBlankTextureLoader* vblankTextureLoader) const = 0;
+
+    virtual Point GetTopCoverPosition() const = 0;
 };
 
 inline IRomBrowserViewFactory::~IRomBrowserViewFactory() { }

arm9/source/romBrowser/Theme/Material/MaterialRomBrowserViewFactory.h

@@ -65,6 +65,11 @@ public:
             themeFileIconFactory, this, vblankTextureLoader, &viewModel->GetCoverRepository());
     }
 
+    Point GetTopCoverPosition() const override
+    {
+        return Point(75, 18);
+    }
+
 private:
     const MaterialColorScheme* _materialColorScheme;
     const IFontRepository* _fontRepository;

arm9/source/romBrowser/Theme/custom/CustomRomBrowserViewFactory.h

@@ -7,12 +7,12 @@
 #include "romBrowser/views/CoverFlowRecyclerView.h"
 #include "romBrowser/viewModels/RomBrowserViewModel.h"
 #include "romBrowser/DisplayMode/CoverFlowFileRecyclerAdapter.h"
+#include "themes/custom/CustomThemeInfo.h"
 
 class MaterialColorScheme;
 class ITheme;
 class VramContext;
 class IFontRepository;
-class CustomThemeInfo;
 
 class CustomRomBrowserViewFactory : public IRomBrowserViewFactory
 {
@@ -65,6 +65,11 @@ public:
             themeFileIconFactory, this, vblankTextureLoader, &viewModel->GetCoverRepository());
     }
 
+    Point GetTopCoverPosition() const override
+    {
+        return _customThemeInfo->topCoverInfo.GetPosition();
+    }
+
     void LoadResources(const ITheme& theme, const VramContext& mainVramContext);
 
 private:

arm9/source/romBrowser/views/RomBrowserTopScreenView.cpp

@@ -20,6 +20,7 @@ RomBrowserTopScreenView::RomBrowserTopScreenView(
     , _themeFileIconFactory(themeFileIconFactory)
     , _fileInfoView(romBrowserViewFactory->CreateFileInfoView())
     , _showCover(displayMode->ShowCoverOnTopScreen())
+    , _coverPosition(romBrowserViewFactory->GetTopCoverPosition())
 {
     AddChildTail(_fileInfoView.get());
 }
@@ -135,11 +136,11 @@ void RomBrowserTopScreenView::VBlank()
         REG_BG3PB_SUB = 0;
         REG_BG3PC_SUB = 0;
         REG_BG3PD_SUB = -0x100;
-        REG_BG3X_SUB = -75 << 8;
-        REG_BG3Y_SUB = 113 << 8;
+        REG_BG3X_SUB = (-_coverPosition.x) << 8;
+        REG_BG3Y_SUB = (96 + _coverPosition.y - 1) << 8;
         REG_BG3CNT_SUB = 0x0705;
         REG_DISPCNT_SUB |= ((1 << 3) | (1 << 5)) << 8;
-        gfx_setSubWindow0(75, 18, 75 + 106, 18 + 96);
+        gfx_setSubWindow0(_coverPosition.x, _coverPosition.y, _coverPosition.x + 106, _coverPosition.y + 96);
         REG_WININ_SUB = 0x002A;
         REG_WINOUT_SUB = ~(1 << 3);
     }

arm9/source/romBrowser/views/RomBrowserTopScreenView.h

@@ -36,4 +36,5 @@ private:
     bool _iconGraphicsUploaded = false;
     bool _coverGraphicsUploaded = false;
     bool _showCover;
+    Point _coverPosition;
 };

arm9/source/themes/custom/CustomTheme.cpp

@@ -25,6 +25,7 @@
 #define KEY_TOP_BANNER_TEXT_LINE_1      "topBannerTextLine1"
 #define KEY_TOP_BANNER_TEXT_LINE_2      "topBannerTextLine2"
 #define KEY_TOP_FILE_NAME_TEXT          "topFileNameText"
+#define KEY_TOP_COVER                   "topCover"
 #define KEY_GRID_ICON                   "gridIcon"
 #define KEY_BANNER_LIST_ICON            "bannerListIcon"
 #define KEY_BANNER_LIST_TEXT_LINE_0     "bannerListTextLine0"
@@ -43,6 +44,7 @@ static const CustomThemeInfo sDefaultCustomThemeInfo
     .topBannerTextLine1Info = CustomTopTextElementInfo(Point(70, 141), 176, Rgb8(30, 30, 30), Rgb8(200, 200, 200)),
     .topBannerTextLine2Info = CustomTopTextElementInfo(Point(70, 155), 176, Rgb8(30, 30, 30), Rgb8(200, 200, 200)),
     .topFileNameTextInfo = CustomTopTextElementInfo(Point(18, 170), 220, Rgb8(30, 30, 30), Rgb8(200, 200, 200)),
+    .topCoverInfo = CustomTopCoverInfo(Point(75, 18)),
 
     .gridIconInfo = CustomBottomIconInfo(Rgb8(200, 200, 200)),
 
@@ -122,6 +124,18 @@ static CustomTopIconInfo parseCustomTopIconInfo(const JsonObjectConst& json, con
     );
 }
 
+static CustomTopCoverInfo parseCustomTopCoverInfo(const JsonObjectConst& json, const CustomTopCoverInfo& defaultInfo)
+{
+    if (json.isNull())
+    {
+        return defaultInfo;
+    }
+
+    return CustomTopCoverInfo(
+        parsePoint(json[KEY_ELEMENT_POSITION], defaultInfo.GetPosition())
+    );
+}
+
 static CustomTopTextElementInfo parseCustomTextElementInfo(
     const JsonObjectConst& json, const CustomTopTextElementInfo& defaultInfo)
 {
@@ -151,6 +165,7 @@ static CustomThemeInfo parseCustomThemeInfo(const JsonDocument& json)
             json[KEY_TOP_BANNER_TEXT_LINE_2], sDefaultCustomThemeInfo.topBannerTextLine2Info),
         .topFileNameTextInfo = parseCustomTextElementInfo(
             json[KEY_TOP_FILE_NAME_TEXT], sDefaultCustomThemeInfo.topFileNameTextInfo),
+        .topCoverInfo = parseCustomTopCoverInfo(json[KEY_TOP_COVER], sDefaultCustomThemeInfo.topCoverInfo),
 
         .gridIconInfo = parseCustomBottomIconInfo(json[KEY_GRID_ICON], sDefaultCustomThemeInfo.gridIconInfo),
 

arm9/source/themes/custom/CustomThemeInfo.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "CustomBannerListTextElementInfo.h"
 #include "CustomBottomIconInfo.h"
+#include "CustomTopCoverInfo.h"
 #include "CustomTopIconInfo.h"
 #include "CustomTextElementInfo.h"
 
@@ -11,6 +12,7 @@ struct CustomThemeInfo
     CustomTopTextElementInfo topBannerTextLine1Info;
     CustomTopTextElementInfo topBannerTextLine2Info;
     CustomTopTextElementInfo topFileNameTextInfo;
+    CustomTopCoverInfo topCoverInfo;
 
     CustomBottomIconInfo gridIconInfo;
 

arm9/source/themes/custom/CustomTopCoverInfo.h

@@ -0,0 +1,14 @@
+#pragma once
+#include "core/math/Point.h"
+
+class CustomTopCoverInfo
+{
+public:
+    CustomTopCoverInfo(const Point& position)
+        : _position(position) { }
+
+    const Point& GetPosition() const { return _position; }
+
+private:
+    Point _position;
+};