Skip to content

Commit e201df9

Browse files
committed
- Fix Dropshadow
- Fix Progress Animation - Add Progress Color
1 parent d084793 commit e201df9

File tree

14 files changed

+26
-11
lines changed

14 files changed

+26
-11
lines changed

Flow.Launcher.Core/Resource/Theme.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public void AddDropShadowEffectToCurrentTheme()
243243
Property = Border.EffectProperty,
244244
Value = new DropShadowEffect
245245
{
246-
Opacity = 0.9,
246+
Opacity = 0.4,
247247
ShadowDepth = 2,
248248
BlurRadius = 15
249249
}

Flow.Launcher/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" />
104104
<Line x:Name="ProgressBar" HorizontalAlignment="Right"
105105
Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
106-
Y1="0" Y2="0" X2="100" Height="2" Width="Auto" StrokeThickness="1">
106+
Y1="0" Y2="0" X1="0" X2="100" Height="2" Width="752" StrokeThickness="1">
107107
</Line>
108108
</Grid>
109109

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ private void InitializeNotifyIcon()
207207

208208
private void InitProgressbarAnimation()
209209
{
210-
var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100,
210+
var da = new DoubleAnimation(ProgressBar.X2, 900 + 100,
211211
new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
212-
var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
212+
var da1 = new DoubleAnimation(ProgressBar.X1, 900, new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
213213
Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)"));
214214
Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)"));
215215
_progressBarStoryboard.Children.Add(da);

Flow.Launcher/Themes/BlackAndWhite.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
<Setter Property="Background" Value="#000000" />
1919
</Style>
2020
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" />
21-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" />
21+
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
22+
<Setter Property="Stroke" Value="White" />
23+
</Style>
2224
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
2325
<Setter Property="Foreground" Value="#FFFFF8" />
2426
</Style>

Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
</Style>
3535

3636
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
37+
<Setter Property="Stroke" Value="White" />
3738
</Style>
3839

3940
<!-- Item Style -->

Flow.Launcher/Themes/BlurBlack.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
</Style>
3434

3535
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
36+
<Setter Property="Stroke" Value="White" />
3637
</Style>
3738

3839
<!-- Item Style -->

Flow.Launcher/Themes/Discord Dark.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
</Style>
3030
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
3131
<Setter Property="Width" Value="576" />
32-
3332
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
3433
</Style>
35-
3634
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
35+
<Setter Property="Stroke" Value="#ffffff" />
36+
<Setter Property="Opacity" Value="0.6" />
3737
</Style>
3838

3939
<!-- Item Style -->

Flow.Launcher/Themes/League.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
2727
<Setter Property="Width" Value="576" />
2828
</Style>
29-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" ></Style>
29+
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
30+
<Setter Property="Stroke" Value="#32EC32" />
31+
</Style>
3032
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}" >
3133
<Setter Property="Foreground" Value="#a09b8c"></Setter>
3234
</Style>

Flow.Launcher/Themes/Nord Darker.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
</Style>
2323
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
2424
</Style>
25-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" />
25+
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
26+
<Setter Property="Stroke" Value="White" />
27+
</Style>
2628
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
2729
<Setter Property="Foreground" Value="#e5e9f0" />
2830
<Setter Property="FontWeight" Value="Bold" />

Flow.Launcher/Themes/Nord.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
</Style>
2323
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
2424
</Style>
25-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" />
25+
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
26+
<Setter Property="Stroke" Value="White" />
27+
</Style>
2628
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
2729
<Setter Property="Foreground" Value="#e5e9f0" />
2830
<Setter Property="FontWeight" Value="Bold" />

0 commit comments

Comments
 (0)