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

This commit is contained in:
Gericom
2026-04-04 10:01:15 +02:00
parent 127de36b1c
commit bec797ffe7
11 changed files with 62 additions and 4 deletions

View File

@@ -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),

View File

@@ -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;

View File

@@ -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;
};