prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge Dev

Browse source
This commit is contained in:
DB p 2024-05-25 09:54:35 +09:00
parent 68f34fa02a
commit 8d566d02fd
2 changed files with 390 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
View file

@ -64,6 +64,34 @@ public partial class SettingsPaneThemeViewModel : BaseModel
} }
} }
public double WindowHeightSize
{
get => Settings.WindowHeightSize;
set => Settings.WindowHeightSize = value;
}
public double ItemHeightSize
{
get => Settings.ItemHeightSize;
set => Settings.ItemHeightSize = value;
}
public double queryBoxFontSize
{
get => Settings.QueryBoxFontSize;
set => Settings.QueryBoxFontSize = value;
}
public double resultItemFontSize
{
get => Settings.ResultItemFontSize;
set => Settings.ResultItemFontSize = value;
}
public double resultSubItemFontSize
{
get => Settings.ResultSubItemFontSize;
set => Settings.ResultSubItemFontSize = value;
}
public List<string> Themes => public List<string> Themes =>
ThemeManager.Instance.LoadAvailableThemes().Select(Path.GetFileNameWithoutExtension).ToList(); ThemeManager.Instance.LoadAvailableThemes().Select(Path.GetFileNameWithoutExtension).ToList();
@ -375,6 +403,50 @@ public partial class SettingsPaneThemeViewModel : BaseModel
} }
} }
public FontFamily SelectedResultSubFont
{
get
{
if (Fonts.SystemFontFamilies.Count(o =>
o.FamilyNames.Values != null &&
o.FamilyNames.Values.Contains(Settings.ResultSubFont)) > 0)
{
var font = new FontFamily(Settings.ResultSubFont);
return font;
}
else
{
var font = new FontFamily("Segoe UI");
return font;
}
}
set
{
Settings.ResultSubFont = value.ToString();
ThemeManager.Instance.ChangeTheme(Settings.Theme);
}
}
public FamilyTypeface SelectedResultSubFontFaces
{
get
{
var typeface = SyntaxSugars.CallOrRescueDefault(
() => SelectedResultSubFont.ConvertFromInvariantStringsOrNormal(
Settings.ResultSubFontStyle,
Settings.ResultSubFontWeight,
Settings.ResultSubFontStretch
));
return typeface;
}
set
{
Settings.ResultSubFontStretch = value.Stretch.ToString();
Settings.ResultSubFontWeight = value.Weight.ToString();
Settings.ResultSubFontStyle = value.Style.ToString();
ThemeManager.Instance.ChangeTheme(Settings.Theme);
}
}
public string ThemeImage => Constant.QueryTextBoxIconImagePath; public string ThemeImage => Constant.QueryTextBoxIconImagePath;
[RelayCommand] [RelayCommand]

423
Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
View file

@ -24,7 +24,7 @@
</ResourceDictionary> </ResourceDictionary>
</ui:Page.Resources> </ui:Page.Resources>
<ScrollViewer <ScrollViewer
Padding="6,0,24,0" Padding="6 0 24 0"
CanContentScroll="True" CanContentScroll="True"
FontSize="14" FontSize="14"
VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.IsVirtualizing="True"
@ -32,7 +32,7 @@
<StackPanel> <StackPanel>
<!-- Page title --> <!-- Page title -->
<TextBlock <TextBlock
Margin="5,23,0,5" Margin="5 23 0 5"
FontSize="30" FontSize="30"
Style="{StaticResource PageTitle}" Style="{StaticResource PageTitle}"
Text="{DynamicResource appearance}" Text="{DynamicResource appearance}"
@ -40,93 +40,306 @@
Visibility="Collapsed" /> Visibility="Collapsed" />
<!-- Theme preview --> <!-- Theme preview -->
<StackPanel <Border
Height="350" Grid.Row="1"
Margin="0"
Background="{Binding PreviewBackground}" Background="{Binding PreviewBackground}"
IsHitTestVisible="False"> CornerRadius="6">
<StackPanel <DockPanel LastChildFill="True">
Margin="0,30,0,0" <StackPanel
HorizontalAlignment="Center" Width="Auto"
VerticalAlignment="Center" Background="Transparent"
Orientation="Horizontal"> DockPanel.Dock="Right"
<Border Orientation="Horizontal">
Width="{Binding WindowWidthSize}" <ToggleButton
Margin="0" x:Name="Editor"
SnapsToDevicePixels="True" Margin="8"
Style="{DynamicResource WindowBorderStyle}" HorizontalAlignment="Left"
UseLayoutRounding="True"> VerticalAlignment="Top"
<Border Style="{DynamicResource WindowRadius}"> Content="Edit"
<Border.Clip> ToolTip="Show details" />
<MultiBinding Converter="{StaticResource BorderClipConverter}"> <!-- Theme Size Editor -->
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" /> <Border
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" /> Padding="0 0 0 0"
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" /> Background="{DynamicResource Color00B}"
</MultiBinding> BorderBrush="{DynamicResource Color03B}"
</Border.Clip> BorderThickness="1"
<Grid> CornerRadius="0 5 5 0">
<Grid.RowDefinitions> <Border.Style>
<RowDefinition /> <Style TargetType="{x:Type Border}">
<RowDefinition /> <Setter Property="Visibility" Value="Visible" />
<RowDefinition /> <Style.Triggers>
</Grid.RowDefinitions> <DataTrigger Binding="{Binding ElementName=Editor, Path=IsChecked}" Value="False">
<!-- Query TextBox --> <Setter Property="Visibility" Value="Collapsed" />
<TextBox </DataTrigger>
x:Name="QueryTextBox" </Style.Triggers>
Grid.Row="0" </Style>
IsReadOnly="True" </Border.Style>
Style="{DynamicResource QueryBoxStyle}" <ScrollViewer
Text="{DynamicResource hiThere}" /> Height="400"
<!-- Clock panel --> ScrollViewer.CanContentScroll="True"
<StackPanel VirtualizingStackPanel.IsVirtualizing="True"
Grid.Row="0" VirtualizingStackPanel.ScrollUnit="Pixel">
Style="{DynamicResource ClockPanel}" <StackPanel>
Visibility="Visible"> <Slider
<!-- Clock TextBox --> Name="WindowHeightValue"
<TextBlock Width="140"
x:Name="ClockBox" Margin="8"
Style="{DynamicResource ClockBox}" VerticalAlignment="Center"
Text="{Binding ClockText}" ui:ControlHelper.Header="Search Bar Height"
Visibility="{Binding Settings.UseClock, Converter={StaticResource BoolToVisibilityConverter}}" /> AutoToolTipPlacement="TopLeft"
<!-- Date TextBox --> IsMoveToPointEnabled="True"
<TextBlock IsSnapToTickEnabled="True"
x:Name="DateBox" Maximum="60"
Style="{DynamicResource DateBox}" Minimum="20"
Text="{Binding DateText}" TickFrequency="2"
Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" /> Value="{Binding WindowHeightSize, Mode=TwoWay}" />
<Separator
Width="Auto"
BorderThickness="1"
Style="{StaticResource SettingSeparatorStyle}" />
<Slider
Name="QueryBoxFontSize"
Width="140"
Margin="8 8 8 0"
VerticalAlignment="Center"
ui:ControlHelper.Header="Query Box Font"
AutoToolTipPlacement="TopLeft"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding ElementName=WindowHeightValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
Minimum="10"
TickFrequency="1"
Value="{Binding queryBoxFontSize, Mode=TwoWay}" />
<ComboBox
Width="150"
Margin="8 4 8 0"
HorizontalAlignment="Center"
VerticalAlignment="Top"
IsSynchronizedWithCurrentItem="False"
ItemsSource="{Binding Source={StaticResource SortedFonts}}"
SelectedItem="{Binding SelectedQueryBoxFont}" />
<ComboBox
Width="150"
Margin="8"
HorizontalAlignment="Center"
VerticalAlignment="Top"
ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
SelectedItem="{Binding SelectedQueryBoxFontFaces}">
<ComboBox.ItemTemplate>
<DataTemplate>
<ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Value}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<Separator
Width="Auto"
BorderThickness="1"
Style="{StaticResource SettingSeparatorStyle}" />
<Slider
Name="ItemHeightValue"
Width="140"
Margin="8 8 8 0"
VerticalAlignment="Center"
ui:ControlHelper.Header="Item Height"
AutoToolTipPlacement="TopLeft"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="100"
Minimum="30"
TickFrequency="2"
Value="{Binding ItemHeightSize, Mode=TwoWay}" />
<Separator
Width="Auto"
BorderThickness="1"
Style="{StaticResource SettingSeparatorStyle}" />
<Slider
Name="resultItemFontSize"
Width="140"
Margin="8 8 8 0"
VerticalAlignment="Center"
ui:ControlHelper.Header="Item Title Font"
AutoToolTipPlacement="TopLeft"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="80"
Minimum="10"
TickFrequency="1"
Value="{Binding resultItemFontSize, Mode=TwoWay}" />
<ComboBox
Width="140"
Margin="8 4 8 0"
HorizontalAlignment="Center"
VerticalAlignment="Top"
IsSynchronizedWithCurrentItem="False"
ItemsSource="{Binding Source={StaticResource SortedFonts}}"
SelectedItem="{Binding SelectedResultFont}" />
<ComboBox
Width="140"
Margin="8 4 8 8"
HorizontalAlignment="Center"
VerticalAlignment="Top"
ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
SelectedItem="{Binding SelectedResultFontFaces}">
<ComboBox.ItemTemplate>
<DataTemplate>
<ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Value}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<Separator
Width="Auto"
BorderThickness="1"
Style="{StaticResource SettingSeparatorStyle}" />
<Slider
Name="resultSubItemFontSize"
Width="140"
Margin="8 8 8 0"
VerticalAlignment="Center"
ui:ControlHelper.Header="Item Subtitle Font"
AutoToolTipPlacement="TopLeft"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="80"
Minimum="6"
TickFrequency="1"
Value="{Binding resultSubItemFontSize, Mode=TwoWay}" />
<ComboBox
Width="140"
Margin="8 4 8 0"
HorizontalAlignment="Center"
VerticalAlignment="Top"
IsSynchronizedWithCurrentItem="False"
ItemsSource="{Binding Source={StaticResource SortedFonts}}"
SelectedItem="{Binding SelectedResultSubFont}" />
<ComboBox
Width="140"
Margin="8 4 8 8"
HorizontalAlignment="Center"
VerticalAlignment="Top"
ItemsSource="{Binding SelectedResultSubFont.FamilyTypefaces}"
SelectedItem="{Binding SelectedResultSubFontFaces}">
<ComboBox.ItemTemplate>
<DataTemplate>
<ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Value}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<Separator
Width="Auto"
BorderThickness="1"
Style="{StaticResource SettingSeparatorStyle}" />
<Button
Width="140"
Margin="8"
HorizontalAlignment="Center">
Reset
</Button>
</StackPanel> </StackPanel>
<Canvas Grid.Row="0" Style="{DynamicResource SearchIconPosition}"> </ScrollViewer>
<Path
Margin="0"
Data="{DynamicResource SearchIconImg}"
Stretch="Fill"
Style="{DynamicResource SearchIconStyle}" />
</Canvas>
<Rectangle
Grid.Row="1"
Width="Auto"
HorizontalAlignment="Stretch"
Style="{DynamicResource SeparatorStyle}"
Visibility="Visible" />
<flowlauncher:ResultListBox
x:Name="ResultListBox"
Grid.Row="2"
DataContext="{Binding PreviewResults, Mode=OneTime}"
Visibility="Visible" />
<Border x:Name="ContextMenu" Visibility="Collapsed" />
<Border x:Name="History" Visibility="Collapsed" />
</Grid>
</Border> </Border>
</Border>
</StackPanel> </StackPanel>
</StackPanel> <StackPanel VerticalAlignment="Center" DockPanel.Dock="Left">
<Border
Width="400"
Margin="40 30 0 30"
SnapsToDevicePixels="True"
Style="{DynamicResource WindowBorderStyle}"
UseLayoutRounding="True">
<Border Style="{DynamicResource WindowRadius}">
<Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
</MultiBinding>
</Border.Clip>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Border Grid.Row="0">
<TextBox
x:Name="QueryTextBox"
Height="{Binding WindowHeightSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
FontSize="{Binding queryBoxFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
IsHitTestVisible="False"
IsReadOnly="True"
Style="{DynamicResource QueryBoxStyle}"
Text="{DynamicResource hiThere}" />
</Border>
<StackPanel
x:Name="ClockPanel"
IsHitTestVisible="False"
Style="{DynamicResource ClockPanel}"
Visibility="Visible">
<TextBlock
x:Name="ClockBox"
Style="{DynamicResource ClockBox}"
Text="{Binding ClockText}"
Visibility="{Binding Settings.UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
<TextBlock
x:Name="DateBox"
Style="{DynamicResource DateBox}"
Text="{Binding DateText}"
Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
</StackPanel>
<Canvas Style="{DynamicResource SearchIconPosition}">
<Path
Margin="0"
Data="{DynamicResource SearchIconImg}"
Stretch="Fill"
Style="{DynamicResource SearchIconStyle}" />
</Canvas>
<Border Grid.Row="1" Margin="0 0 0 0">
<Rectangle
Width="Auto"
HorizontalAlignment="Stretch"
Style="{DynamicResource SeparatorStyle}"
Visibility="Visible" />
</Border>
<ContentControl Grid.Row="2">
<flowlauncher:ResultListBox
DataContext="{Binding PreviewResults, Mode=OneTime}"
IsHitTestVisible="False"
Visibility="Visible" />
</ContentControl>
</Grid>
</Border>
</Border>
</StackPanel>
</DockPanel>
</Border>
<!-- Drop shadow effect --> <!-- Drop shadow effect -->
<cc:Card <cc:Card
Title="{DynamicResource queryWindowShadowEffect}" Title="{DynamicResource queryWindowShadowEffect}"
Margin="0,4,0,0" Margin="0 4 0 0"
Icon="&#xeb91;" Icon="&#xeb91;"
Sub="{DynamicResource shadowEffectCPUUsage}"> Sub="{DynamicResource shadowEffectCPUUsage}">
<ui:ToggleSwitch <ui:ToggleSwitch
@ -143,7 +356,7 @@
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock <TextBlock
Width="Auto" Width="Auto"
Margin="0,0,8,2" Margin="0 0 8 2"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{DynamicResource Color05B}" Foreground="{DynamicResource Color05B}"
Text="{Binding WindowWidthSize}" Text="{Binding WindowWidthSize}"
@ -163,7 +376,7 @@
<!-- Theme --> <!-- Theme -->
<Border <Border
Height="64" Height="64"
Margin="0,8,0,0" Margin="0 8 0 0"
CornerRadius="5 5 0 0" CornerRadius="5 5 0 0"
Style="{DynamicResource SettingGroupBox}"> Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}"> <ItemsControl Style="{StaticResource SettingGrid}">
@ -180,7 +393,7 @@
Margin="0" Margin="0"
Padding="0" Padding="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
BorderThickness="1,0,1,1" BorderThickness="1 0 1 1"
CornerRadius="0 0 5 5" CornerRadius="0 0 5 5"
Style="{DynamicResource SettingGroupBox}"> Style="{DynamicResource SettingGroupBox}">
<ListBox <ListBox
@ -208,13 +421,13 @@
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
Background="{DynamicResource Color12B}" Background="{DynamicResource Color12B}"
BorderBrush="{DynamicResource Color03B}" BorderBrush="{DynamicResource Color03B}"
BorderThickness="1,1,1,0" BorderThickness="1 1 1 0"
CornerRadius="4" CornerRadius="4"
SnapsToDevicePixels="true"> SnapsToDevicePixels="true">
<Border <Border
x:Name="Bd2" x:Name="Bd2"
BorderBrush="{DynamicResource Color14B}" BorderBrush="{DynamicResource Color14B}"
BorderThickness="0,0,0,2" BorderThickness="0 0 0 2"
CornerRadius="4"> CornerRadius="4">
<ContentPresenter <ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@ -252,7 +465,7 @@
<TextBlock <TextBlock
x:Name="ThemeName" x:Name="ThemeName"
Margin="0" Margin="0"
Padding="14,12" Padding="14 12"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Focusable="True" Focusable="True"
@ -279,7 +492,7 @@
<!-- Fonts and icons --> <!-- Fonts and icons -->
<cc:CardGroup Margin="0,30,0,0"> <cc:CardGroup Margin="0 30 0 0">
<cc:Card <cc:Card
Title="{DynamicResource useGlyphUI}" Title="{DynamicResource useGlyphUI}"
Icon="&#xf6b8;" Icon="&#xf6b8;"
@ -299,7 +512,7 @@
SelectedItem="{Binding SelectedQueryBoxFont}" /> SelectedItem="{Binding SelectedQueryBoxFont}" />
<ComboBox <ComboBox
Width="130" Width="130"
Margin="10,0,0,0" Margin="10 0 0 0"
ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}" ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
SelectedItem="{Binding SelectedQueryBoxFontFaces}"> SelectedItem="{Binding SelectedQueryBoxFontFaces}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
@ -326,7 +539,7 @@
SelectedItem="{Binding SelectedResultFont}" /> SelectedItem="{Binding SelectedResultFont}" />
<ComboBox <ComboBox
Width="130" Width="130"
Margin="10,0,0,0" Margin="10 0 0 0"
ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}" ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
SelectedItem="{Binding SelectedResultFontFaces}"> SelectedItem="{Binding SelectedResultFontFaces}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
@ -346,7 +559,7 @@
</cc:CardGroup> </cc:CardGroup>
<!-- Time and date --> <!-- Time and date -->
<cc:CardGroup Margin="0,24,0,0"> <cc:CardGroup Margin="0 24 0 0">
<cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;"> <cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock <TextBlock
@ -356,7 +569,7 @@
Text="{Binding ClockText}" /> Text="{Binding ClockText}" />
<ComboBox <ComboBox
MinWidth="180" MinWidth="180"
Margin="10,0,18,0" Margin="10 0 18 0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
ItemsSource="{Binding TimeFormatList}" ItemsSource="{Binding TimeFormatList}"
@ -377,7 +590,7 @@
Text="{Binding DateText}" /> Text="{Binding DateText}" />
<ComboBox <ComboBox
MinWidth="180" MinWidth="180"
Margin="10,0,18,0" Margin="10 0 18 0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
ItemsSource="{Binding DateFormatList}" ItemsSource="{Binding DateFormatList}"
@ -391,7 +604,7 @@
</cc:CardGroup> </cc:CardGroup>
<!-- Animation --> <!-- Animation -->
<cc:CardGroup Margin="0,11,0,0"> <cc:CardGroup Margin="0 11 0 0">
<cc:Card <cc:Card
Title="{DynamicResource Animation}" Title="{DynamicResource Animation}"
Icon="&#xedb5;" Icon="&#xedb5;"
@ -418,7 +631,7 @@
<TextBox <TextBox
MinWidth="80" MinWidth="80"
Margin="18,0,0,0" Margin="18 0 0 0"
Text="{Binding Settings.CustomAnimationLength}" Text="{Binding Settings.CustomAnimationLength}"
TextWrapping="NoWrap" TextWrapping="NoWrap"
Visibility="{ext:VisibleWhen {Binding Settings.AnimationSpeed}, Visibility="{ext:VisibleWhen {Binding Settings.AnimationSpeed},
@ -428,7 +641,7 @@
</cc:CardGroup> </cc:CardGroup>
<!-- SFX --> <!-- SFX -->
<cc:CardGroup Margin="0,11,0,0"> <cc:CardGroup Margin="0 11 0 0">
<cc:Card <cc:Card
Title="{DynamicResource SoundEffect}" Title="{DynamicResource SoundEffect}"
Icon="&#xe7f5;" Icon="&#xe7f5;"
@ -446,7 +659,7 @@
Visibility="{Binding UseSound, Converter={StaticResource BoolToVisibilityConverter}}"> Visibility="{Binding UseSound, Converter={StaticResource BoolToVisibilityConverter}}">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock <TextBlock
Margin="0,0,8,0" Margin="0 0 8 0"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding SoundEffectVolume}" /> Text="{Binding SoundEffectVolume}" />
<Slider <Slider
@ -463,12 +676,12 @@
</cc:CardGroup> </cc:CardGroup>
<Border <Border
Name="WMPWarning" Name="WMPWarning"
Padding="0,10" Padding="0 10"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="{DynamicResource InfoBarWarningBG}" Background="{DynamicResource InfoBarWarningBG}"
BorderBrush="{DynamicResource Color03B}" BorderBrush="{DynamicResource Color03B}"
BorderThickness="0,1,0,0" BorderThickness="0 1 0 0"
CornerRadius="5 5 5 5" CornerRadius="5 5 5 5"
Visibility="{Binding ShowWMPWarning, Converter={StaticResource BoolToVisibilityConverter}}"> Visibility="{Binding ShowWMPWarning, Converter={StaticResource BoolToVisibilityConverter}}">
<Grid VerticalAlignment="Center"> <Grid VerticalAlignment="Center">
@ -478,15 +691,15 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ui:FontIcon <ui:FontIcon
Grid.Column="0" Grid.Column="0"
Margin="20,0,14,0" Margin="20 0 14 0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="15" FontSize="15"
Foreground="{DynamicResource InfoBarWarningIcon}" Foreground="{DynamicResource InfoBarWarningIcon}"
Glyph="&#xf167;" /> Glyph="&#xf167;" />
<TextBlock <TextBlock
Grid.Column="1" Grid.Column="1"
Margin="0,0,0,2" Margin="0 0 0 2"
Padding="0,0,8,0" Padding="0 0 8 0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
FontSize="13" FontSize="13"
FontWeight="SemiBold" FontWeight="SemiBold"
@ -499,7 +712,7 @@
<!-- Settings color scheme --> <!-- Settings color scheme -->
<cc:Card <cc:Card
Title="{DynamicResource ColorScheme}" Title="{DynamicResource ColorScheme}"
Margin="0,11,0,0" Margin="0 11 0 0"
Icon="&#xe793;"> Icon="&#xe793;">
<ComboBox <ComboBox
MinWidth="180" MinWidth="180"
@ -521,7 +734,7 @@
<!-- How to create theme link --> <!-- How to create theme link -->
<cc:HyperLink <cc:HyperLink
Margin="10,10,10,28" Margin="10 10 10 28"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Text="{DynamicResource howToCreateTheme}" Text="{DynamicResource howToCreateTheme}"
Uri="{Binding LinkHowToCreateTheme}" /> Uri="{Binding LinkHowToCreateTheme}" />