Refactoring ContextMenu

1. Remove ItemDropEvent
2. Remove ShowContextMenus from API
3. Fix context menu item can't be opened ( #535 ), bug introduced from PR #494 (commit 45dbb50)
4. Move open result command and load context menu command back to
MainViewModel
5. unify load context menu logic
6. other performance enhancement and potential bug fixed
This commit is contained in:
bao-qian
2016-03-26 01:20:42 +00:00
parent fbc6f78cb5
commit 5ac0837be3
11 changed files with 192 additions and 314 deletions

View File

@@ -27,7 +27,8 @@
d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
<Window.Resources>
<DataTemplate DataType="{x:Type vm:ResultsViewModel}">
<wox:ResultListBox></wox:ResultListBox>
<wox:ResultListBox PreviewMouseDown="OnPreviewMouseButtonDown">
</wox:ResultListBox>
</DataTemplate>
</Window.Resources>
<Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown">
@@ -43,10 +44,8 @@
<ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}"></ToolTip>
</Line.ToolTip>
</Line>
<ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}">
</ContentControl>
<ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}">
</ContentControl>
<ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}"/>
<ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}"/>
</StackPanel>
</Border>
</Window>