Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 04:37:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

make the font list sorted (#1263) fix #790

Browse Source
This commit is contained in:
Jason Ko
2017-03-02 19:07:52 +08:00
committed by bao-qian
parent 87834b74ef
commit 3bb0b93c79
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Wox/SettingWindow.xaml
View File

@@ -4,6 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:wox="clr-namespace:Wox" xmlns:wox="clr-namespace:Wox"
xmlns:vm="clr-namespace:Wox.ViewModel" xmlns:vm="clr-namespace:Wox.ViewModel"
xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
xmlns:userSettings="clr-namespace:Wox.Infrastructure.UserSettings;assembly=Wox.Infrastructure" xmlns:userSettings="clr-namespace:Wox.Infrastructure.UserSettings;assembly=Wox.Infrastructure"
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=mscorlib"
x:Class="Wox.SettingWindow" x:Class="Wox.SettingWindow"
@@ -21,6 +22,14 @@
<Window.CommandBindings> <Window.CommandBindings>
<CommandBinding Command="Close" Executed="OnCloseExecuted"/> <CommandBinding Command="Close" Executed="OnCloseExecuted"/>
</Window.CommandBindings> </Window.CommandBindings>
<Window.Resources>
<CollectionViewSource Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}" x:Key="SortedFonts">
<CollectionViewSource.SortDescriptions>
<scm:SortDescription PropertyName="Source"/>
</CollectionViewSource.SortDescriptions>
</CollectionViewSource>
</Window.Resources>
<TabControl Height="auto" SelectedIndex="0"> <TabControl Height="auto" SelectedIndex="0">
<TabItem Header="{DynamicResource general}"> <TabItem Header="{DynamicResource general}">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
@@ -213,7 +222,7 @@
<StackPanel Grid.Row="1" Margin="0 10 0 10" Orientation="Vertical"> <StackPanel Grid.Row="1" Margin="0 10 0 10" Orientation="Vertical">
<StackPanel Orientation="Horizontal" Margin="2"> <StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="{DynamicResource queryBoxFont}" /> <TextBlock Text="{DynamicResource queryBoxFont}" />
<ComboBox ItemsSource="{x:Static Fonts.SystemFontFamilies}" <ComboBox ItemsSource="{Binding Source={StaticResource SortedFonts}}"
SelectedItem="{Binding SelectedQueryBoxFont}" SelectedItem="{Binding SelectedQueryBoxFont}"
HorizontalAlignment="Left" VerticalAlignment="Top" Width="160" Margin="10 -2 5 0" /> HorizontalAlignment="Left" VerticalAlignment="Top" Width="160" Margin="10 -2 5 0" />
<ComboBox ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}" <ComboBox ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
@@ -235,7 +244,7 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="2"> <StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="{DynamicResource resultItemFont}" /> <TextBlock Text="{DynamicResource resultItemFont}" />
<ComboBox ItemsSource="{x:Static Fonts.SystemFontFamilies}" <ComboBox ItemsSource="{Binding Source={StaticResource SortedFonts}}"
SelectedItem="{Binding SelectedResultFont}" SelectedItem="{Binding SelectedResultFont}"
HorizontalAlignment="Left" VerticalAlignment="Top" HorizontalAlignment="Left" VerticalAlignment="Top"
Width="160" Margin="5 -2 5 0" /> Width="160" Margin="5 -2 5 0" />