Merge branch 'dev' into delete_clipboard_jsonrpc

Author: Jack251970

Flow.Launcher/MainWindow.xaml.cs

@@ -137,6 +137,13 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
             else
             {
                 _viewModel.Show();
+                // When HideOnStartup is off and UseAnimation is on,
+                // there was a bug where the clock would not appear at all on the initial launch
+                // So we need to forcibly trigger animation here to ensure the clock is visible
+                if (_settings.UseAnimation)
+                {
+                    WindowAnimation();
+                }
             }
 
             // Initialize context menu & notify icon
@@ -881,10 +888,10 @@ private void WindowAnimation()
                 FillBehavior = FillBehavior.HoldEnd
             };
 
-            Storyboard.SetTargetProperty(ClockOpacity, new PropertyPath(OpacityProperty));
             Storyboard.SetTarget(ClockOpacity, ClockPanel);
+            Storyboard.SetTargetProperty(ClockOpacity, new PropertyPath(OpacityProperty));
 
-            Storyboard.SetTargetName(thicknessAnimation, "ClockPanel");
+            Storyboard.SetTarget(thicknessAnimation, ClockPanel);
             Storyboard.SetTargetProperty(thicknessAnimation, new PropertyPath(MarginProperty));
 
             Storyboard.SetTarget(IconMotion, SearchIcon);

Flow.Launcher/Resources/CustomControlTemplate.xaml

@@ -2823,7 +2823,6 @@
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
-                            <Setter Property="Background" Value="{DynamicResource CustomNumberBoxBGDisabled}" />
                             <Setter TargetName="BorderElementInline" Property="Background" Value="{DynamicResource TextControlBackgroundDisabled}" />
                             <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
                             <Setter TargetName="BorderElement" Property="BorderThickness" Value="0 0 0 0" />

Flow.Launcher/Resources/Dark.xaml

@@ -107,6 +107,7 @@
     <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
     <Color x:Key="NumberBoxColor25">#464646</Color>
     <Color x:Key="NumberBoxColor26">#ffffff</Color>
+    <SolidColorBrush x:Key="NumberBoxPlaceHolder" Color="#464646" />
     <Color x:Key="HoverStoreGrid">#272727</Color>
 
     <!--  Resources for HotkeyControl  -->