Leecheng/superstar
Archived
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test #1

Merged
jasonchenwork merged 64 commits from test into master 2025-03-18 17:32:23 +08:00
Conversation 0 Commits 64 Files Changed 1969 +3 -41
1 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9dc42d320 - Show all commits

44
OverlayFormObj/OverlayForm.cs
View File

@ -81,7 +81,7 @@ namespace OverlayFormObj
MainForm = this; MainForm = this;
InitializeFormSettings(); InitializeFormSettings();
ConfigureTimers(); ConfigureTimers();
LoadBackgroundImage();
InitializeLabels(); InitializeLabels();
ConfigureSegmentTimer(); ConfigureSegmentTimer();
imageYPos = (screenHeight / 3) - 1024 / 6; imageYPos = (screenHeight / 3) - 1024 / 6;
@ -416,8 +416,7 @@ private Rectangle FindContentBounds(Bitmap bmp)
firstStickerImage = null; firstStickerImage = null;
this.Invalidate(); this.Invalidate();
} }
if (secondStickerImage == null)
LoadBackgroundImage();
stickerTimer1.Stop(); stickerTimer1.Stop();
HideImages(); HideImages();
}; };
@ -429,8 +428,6 @@ private Rectangle FindContentBounds(Bitmap bmp)
secondStickerImage = null; secondStickerImage = null;
this.Invalidate(); this.Invalidate();
} }
if (firstStickerImage == null)
LoadBackgroundImage();
stickerTimer2.Stop(); stickerTimer2.Stop();
HideImages(); HideImages();
}; };
@ -540,40 +537,6 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e)
unifiedTimer.Start(); unifiedTimer.Start();
} }
private void LoadBackgroundImage()
{
// try
// {
// backgroundImage = Image.FromFile(Path.Combine(Application.StartupPath, "themes\\superstar\\images.jpg"));
// }
// catch (Exception ex)
// {
// Console.WriteLine("Error loading background image: " + ex.Message);
// backgroundImage = null;
// }
}
private void ConfigureImageDisplay()
{
try
{
firstStickerImage = Image.FromFile(Path.Combine(Application.StartupPath, "superstar-pic/1-1.png"));
firstStickerXPos = this.Width / 2;
imageYPos = (screenHeight / 3) - firstStickerImage.Height / 6;
LoadBackgroundImage();
stickerTimer1.Start();
}
catch (Exception ex)
{
Console.WriteLine("Error loading initial sticker image: " + ex.Message);
firstStickerImage = null;
}
}
private void HideImages() private void HideImages()
{ {
bool anyStickersActive = false; bool anyStickersActive = false;
@ -810,8 +773,7 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e)
if (firstStickerImage == null) if (firstStickerImage == null)
{ {
firstStickerImage = newSticker; firstStickerImage = newSticker;
firstStickerXPos = this.Width / 2 - firstStickerImage.Width / 2; firstStickerXPos = this.Width / 2 - firstStickerImage.Width / 2;
LoadBackgroundImage();
stickerTimer1.Start(); stickerTimer1.Start();
} }
else if (secondStickerImage == null) else if (secondStickerImage == null)