From 3ce0b8bc977f77ce53297a4b2c25948951b9143f Mon Sep 17 00:00:00 2001 From: Colin Liu Date: Thu, 18 Feb 2016 20:29:51 +0800 Subject: [PATCH] Remove unused code - ListBoxItem_OnDrop Event Handler - ItemDropEvent Handler - UpdateItemNumber method --- Wox/MainWindow.xaml.cs | 16 ---------------- Wox/ResultPanel.xaml | 2 +- Wox/ResultPanel.xaml.cs | 41 ----------------------------------------- 3 files changed, 1 insertion(+), 58 deletions(-) diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs index a15082f1b5..0fd9210bb8 100644 --- a/Wox/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -32,25 +32,9 @@ namespace Wox { InitializeComponent(); - //pnlResult.ItemDropEvent += pnlResult_ItemDropEvent; Closing += MainWindow_Closing; } - //void pnlResult_ItemDropEvent(Result result, IDataObject dropDataObject, DragEventArgs args) - //{ - // PluginPair pluginPair = PluginManager.AllPlugins.FirstOrDefault(o => o.Metadata.ID == result.PluginID); - // if (ResultItemDropEvent != null && pluginPair != null) - // { - // foreach (var delegateHandler in ResultItemDropEvent.GetInvocationList()) - // { - // if (delegateHandler.Target == pluginPair.Plugin) - // { - // delegateHandler.DynamicInvoke(result, dropDataObject, args); - // } - // } - // } - //} - void MainWindow_Closing(object sender, CancelEventArgs e) { UserSettingStorage.Instance.WindowLeft = Left; diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml index eede9f3b87..21c1e890f2 100644 --- a/Wox/ResultPanel.xaml +++ b/Wox/ResultPanel.xaml @@ -9,7 +9,7 @@ diff --git a/Wox/ResultPanel.xaml.cs b/Wox/ResultPanel.xaml.cs index 677853ea7b..05f3870f7b 100644 --- a/Wox/ResultPanel.xaml.cs +++ b/Wox/ResultPanel.xaml.cs @@ -17,8 +17,6 @@ namespace Wox [Synchronization] public partial class ResultPanel : UserControl { - public event Action ItemDropEvent; - public void AddResults(List newResults, string resultId) { var vm = this.DataContext as ResultPanelViewModel; @@ -26,27 +24,6 @@ namespace Wox } - private void UpdateItemNumber() - { - //VirtualizingStackPanel virtualizingStackPanel = GetInnerStackPanel(lbResults); - //int index = 0; - //for (int i = (int)virtualizingStackPanel.VerticalOffset; i <= virtualizingStackPanel.VerticalOffset + virtualizingStackPanel.ViewportHeight; i++) - //{ - // index++; - // ListBoxItem item = lbResults.ItemContainerGenerator.ContainerFromIndex(i) as ListBoxItem; - // if (item != null) - // { - // ContentPresenter myContentPresenter = FindVisualChild(item); - // if (myContentPresenter != null) - // { - // DataTemplate dataTemplate = myContentPresenter.ContentTemplate; - // TextBlock tbItemNumber = (TextBlock)dataTemplate.FindName("tbItemNumber", myContentPresenter); - // tbItemNumber.Text = index.ToString(); - // } - // } - //} - } - public ResultPanel() { InitializeComponent(); @@ -57,26 +34,8 @@ namespace Wox if (e.AddedItems.Count > 0 && e.AddedItems[0] != null) { lbResults.ScrollIntoView(e.AddedItems[0]); - //Dispatcher.DelayInvoke("UpdateItemNumber", () => - //{ - //UpdateItemNumber(); - //}, TimeSpan.FromMilliseconds(3)); } } - private void ListBoxItem_OnDrop(object sender, DragEventArgs e) - { - var item = ItemsControl.ContainerFromElement(lbResults, e.OriginalSource as DependencyObject) as ListBoxItem; - if (item != null) - { - OnItemDropEvent(item.DataContext as ResultItemViewModel, e.Data, e); - } - } - - protected virtual void OnItemDropEvent(ResultItemViewModel obj, IDataObject data, DragEventArgs e) - { - var handler = ItemDropEvent; - if (handler != null) handler(obj.RawResult, data, e); - } } } \ No newline at end of file