Browse Source

Fixed command search result click and highlight

flabbet 7 months ago
parent
commit
f59780a50d

+ 4 - 2
src/PixiEditor/Views/Main/CommandSearch/CommandSearchControl.axaml

@@ -50,8 +50,9 @@
                     <ItemsControl ItemsSource="{Binding Results, ElementName=uc}" x:Name="itemscontrol">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate DataType="search:SearchResult">
-                                <commandSearch:SearchResultControl 
+                                <commandSearch:SearchResultControl
                                     Result="{Binding}"
+                                    ButtonClickedCommand="{Binding ButtonClickedCommand, ElementName=uc}"
                                     PointerMoved="SearchResult_MouseMove"/>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
@@ -61,7 +62,8 @@
         </Border>
         <Border Grid.Row="2" BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                 CornerRadius="0,0,5,5" Background="{DynamicResource ThemeBackgroundBrush1}" Padding="3">
-            <ContentPresenter Content="{Binding SelectedResult.Description, Mode=OneWay, ElementName=uc, FallbackValue={x:Null}}" />
+            <ContentPresenter
+                Content="{Binding SelectedResult.Description, Mode=OneWay, ElementName=uc, FallbackValue={x:Null}}" />
         </Border>
     </Grid>
 </UserControl>

+ 7 - 4
src/PixiEditor/Views/Main/CommandSearch/SearchResultControl.axaml

@@ -9,15 +9,18 @@
              Name="resultControl"
              x:Class="PixiEditor.Views.Main.CommandSearch.SearchResultControl">
     <Button DataContext="{Binding ElementName=resultControl}" Padding="5" Height="40" BorderThickness="0"
-            Background="{DynamicResource ThemeBackgroundBrush}"
             Command="{Binding ButtonClickedCommand}" CornerRadius="0"
             CommandParameter="{Binding}"
             HorizontalContentAlignment="Stretch"
-            IsEnabled="{Binding CanExecute}"
-            Classes.keyboard="{Binding Result.IsSelected}">
+            Classes.keyboard="{Binding Result.IsSelected}"
+            IsEnabled="{Binding CanExecute}">
         <Button.Styles>
+            <Style Selector="Button">
+                <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
+            </Style>
             <Style Selector="Button.keyboard">
-                <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
+                <Setter Property="Background"
+                        Value="{DynamicResource ThemeControlHighBrush}" />
             </Style>
         </Button.Styles>
         <Grid VerticalAlignment="Center" x:Name="dp" Margin="5,0,10,0">