Skip to content

Commit 218c25f

Browse files
committed
Use regular combo box
1 parent 04834da commit 218c25f

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

src/Files.App/Views/Settings/ActionsPage.xaml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xmlns:i="using:Microsoft.Xaml.Interactivity"
1010
xmlns:keyboard="using:Files.App.UserControls.KeyboardShortcut"
1111
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
12+
xmlns:uc="using:Files.App.UserControls"
1213
xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
1314
x:Name="PageRoot"
1415
DataContext="{x:Bind ViewModel, Mode=OneWay}"
@@ -119,39 +120,14 @@
119120
</Grid.ColumnDefinitions>
120121

121122
<!-- New Command Selector -->
122-
<ComboBox
123+
<uc:ComboBoxEx
123124
x:Name="NewKeyBindingItemPickerComboBox"
124-
Padding="0"
125+
DisplayMemberPath="CommandLabel"
125126
DropDownClosed="NewKeyBindingItemPickerComboBox_DropDownClosed"
126127
ItemsSource="{x:Bind ViewModel.AllActionItems, Mode=OneWay}"
127128
PlaceholderText="{helpers:ResourceString Name=ChooseAnAction}"
128129
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}" />
155131

156132
<!-- Editor (Using PreviewKeyDown to prevent Ctrl+A) -->
157133
<TextBox

0 commit comments

Comments
 (0)