Skip to content

Commit 09d66f5

Browse files
committed
Merge branch '250223FluentTest2' of https://github.com/onesounds/Flow.Launcher into 250223FluentTest2
2 parents 70e7f82 + ecc9f0d commit 09d66f5

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

Flow.Launcher/MainWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
Closing="OnClosing"
2121
Deactivated="OnDeactivated"
2222
Icon="Images/app.png"
23-
SourceInitialized="OnSourceInitialized"
2423
Initialized="OnInitialized"
2524
Left="{Binding Settings.WindowLeft, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
2625
Loaded="OnLoaded"
@@ -31,6 +30,7 @@
3130
ResizeMode="CanResize"
3231
ShowInTaskbar="False"
3332
SizeToContent="Height"
33+
SourceInitialized="OnSourceInitialized"
3434
Topmost="True"
3535
Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
3636
WindowStartupLocation="Manual"
@@ -377,7 +377,7 @@
377377
Style="{DynamicResource SeparatorStyle}" />
378378
</ContentControl>
379379
</Grid>
380-
380+
381381
<Border Style="{DynamicResource WindowRadius}">
382382
<Border.Clip>
383383
<MultiBinding Converter="{StaticResource BorderClipConverter}">

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ namespace Flow.Launcher
3838
public partial class MainWindow
3939
{
4040
#region Private Fields
41-
42-
private readonly Storyboard _progressBarStoryboard = new Storyboard();
43-
private bool isProgressBarStoryboardPaused;
41+
4442
private readonly Settings _settings;
4543
private NotifyIcon _notifyIcon;
4644
private readonly ContextMenu contextMenu = new();
@@ -185,19 +183,19 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
185183
PreviewMouseMove += MainPreviewMouseMove;
186184
CheckFirstLaunch();
187185
HideStartup();
188-
// show notify icon when flowlauncher is hidden
186+
// Show notify icon when flowlauncher is hidden
189187
InitializeNotifyIcon();
190188
InitializeColorScheme();
191189
WindowsInteropHelper.DisableControlBox(this);
192190
InitProgressbarAnimation();
191+
// Move the window out of screen because setting backdrop will cause flicker with a rectangle
192+
Left = Top = -10000;
193+
await ThemeManager.Instance.RefreshFrameAsync();
193194
// Initialize call twice to work around multi-display alignment issue- https://github.com/Flow-Launcher/Flow.Launcher/issues/2910
194195
InitializePosition();
195196
InitializePosition();
196-
// Refresh frame after position is intialized
197-
await ThemeManager.Instance.RefreshFrameAsync();
198197
PreviewReset();
199-
// since the default main window visibility is visible
200-
// so we need set focus during startup
198+
// Since the default main window visibility is visible, so we need set focus during startup
201199
QueryTextBox.Focus();
202200

203201
_viewModel.PropertyChanged += (o, e) =>

0 commit comments

Comments
 (0)