Skip to content

Commit c2887e2

Browse files
committed
Fix Color
1 parent ec03cc2 commit c2887e2

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:ui="http://schemas.modernwpf.com/2019">
66

77

8-
<Style TargetType="{x:Type TextBlock}">
8+
<Style TargetType="{x:Type ContentControl}">
99
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
1010
</Style>
1111

@@ -1450,6 +1450,7 @@
14501450

14511451
<Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button" />
14521452

1453+
14531454
<!-- - Custom Toggle Switch from modern wpf for left label -->
14541455
<system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>
14551456
<KeyTime x:Key="RepositionDuration">0:0:0.367</KeyTime>

Flow.Launcher/SettingWindow.xaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,6 +1674,7 @@
16741674
<Trigger Property="IsSelected" Value="true">
16751675
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
16761676
<Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
1677+
<Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
16771678
</Trigger>
16781679
</ControlTemplate.Triggers>
16791680
</ControlTemplate>
@@ -1704,11 +1705,6 @@
17041705
Text="{Binding}"
17051706
TextWrapping="Wrap" />
17061707
</Grid>
1707-
<DataTemplate.Triggers>
1708-
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
1709-
<Setter TargetName="ThemeName" Property="Foreground" Value="{DynamicResource Color02B}" />
1710-
</DataTrigger>
1711-
</DataTemplate.Triggers>
17121708
</DataTemplate>
17131709
</ListBox.ItemTemplate>
17141710
<ListBox.ItemsPanel>

0 commit comments

Comments
 (0)