Skip to content

Commit

Permalink
Merge pull request #4813 from comintern/bugfix
Browse files Browse the repository at this point in the history
revert inadvertant commit.
  • Loading branch information
bclothier committed Feb 20, 2019
2 parents c0ffaab + 7acfedb commit 3d870f7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 119 deletions.
107 changes: 0 additions & 107 deletions Rubberduck.Core/UI/Inspections/InspectionContextMenuBehavior.cs

This file was deleted.

23 changes: 11 additions & 12 deletions Rubberduck.Core/UI/Inspections/InspectionResultsControl.xaml
Expand Up @@ -197,15 +197,15 @@
SelectionUnit="FullRow"
ItemsSource="{Binding Results, NotifyOnSourceUpdated=True}"
VirtualizingPanel.IsVirtualizingWhenGrouping="False">
<DataGrid.RowDetailsTemplate>
<DataTemplate>
<Grid>
<Rectangle Fill="Transparent" />
<GridViewRowPresenter/>
</Grid>
<DataGrid.RowDetailsTemplate>
<DataTemplate>
<Grid>
<Rectangle Fill="Transparent" />
<GridViewRowPresenter/>
</Grid>
</DataTemplate>
</DataGrid.RowDetailsTemplate>
<DataGrid.Columns>
</DataGrid.RowDetailsTemplate>
<DataGrid.Columns>
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Type}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="abstract1:IInspectionResult">
Expand All @@ -217,7 +217,7 @@
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=CodeInspectionResults_Location}" Binding="{Binding QualifiedSelection.QualifiedName, Mode=OneTime}" />
</DataGrid.Columns>
<DataGrid.ContextMenu>
<ContextMenu ItemsSource="{Binding PlacementTarget.DataContext.QuickFixes, RelativeSource={RelativeSource Self}}" Visibility="Collapsed">
<ContextMenu ItemsSource="{Binding PlacementTarget.DataContext.QuickFixes, RelativeSource={RelativeSource Self}}">
<ContextMenu.Resources>
<Style TargetType="{x:Type MenuItem}">
<Setter Property="Icon">
Expand All @@ -235,7 +235,6 @@
</DataGrid.ContextMenu>
<i:Interaction.Behaviors>
<controls:GroupItemExpandedBehavior ExpandedState="{Binding ExpandedState, Mode=TwoWay}" />
<codeInspections:InspectionContextMenuBehavior />
</i:Interaction.Behaviors>
</controls:GroupingGrid>

Expand All @@ -249,7 +248,7 @@
<Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="DimGray">

<StackPanel Orientation="Vertical" MinHeight="48" Background="WhiteSmoke">

<Grid Margin="4" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="25" />
Expand Down Expand Up @@ -287,6 +286,6 @@
</WrapPanel>
</StackPanel>
</Border>

</Grid>
</UserControl>

0 comments on commit 3d870f7

Please sign in to comment.