Skip to content

Commit 49b9e97

Browse files
jjw24jjw24
authored
Merge pull request #1428 from onesounds/DragandDrop
Drag and drop
2 parents 14c137a + 6efd288 commit 49b9e97

File tree

6 files changed

+82
-20
lines changed

6 files changed

+82
-20
lines changed

‎Flow.Launcher.Plugin/Result.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ public class Result
3737
/// user's clipboard when Ctrl + C is pressed on a result. If the text is a file/directory path
3838
/// flow will copy the actual file/folder instead of just the path text.
3939
/// </summary>
40-
public string CopyText { get; set; } = string.Empty;
40+
public string CopyText
41+
{
42+
get => string.IsNullOrEmpty(_copyText) ? SubTitle : _copyText;
43+
set => _copyText = value;
44+
}
4145

4246
/// <summary>
4347
/// This holds the text which can be provided by plugin to help Flow autocomplete text
@@ -81,6 +85,7 @@ public string IcoPath
8185
/// Delegate to Get Image Source
8286
/// </summary>
8387
public IconDelegate Icon;
88+
private string _copyText = string.Empty;
8489

8590
/// <summary>
8691
/// Information for Glyph Icon (Prioritized than IcoPath/Icon if user enable Glyph Icons)

‎Flow.Launcher/MainWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
<ContentControl>
301301
<flowlauncher:ResultListBox x:Name="ResultListBox"
302302
DataContext="{Binding Results}"
303-
PreviewMouseDown="OnPreviewMouseButtonDown" />
303+
PreviewMouseLeftButtonUp="OnPreviewMouseButtonDown" />
304304
</ContentControl>
305305
</Border>
306306
<Border Style="{DynamicResource WindowRadius}">

‎Flow.Launcher/MainWindow.xaml.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.ComponentModel;
33
using System.Threading.Tasks;
44
using System.Windows;
@@ -20,6 +20,11 @@
2020
using System.Windows.Media;
2121
using Flow.Launcher.Infrastructure.Hotkey;
2222
using Flow.Launcher.Plugin.SharedCommands;
23+
using System.Text;
24+
using DataObject = System.Windows.DataObject;
25+
using System.Diagnostics;
26+
using Microsoft.AspNetCore.Http;
27+
using System.IO;
2328
using System.Windows.Threading;
2429
using System.Windows.Data;
2530

‎Flow.Launcher/ResultListBox.xaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@
2525
VirtualizingStackPanel.IsVirtualizing="True"
2626
VirtualizingStackPanel.VirtualizationMode="Standard"
2727
Visibility="{Binding Visbility}"
28-
mc:Ignorable="d">
28+
mc:Ignorable="d"
29+
PreviewMouseMove="ResultList_MouseMove"
30+
PreviewMouseLeftButtonDown="ResultList_PreviewMouseLeftButtonDown">
2931
<!-- IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083 -->
3032

3133
<ListBox.ItemTemplate>
3234
<DataTemplate>
33-
<Button HorizontalAlignment="Stretch">
35+
<Button
36+
HorizontalAlignment="Stretch">
3437
<Button.Template>
3538
<ControlTemplate>
3639
<ContentPresenter Content="{TemplateBinding Button.Content}" />
@@ -84,7 +87,7 @@
8487
x:Name="ImageIcon"
8588
Width="{Binding IconXY}"
8689
Height="{Binding IconXY}"
87-
Margin="0,0,0,0"
90+
Margin="0,0,0,0" IsHitTestVisible="False"
8891
HorizontalAlignment="Center"
8992
Source="{Binding Image, TargetNullValue={x:Null}}"
9093
Stretch="Uniform"
@@ -134,6 +137,7 @@
134137
x:Name="Title"
135138
VerticalAlignment="Center"
136139
DockPanel.Dock="Left"
140+
IsHitTestVisible="False"
137141
Style="{DynamicResource ItemTitleStyle}"
138142
Text="{Binding Result.Title}"
139143
ToolTip="{Binding ShowTitleToolTip}">
@@ -147,6 +151,7 @@
147151
<TextBlock
148152
x:Name="SubTitle"
149153
Grid.Row="1"
154+
IsHitTestVisible="False"
150155
Style="{DynamicResource ItemSubTitleStyle}"
151156
Text="{Binding Result.SubTitle}"
152157
ToolTip="{Binding ShowSubTitleToolTip}" />

‎Flow.Launcher/ResultListBox.xaml.cs‎

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
using System.Windows;
1+
using System;
2+
using System.IO;
3+
using System.Windows;
24
using System.Windows.Controls;
35
using System.Windows.Input;
6+
using Flow.Launcher.ViewModel;
47

58
namespace Flow.Launcher
69
{
@@ -24,7 +27,7 @@ private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
2427

2528
private void OnMouseEnter(object sender, MouseEventArgs e)
2629
{
27-
lock(_lock)
30+
lock (_lock)
2831
{
2932
curItem = (ListBoxItem)sender;
3033
var p = e.GetPosition((IInputElement)sender);
@@ -34,7 +37,7 @@ private void OnMouseEnter(object sender, MouseEventArgs e)
3437

3538
private void OnMouseMove(object sender, MouseEventArgs e)
3639
{
37-
lock(_lock)
40+
lock (_lock)
3841
{
3942
var p = e.GetPosition((IInputElement)sender);
4043
if (_lastpos != p)
@@ -46,13 +49,59 @@ private void OnMouseMove(object sender, MouseEventArgs e)
4649

4750
private void ListBox_PreviewMouseDown(object sender, MouseButtonEventArgs e)
4851
{
49-
lock(_lock)
52+
lock (_lock)
5053
{
5154
if (curItem != null)
5255
{
5356
curItem.IsSelected = true;
5457
}
5558
}
5659
}
60+
61+
62+
private Point start;
63+
private string path;
64+
private string query;
65+
66+
private void ResultList_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
67+
{
68+
if (Mouse.DirectlyOver is not FrameworkElement { DataContext: ResultViewModel result })
69+
return;
70+
71+
path = result.Result.CopyText;
72+
query = result.Result.OriginQuery.RawQuery;
73+
start = e.GetPosition(null);
74+
}
75+
76+
private void ResultList_MouseMove(object sender, MouseEventArgs e)
77+
{
78+
if (e.LeftButton != MouseButtonState.Pressed)
79+
{
80+
start = default;
81+
path = string.Empty;
82+
query = string.Empty;
83+
return;
84+
}
85+
86+
if (!File.Exists(path) && !Directory.Exists(path))
87+
return;
88+
89+
Point mousePosition = e.GetPosition(null);
90+
Vector diff = this.start - mousePosition;
91+
92+
if (Math.Abs(diff.X) < SystemParameters.MinimumHorizontalDragDistance
93+
|| Math.Abs(diff.Y) < SystemParameters.MinimumVerticalDragDistance)
94+
return;
95+
96+
var data = new DataObject(DataFormats.FileDrop, new[]
97+
{
98+
path
99+
});
100+
DragDrop.DoDragDrop((DependencyObject)sender, data, DragDropEffects.Move | DragDropEffects.Copy);
101+
102+
App.API.ChangeQuery(query, true);
103+
104+
e.Handled = true;
105+
}
57106
}
58107
}

‎Flow.Launcher/ViewModel/MainViewModel.cs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -966,28 +966,26 @@ public void ResultCopy(string stringToCopy)
966966
var result = Results.SelectedItem?.Result;
967967
if (result != null)
968968
{
969-
string copyText = string.IsNullOrEmpty(result.CopyText) ? result.SubTitle : result.CopyText;
969+
string copyText = result.CopyText;
970970
var isFile = File.Exists(copyText);
971971
var isFolder = Directory.Exists(copyText);
972972
if (isFile || isFolder)
973973
{
974-
var paths = new StringCollection();
975-
paths.Add(copyText);
974+
var paths = new StringCollection
975+
{
976+
copyText
977+
};
976978

977979
Clipboard.SetFileDropList(paths);
978980
App.API.ShowMsg(
979-
App.API.GetTranslation("copy")
980-
+ " "
981-
+ (isFile ? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle")),
981+
$"{App.API.GetTranslation("copy")} {(isFile ? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle"))}",
982982
App.API.GetTranslation("completedSuccessfully"));
983983
}
984984
else
985985
{
986-
Clipboard.SetDataObject(copyText.ToString());
986+
Clipboard.SetDataObject(copyText);
987987
App.API.ShowMsg(
988-
App.API.GetTranslation("copy")
989-
+ " "
990-
+ App.API.GetTranslation("textTitle"),
988+
$"{App.API.GetTranslation("copy")} {App.API.GetTranslation("textTitle")}",
991989
App.API.GetTranslation("completedSuccessfully"));
992990
}
993991
}

0 commit comments

Comments
 (0)