Skip to content

Commit 2710de1

Browse files
committed
Fix Search Icon Opacity
1 parent 1b22d9c commit 2710de1

File tree

2 files changed

+45
-2
lines changed

2 files changed

+45
-2
lines changed

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,11 +566,14 @@ public void WindowAnimator()
566566
FillBehavior = FillBehavior.HoldEnd
567567
};
568568

569-
double TargetIconOpacity = SearchIcon.Opacity;
569+
double TargetIconOpacity = GetOpacityFromStyle(SearchIcon, SearchIcon.Style, 1.0); // 스타일에서 Opacity 가져오기
570+
571+
System.Diagnostics.Debug.WriteLine("스타일에서 가져온 투명도: " + TargetIconOpacity);
572+
570573
var IconOpacity = new DoubleAnimation
571574
{
572575
From = 0,
573-
To = 1,
576+
To = TargetIconOpacity,
574577
EasingFunction = easing,
575578
Duration = TimeSpan.FromMilliseconds(animationLength),
576579
FillBehavior = FillBehavior.HoldEnd
@@ -626,6 +629,23 @@ public void WindowAnimator()
626629
windowsb.Begin(FlowMainWindow);
627630
}
628631

632+
private double GetOpacityFromStyle(UIElement element, Style style, double defaultOpacity = 1.0)
633+
{
634+
if (style == null)
635+
return defaultOpacity;
636+
637+
foreach (Setter setter in style.Setters)
638+
{
639+
if (setter.Property == UIElement.OpacityProperty)
640+
{
641+
return setter.Value is double opacity ? opacity : defaultOpacity;
642+
}
643+
}
644+
645+
return defaultOpacity;
646+
}
647+
648+
629649
private bool _isClockPanelAnimating = false; // 애니메이션 실행 중인지 여부
630650

631651
private void UpdateClockPanelVisibility()

Flow.Launcher/Themes/Base.xaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,29 @@
165165
BasedOn="{StaticResource BaseClockPanel}"
166166
TargetType="{x:Type StackPanel}">
167167
<Setter Property="Orientation" Value="Vertical" />
168+
<!--<Setter Property="Visibility" Value="Collapsed" />
169+
<Style.Triggers>
170+
<MultiDataTrigger>
171+
<MultiDataTrigger.Conditions>
172+
<Condition Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0" />
173+
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
174+
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
175+
</MultiDataTrigger.Conditions>
176+
<Setter Property="Visibility" Value="Visible" />
177+
<MultiDataTrigger.EnterActions>
178+
<BeginStoryboard>
179+
<Storyboard>
180+
<DoubleAnimation
181+
Storyboard.TargetProperty="Opacity"
182+
From="0.0"
183+
To="1"
184+
Duration="0:0:0.25" />
185+
</Storyboard>
186+
</BeginStoryboard>
187+
</MultiDataTrigger.EnterActions>
188+
</MultiDataTrigger>
189+
</Style.Triggers>-->
190+
168191
</Style>
169192

170193
<!-- Item Style -->

0 commit comments

Comments
 (0)