|
9 | 9 | xmlns:i="using:Microsoft.Xaml.Interactivity" |
10 | 10 | xmlns:keyboard="using:Files.App.UserControls.KeyboardShortcut" |
11 | 11 | xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
| 12 | + xmlns:uc="using:Files.App.UserControls" |
12 | 13 | xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters" |
13 | 14 | x:Name="PageRoot" |
14 | 15 | DataContext="{x:Bind ViewModel, Mode=OneWay}" |
|
119 | 120 | </Grid.ColumnDefinitions> |
120 | 121 |
|
121 | 122 | <!-- New Command Selector --> |
122 | | - <ComboBox |
| 123 | + <uc:ComboBoxEx |
123 | 124 | x:Name="NewKeyBindingItemPickerComboBox" |
124 | | - Padding="0" |
| 125 | + DisplayMemberPath="CommandLabel" |
125 | 126 | DropDownClosed="NewKeyBindingItemPickerComboBox_DropDownClosed" |
126 | 127 | ItemsSource="{x:Bind ViewModel.AllActionItems, Mode=OneWay}" |
127 | 128 | PlaceholderText="{helpers:ResourceString Name=ChooseAnAction}" |
128 | 129 | SelectedIndex="{x:Bind ViewModel.SelectedActionItemIndex, Mode=TwoWay}" |
129 | | - SelectedItem="{x:Bind ViewModel.SelectedActionItem, Mode=TwoWay}"> |
130 | | - <ComboBox.ItemTemplate> |
131 | | - <DataTemplate x:DataType="dataitems:ModifiableActionItem"> |
132 | | - <StackPanel Width="240" HorizontalAlignment="Left"> |
133 | | - <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{x:Bind CommandLabel}" /> |
134 | | - <TextBlock |
135 | | - Foreground="{ThemeResource TextFillColorSecondaryBrush}" |
136 | | - Style="{StaticResource CaptionTextBlockStyle}" |
137 | | - Text="{x:Bind CommandDescription}" |
138 | | - TextTrimming="CharacterEllipsis" |
139 | | - TextWrapping="NoWrap" /> |
140 | | - </StackPanel> |
141 | | - </DataTemplate> |
142 | | - </ComboBox.ItemTemplate> |
143 | | - <ComboBox.Resources> |
144 | | - <StaticResource x:Key="ComboBoxBackground" ResourceKey="ControlFillColorTransparentBrush" /> |
145 | | - <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="ControlFillColorTransparentBrush" /> |
146 | | - <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="ControlFillColorTransparentBrush" /> |
147 | | - <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorTransparentBrush" /> |
148 | | - |
149 | | - <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlFillColorTransparentBrush" /> |
150 | | - <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlFillColorTransparentBrush" /> |
151 | | - <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlFillColorTransparentBrush" /> |
152 | | - <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="ControlFillColorTransparentBrush" /> |
153 | | - </ComboBox.Resources> |
154 | | - </ComboBox> |
| 130 | + SelectedItem="{x:Bind ViewModel.SelectedActionItem, Mode=TwoWay}" /> |
155 | 131 |
|
156 | 132 | <!-- Editor (Using PreviewKeyDown to prevent Ctrl+A) --> |
157 | 133 | <TextBox |
|
0 commit comments