Merge branch '250223FluentTest2' of https://github.com/onesounds/Flow.Launcher into 250223FluentTest2

This commit is contained in:
DB p 2025-03-16 18:11:14 +09:00
commit 09d66f5850
2 changed files with 8 additions and 10 deletions

View file

@ -20,7 +20,6 @@
Closing="OnClosing"
Deactivated="OnDeactivated"
Icon="Images/app.png"
SourceInitialized="OnSourceInitialized"
Initialized="OnInitialized"
Left="{Binding Settings.WindowLeft, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Loaded="OnLoaded"
@ -31,6 +30,7 @@
ResizeMode="CanResize"
ShowInTaskbar="False"
SizeToContent="Height"
SourceInitialized="OnSourceInitialized"
Topmost="True"
Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
WindowStartupLocation="Manual"
@ -377,7 +377,7 @@
Style="{DynamicResource SeparatorStyle}" />
</ContentControl>
</Grid>
<Border Style="{DynamicResource WindowRadius}">
<Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}">

View file

@ -38,9 +38,7 @@ namespace Flow.Launcher
public partial class MainWindow
{
#region Private Fields
private readonly Storyboard _progressBarStoryboard = new Storyboard();
private bool isProgressBarStoryboardPaused;
private readonly Settings _settings;
private NotifyIcon _notifyIcon;
private readonly ContextMenu contextMenu = new();
@ -185,19 +183,19 @@ namespace Flow.Launcher
PreviewMouseMove += MainPreviewMouseMove;
CheckFirstLaunch();
HideStartup();
// show notify icon when flowlauncher is hidden
// Show notify icon when flowlauncher is hidden
InitializeNotifyIcon();
InitializeColorScheme();
WindowsInteropHelper.DisableControlBox(this);
InitProgressbarAnimation();
// Move the window out of screen because setting backdrop will cause flicker with a rectangle
Left = Top = -10000;
await ThemeManager.Instance.RefreshFrameAsync();
// Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
InitializePosition();
InitializePosition();
// Refresh frame after position is intialized
await ThemeManager.Instance.RefreshFrameAsync();
PreviewReset();
// since the default main window visibility is visible
// so we need set focus during startup
// Since the default main window visibility is visible, so we need set focus during startup
QueryTextBox.Focus();
_viewModel.PropertyChanged += (o, e) =>