diff --git a/OverlayFormObj/OverlayForm.cs b/OverlayFormObj/OverlayForm.cs index afe077c..f8ef67a 100644 --- a/OverlayFormObj/OverlayForm.cs +++ b/OverlayFormObj/OverlayForm.cs @@ -81,7 +81,7 @@ namespace OverlayFormObj MainForm = this; InitializeFormSettings(); ConfigureTimers(); - LoadBackgroundImage(); + InitializeLabels(); ConfigureSegmentTimer(); imageYPos = (screenHeight / 3) - 1024 / 6; @@ -416,8 +416,7 @@ private Rectangle FindContentBounds(Bitmap bmp) firstStickerImage = null; this.Invalidate(); } - if (secondStickerImage == null) - LoadBackgroundImage(); + stickerTimer1.Stop(); HideImages(); }; @@ -429,8 +428,6 @@ private Rectangle FindContentBounds(Bitmap bmp) secondStickerImage = null; this.Invalidate(); } - if (firstStickerImage == null) - LoadBackgroundImage(); stickerTimer2.Stop(); HideImages(); }; @@ -540,40 +537,6 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e) 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() { bool anyStickersActive = false; @@ -810,8 +773,7 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e) if (firstStickerImage == null) { firstStickerImage = newSticker; - firstStickerXPos = this.Width / 2 - firstStickerImage.Width / 2; - LoadBackgroundImage(); + firstStickerXPos = this.Width / 2 - firstStickerImage.Width / 2; stickerTimer1.Start(); } else if (secondStickerImage == null)