prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Clock Animation

Browse source
This commit is contained in:
DB p 2025-03-06 20:49:14 +09:00
parent 624fa0eec3
commit 1b22d9cdfb
2 changed files with 87 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
Flow.Launcher/MainWindow.xaml.cs
View file

@ -309,6 +309,18 @@ namespace Flow.Launcher
break;
}
};
// ✅ QueryTextBox.Text 변경 감지 (글자 수 1 이상일 때만 동작하도록 수정)
QueryTextBox.TextChanged += (sender, e) => UpdateClockPanelVisibility();
// ✅ ContextMenu.Visibility 변경 감지
DependencyPropertyDescriptor
.FromProperty(UIElement.VisibilityProperty, typeof(ContextMenu))
.AddValueChanged(ContextMenu, (s, e) => UpdateClockPanelVisibility());
// ✅ History.Visibility 변경 감지
DependencyPropertyDescriptor
.FromProperty(UIElement.VisibilityProperty, typeof(StackPanel)) // History는 StackPanel이라고 가정
.AddValueChanged(History, (s, e) => UpdateClockPanelVisibility());
}
private void InitializePosition()
@ -614,6 +626,81 @@ namespace Flow.Launcher
windowsb.Begin(FlowMainWindow);
}
private bool _isClockPanelAnimating = false; // 애니메이션 실행 중인지 여부
private void UpdateClockPanelVisibility()
{
if (QueryTextBox == null || ContextMenu == null || History == null || ClockPanel == null)
return;
// ✅ `WindowAnimator`와 동일한 애니메이션 속도 설정 참조
var animationLength = _settings.AnimationSpeed switch
{
AnimationSpeeds.Slow => 560,
AnimationSpeeds.Medium => 360,
AnimationSpeeds.Fast => 160,
_ => _settings.CustomAnimationLength
};
var animationDuration = TimeSpan.FromMilliseconds(animationLength * 2 / 3); // ✅ 같은 비율 적용
// ✅ 글자 수가 1 이상이면 애니메이션 추가 실행 방지
if (QueryTextBox.Text.Length > 0 ||
ContextMenu.Visibility != Visibility.Collapsed ||
History.Visibility != Visibility.Collapsed)
{
if (ClockPanel.Visibility == Visibility.Hidden || _isClockPanelAnimating)
return; // ✅ 이미 숨겨져 있거나 애니메이션 실행 중이면 다시 실행하지 않음
_isClockPanelAnimating = true;
// Opacity 애니메이션 적용 후 Visibility.Hidden 처리
var fadeOut = new DoubleAnimation
{
From = 1.0,
To = 0.0,
Duration = animationDuration,
FillBehavior = FillBehavior.Stop
};
fadeOut.Completed += (s, e) =>
{
ClockPanel.Visibility = Visibility.Hidden;
_isClockPanelAnimating = false;
};
ClockPanel.BeginAnimation(UIElement.OpacityProperty, fadeOut);
}
else
{
if (ClockPanel.Visibility == Visibility.Visible || _isClockPanelAnimating)
return; // ✅ 이미 표시 중이거나 애니메이션 실행 중이면 다시 실행하지 않음
_isClockPanelAnimating = true;
// ✅ Dispatcher를 사용하여 UI 업데이트 후 `ClockPanel` 표시
System.Windows.Application.Current.Dispatcher.Invoke(() =>
{
ClockPanel.Visibility = Visibility.Visible;
// Opacity 애니메이션 적용
var fadeIn = new DoubleAnimation
{
From = 0.0,
To = 1.0,
Duration = animationDuration,
FillBehavior = FillBehavior.HoldEnd
};
fadeIn.Completed += (s, e) => _isClockPanelAnimating = false;
ClockPanel.BeginAnimation(UIElement.OpacityProperty, fadeIn);
}, DispatcherPriority.Render);
}
}
private void InitSoundEffects()

23
Flow.Launcher/Themes/Base.xaml
View file

@ -165,29 +165,6 @@
BasedOn="{StaticResource BaseClockPanel}"
TargetType="{x:Type StackPanel}">
<Setter Property="Orientation" Value="Vertical" />
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0" />
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
</MultiDataTrigger.Conditions>
<Setter Property="Visibility" Value="Visible" />
<MultiDataTrigger.EnterActions>
<BeginStoryboard>
<Storyboard>
<DoubleAnimation
Storyboard.TargetProperty="Opacity"
From="0.0"
To="1"
Duration="0:0:0.25" />
</Storyboard>
</BeginStoryboard>
</MultiDataTrigger.EnterActions>
</MultiDataTrigger>
</Style.Triggers>
</Style>
<!-- Item Style -->