mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Added fade in animation support to TextAnimation
This commit is contained in:
parent
8809174267
commit
b3261335f9
2 changed files with 24 additions and 7 deletions
|
@ -51,24 +51,34 @@ private set
|
|||
}
|
||||
|
||||
public TimeSpan Duration { get; private set; }
|
||||
public TimeSpan FadeDuration { get; private set; }
|
||||
public TimeSpan FadeInDuration { get; private set; }
|
||||
public TimeSpan FadeOutDuration { get; private set; }
|
||||
|
||||
public TimeSpan TotalDuration => Duration + FadeDuration;
|
||||
public TimeSpan TotalDuration => FadeInDuration + Duration + FadeOutDuration;
|
||||
|
||||
public bool Active => timer.IsRunning && timer.Elapsed <= TotalDuration;
|
||||
|
||||
private Stopwatch timer = new Stopwatch();
|
||||
|
||||
public TextAnimation(TimeSpan duration, TimeSpan fadeDuration)
|
||||
public TextAnimation()
|
||||
{
|
||||
}
|
||||
|
||||
public TextAnimation(TimeSpan duration)
|
||||
{
|
||||
Duration = duration;
|
||||
FadeDuration = fadeDuration;
|
||||
}
|
||||
|
||||
public TextAnimation(TimeSpan duration, TimeSpan fadeInDuration, TimeSpan fadeOutDuration)
|
||||
{
|
||||
Duration = duration;
|
||||
FadeInDuration = fadeInDuration;
|
||||
FadeOutDuration = fadeOutDuration;
|
||||
}
|
||||
|
||||
public void Start(string text)
|
||||
{
|
||||
Text = text;
|
||||
Opacity = 1;
|
||||
timer.Restart();
|
||||
}
|
||||
|
||||
|
@ -81,7 +91,14 @@ public bool Update()
|
|||
{
|
||||
if (Active)
|
||||
{
|
||||
Opacity = 1 - (timer.Elapsed - Duration).TotalMilliseconds / FadeDuration.TotalMilliseconds;
|
||||
if (timer.Elapsed < FadeInDuration)
|
||||
{
|
||||
Opacity = timer.Elapsed.TotalMilliseconds / FadeInDuration.TotalMilliseconds;
|
||||
}
|
||||
else
|
||||
{
|
||||
Opacity = 1 - (timer.Elapsed - (FadeInDuration + Duration)).TotalMilliseconds / FadeOutDuration.TotalMilliseconds;
|
||||
}
|
||||
|
||||
if (Opacity == 0)
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@ internal partial class ShapeManager
|
|||
{
|
||||
public bool IsMenuCollapsed { get; private set; }
|
||||
|
||||
internal TextAnimation MenuTextAnimation = new TextAnimation(TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(0.5));
|
||||
internal TextAnimation MenuTextAnimation = new TextAnimation(TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(0.5), TimeSpan.FromSeconds(0.5));
|
||||
|
||||
private Form menuForm;
|
||||
private ToolStripEx tsMain;
|
||||
|
|
Loading…
Reference in a new issue