From a43c483ceed9c99d136b57380e3a0a8cc287ac22 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 17 Dec 2022 09:01:22 +0900 Subject: [PATCH 1/5] Fix Blank Height with Preview --- Flow.Launcher/Themes/Base.xaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index 9f62b3e84..f5642314e 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -451,15 +451,16 @@ + + - From 2fda16cfd4d2c5f69681a5d028baf96c77981da8 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 17 Dec 2022 14:11:01 +0900 Subject: [PATCH 2/5] Remove Progressbar / Add Progress Ring --- Flow.Launcher/MainWindow.xaml | 22 ++++++++++------------ Flow.Launcher/MainWindow.xaml.cs | 15 ++++++++------- Flow.Launcher/Themes/Base.xaml | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index baf96e01c..29fe25670 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -261,6 +261,16 @@ + - diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 1689fa59d..8f592a89a 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -361,13 +361,14 @@ namespace Flow.Launcher } private void InitProgressbarAnimation() { - var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150, - new Duration(new TimeSpan(0, 0, 0, 0, 1600))); - var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 50, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); - Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)")); - Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); - _progressBarStoryboard.Children.Add(da); - _progressBarStoryboard.Children.Add(da1); + + //var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150, + // new Duration(new TimeSpan(0, 0, 0, 0, 1600))); + //var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 50, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); + //Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)")); + //Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); + //_progressBarStoryboard.Children.Add(da); + //_progressBarStoryboard.Children.Add(da1); _progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever; _viewModel.ProgressBarVisibility = Visibility.Hidden; diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index f5642314e..0b4460d46 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -366,7 +366,7 @@ - + From a299f36a41982e09848863ccbec610b54cbba718 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 17 Dec 2022 18:37:24 +0900 Subject: [PATCH 3/5] Adjust Progressbar --- Flow.Launcher/MainWindow.xaml | 25 +++++++++++++++---------- Flow.Launcher/MainWindow.xaml.cs | 15 +++++++-------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index 29fe25670..9f8d523e0 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -261,16 +261,6 @@ - + @@ -320,6 +324,7 @@ HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" /> + diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 8f592a89a..e816654f4 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -362,15 +362,14 @@ namespace Flow.Launcher private void InitProgressbarAnimation() { - //var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 150, - // new Duration(new TimeSpan(0, 0, 0, 0, 1600))); - //var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 50, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); - //Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)")); - //Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); - //_progressBarStoryboard.Children.Add(da); - //_progressBarStoryboard.Children.Add(da1); - _progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever; + var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); + var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 0, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); + Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)")); + Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); + _progressBarStoryboard.Children.Add(da); + _progressBarStoryboard.Children.Add(da1); + _progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever; _viewModel.ProgressBarVisibility = Visibility.Hidden; isProgressBarStoryboardPaused = true; } From b55d430bf8a08836e6cf0f8ae154fa14c13ff866 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 17 Dec 2022 20:13:18 +0900 Subject: [PATCH 4/5] Adjust Progress Line --- Flow.Launcher/MainWindow.xaml.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index e816654f4..76b541276 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -362,9 +362,8 @@ namespace Flow.Launcher private void InitProgressbarAnimation() { - var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); - var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 0, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); - + var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100, new Duration(new TimeSpan(0, 0, 0, 0, 1200))); + var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 0, new Duration(new TimeSpan(0, 0, 0, 0, 1200))); Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)")); Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); _progressBarStoryboard.Children.Add(da); From 1d6a0b402805c9444e72424bbd5e7fe45fbe837c Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 17 Dec 2022 20:16:29 +0900 Subject: [PATCH 5/5] formatting --- Flow.Launcher/MainWindow.xaml.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 76b541276..56c45aeb0 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -361,9 +361,8 @@ namespace Flow.Launcher } private void InitProgressbarAnimation() { - - var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100, new Duration(new TimeSpan(0, 0, 0, 0, 1200))); - var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 0, new Duration(new TimeSpan(0, 0, 0, 0, 1200))); + var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); + var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 0, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)")); Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); _progressBarStoryboard.Children.Add(da);