Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Fixed theme image merging issue with missing elements

Browse source
This commit is contained in:
Brian Fiete 2022-03-03 06:46:06 -08:00
parent 85acdda2b4
commit 20a932f5a7
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BeefTools/ImgCreate/ImgCreate.cpp
View file

@ -248,6 +248,9 @@ int main()
auto _HasUniqueThemeImage = [&](int col, int row, int size) auto _HasUniqueThemeImage = [&](int col, int row, int size)
{ {
if (!_HasImage(col, row, 1, size))
return false;
int scale = 1 << size; int scale = 1 << size;
auto srcImage0 = imageDatas[0][size]; auto srcImage0 = imageDatas[0][size];
if (srcImage0 == NULL) if (srcImage0 == NULL)

BIN
IDE/dist/images/ImgCreate.exe vendored
View file

Binary file not shown.

7
IDE/src/Settings.bf
View file

@ -469,6 +469,9 @@ namespace IDE
mColors.Deserialize(sd); mColors.Deserialize(sd);
} }
String imgCreatePath = scope String(gApp.mInstallDir, "images/ImgCreate.exe");
let imgCreateExeTime = File.GetLastWriteTime(imgCreatePath).GetValueOrDefault();
for (let theme in mTheme) for (let theme in mTheme)
{ {
String relPath = scope .()..Append(gApp.mInstallDir, "themes/"); String relPath = scope .()..Append(gApp.mInstallDir, "themes/");
@ -523,12 +526,12 @@ namespace IDE
needsRebuild = true; needsRebuild = true;
if (origImageTime > minDestImgTime) if (origImageTime > minDestImgTime)
needsRebuild = true; needsRebuild = true;
if (imgCreateExeTime > minDestImgTime)
needsRebuild = true;
} }
if (needsRebuild) if (needsRebuild)
{ {
String imgCreatePath = scope String(absPath, "../../images/ImgCreate.exe");
ProcessStartInfo procInfo = scope ProcessStartInfo(); ProcessStartInfo procInfo = scope ProcessStartInfo();
procInfo.UseShellExecute = false; procInfo.UseShellExecute = false;
procInfo.RedirectStandardError = true; procInfo.RedirectStandardError = true;