Fixes for light/dark themes
MODIFY
WalletWasabi.Fluent/Styles/FlyoutPresenter.axaml
WalletWasabi.Fluent/Styles/FlyoutPresenter.axaml
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Fluent.Controls">
+
<Design.PreviewWith>
<Border Padding="20">
<FlyoutPresenter>
</Border>
</Design.PreviewWith>
- <Style Selector="FlyoutPresenter.search">
+ <Style Selector="FlyoutPresenter">
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="BorderBrush" Value="{DynamicResource TileBorderColor}" />
<Setter Property="MaxHeight" Value="{DynamicResource FlyoutThemeMaxHeight}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource AcrylicTrimForeground}" />
<Setter Property="CornerRadius" Value="8 8 8 8" />
<Setter Property="Template">
<ControlTemplate>

MODIFY
WalletWasabi.Fluent/Views/SearchBar/SearchBar.axaml
WalletWasabi.Fluent/Views/SearchBar/SearchBar.axaml
<Style Selector="TextBox#SearchBox">
<Setter Property="Background" Value="Transparent" />
- <Setter Property="BorderBrush" Value="{DynamicResource TileBorderColor}" />
+ <Setter Property="BorderBrush" Value="{DynamicResource AcrylicTrimForeground}" />
<Setter Property="BorderThickness" Value="1 1 1 1" />
<Setter Property="Margin" Value="0" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Padding" Value="6 3" />
+ <Setter Property="Foreground" Value="{DynamicResource AcrylicTrimForeground}" />
<Setter Property="VerticalContentAlignment" Value="Center" />
</Style>
+ <Style Selector="PathIcon">
+ <Setter Property="Foreground" Value="{DynamicResource AcrylicTrimForeground}" />
+ </Style>
+
<Style Selector="TextBox#SearchBox /template/ Border#PART_BorderElement">
<Setter Property="CornerRadius" Value="5" />
</Style>
<Style
Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:pointerover /template/ TextBlock#PART_FloatingWatermark">
- <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
+ <Setter Property="Foreground">
+ <SolidColorBrush Opacity="0.7" Color="{DynamicResource AcrylicTrimForeground}" />
+ </Setter>
</Style>
<!-- Focused State -->
<Style Selector="TextBox:focus">
- <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
+ <Setter Property="Foreground" Value="{DynamicResource AcrylicTrimForeground}" />
<Setter Property="Cursor" Value="Arrow" />
</Style>
<Style
Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
- <Setter Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
+ <Setter Property="Foreground">
+ <SolidColorBrush Opacity="0.5" Color="{DynamicResource AcrylicTrimForeground}" />
+ </Setter>
</Style>
<Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
<Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
</Style>
- <Style Selector="FlyoutPresenter.search">
+ <Style Selector="FlyoutPresenter">
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
</Style>
<TextBox x:Name="SearchBox" Watermark="Search settings / advanced features" HorizontalAlignment="Left"
Text="{Binding SearchText, Mode=TwoWay}" Width="400" VerticalAlignment="Center">
<TextBox.InnerLeftContent>
- <PathIcon Data="{StaticResource action_center_regular}" Margin="10 0" />
+ <PathIcon Data="{DynamicResource action_center_regular}" Margin="10 0" />
</TextBox.InnerLeftContent>
<TextBox.InnerRightContent>
- <PathIcon Data="{StaticResource search_regular}" Margin="10 0" />
+ <PathIcon Data="{DynamicResource search_regular}" Margin="10 0" />
</TextBox.InnerRightContent>
</TextBox>
<FlyoutBase.AttachedFlyout>
- <Flyout Placement="Bottom" ShowMode="Transient" FlyoutPresenterClasses="search">
+ <Flyout Placement="Bottom" ShowMode="Transient">
<s:SearchBarDropdown Width="400" x:Name="SearchBarDropdown" />
</Flyout>
</FlyoutBase.AttachedFlyout>

MODIFY
WalletWasabi.Fluent/Views/SearchBar/SearchBarDropdown.axaml
WalletWasabi.Fluent/Views/SearchBar/SearchBarDropdown.axaml
<Setter Property="FontFamily" Value="Arial" />
</Style>
+ <Style Selector="Button.searchItem /template/ ContentPresenter">
+ <Setter Property="Background" Value="Transparent" />
+ </Style>
+
+ <Style Selector="Button:pointerover.searchItem /template/ ContentPresenter">
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource AcrylicTrimForeground}" />
+ <Setter Property="Background">
+ <Setter.Value>
+ <SolidColorBrush Opacity="0.3" Color="{DynamicResource AcrylicTrimForeground}" />
+ </Setter.Value>
+ </Setter>
+ </Style>
+
</UserControl.Styles>
<UserControl.DataTemplates>
<DataTemplate DataType="sb:NonActionableSearchItem">
+
<DockPanel Background="Transparent" Margin="10">
<Panel DockPanel.Dock="Left" Width="16" Height="16" Opacity="0.8" VerticalAlignment="Center">
<!--TODO: Remove this workaround. We must leave the PathIcon only-->
</DataTemplate>
<DataTemplate DataType="sb:AutocloseActionableItem">
- <Button Command="{Binding Command}" Background="Transparent" HorizontalAlignment="Stretch" Padding="0">
+
+ <Button Command="{Binding Command}" Classes="searchItem" Background="Transparent" Foreground="{DynamicResource AcrylicTrimForeground}" HorizontalAlignment="Stretch" Padding="0">
<DockPanel Background="Transparent" Margin="10">
<Panel DockPanel.Dock="Left" Width="16" Height="16" Opacity="0.8" VerticalAlignment="Center">
<!--TODO: Remove this workaround. We must leave the PathIcon only-->
- <PathIcon Data="{Binding Icon, Converter={x:Static conv:NavBarIconConverter.Instance}}" />
+ <PathIcon Foreground="{DynamicResource AcrylicTrimForeground}" Data="{Binding Icon, Converter={x:Static conv:NavBarIconConverter.Instance}}" />
<Image Source="{Binding Icon, Converter={x:Static conv:NavBarIconConverter.Instance}}" />
</Panel>
<TextBlock Margin="10 0 10 0" Text="{Binding Name}" VerticalAlignment="Center" />

Fixes for light/dark themes