修改bug0409
This commit is contained in:
parent
b5ae33f582
commit
74c5121eb7
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@ -69,7 +69,6 @@ namespace OverlayFormObj
|
|||||||
MainForm = this;
|
MainForm = this;
|
||||||
InitializeFormSettings();
|
InitializeFormSettings();
|
||||||
ConfigureTimers();
|
ConfigureTimers();
|
||||||
LoadBackgroundImage();
|
|
||||||
ConfigureImageDisplay();
|
ConfigureImageDisplay();
|
||||||
InitializeLabels();
|
InitializeLabels();
|
||||||
ConfigureSegmentTimer();
|
ConfigureSegmentTimer();
|
||||||
@ -404,8 +403,7 @@ private Rectangle FindContentBounds(Bitmap bmp)
|
|||||||
firstStickerImage = null;
|
firstStickerImage = null;
|
||||||
this.Invalidate();
|
this.Invalidate();
|
||||||
}
|
}
|
||||||
if (secondStickerImage == null)
|
|
||||||
LoadBackgroundImage();
|
|
||||||
stickerTimer1.Stop();
|
stickerTimer1.Stop();
|
||||||
HideImages();
|
HideImages();
|
||||||
};
|
};
|
||||||
@ -417,8 +415,7 @@ private Rectangle FindContentBounds(Bitmap bmp)
|
|||||||
secondStickerImage = null;
|
secondStickerImage = null;
|
||||||
this.Invalidate();
|
this.Invalidate();
|
||||||
}
|
}
|
||||||
if (firstStickerImage == null)
|
|
||||||
LoadBackgroundImage();
|
|
||||||
stickerTimer2.Stop();
|
stickerTimer2.Stop();
|
||||||
HideImages();
|
HideImages();
|
||||||
};
|
};
|
||||||
@ -528,19 +525,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()
|
private void ConfigureImageDisplay()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@ -550,7 +534,6 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e)
|
|||||||
imageYPos = (screenHeight / 3) - firstStickerImage.Height / 6;
|
imageYPos = (screenHeight / 3) - firstStickerImage.Height / 6;
|
||||||
|
|
||||||
|
|
||||||
LoadBackgroundImage();
|
|
||||||
|
|
||||||
|
|
||||||
stickerTimer1.Start();
|
stickerTimer1.Start();
|
||||||
@ -799,7 +782,6 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e)
|
|||||||
{
|
{
|
||||||
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)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net8.0-windows</TargetFramework>
|
<TargetFramework>net8.0-windows</TargetFramework>
|
||||||
<ApplicationIcon>Images/ksonglover.ico</ApplicationIcon>
|
<ApplicationIcon>Images/superstar.ico</ApplicationIcon>
|
||||||
<RootNamespace>superstar_1.0.0</RootNamespace>
|
<RootNamespace>superstar_1.0.0</RootNamespace>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user