CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 09:17:36 +13:00
Code Issues Projects Releases Packages Wiki Activity

Don't need to use QueryContinueDrag

Browse source
This commit is contained in:
Jaex 2019-05-20 15:58:40 +03:00
parent cd1dcb80f9
commit 57334a7e70
5 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShareX/Controls/TaskPanel.Designer.cs generated
View file

@ -77,7 +77,6 @@ private void InitializeComponent()
this.pbThumbnail.Size = new System.Drawing.Size(246, 246);
this.pbThumbnail.TabIndex = 2;
this.pbThumbnail.TabStop = false;
this.pbThumbnail.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.PbThumbnail_QueryContinueDrag);
this.pbThumbnail.MouseClick += new System.Windows.Forms.MouseEventHandler(this.PbThumbnail_MouseClick);
this.pbThumbnail.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PbThumbnail_MouseDown);
this.pbThumbnail.MouseMove += new System.Windows.Forms.MouseEventHandler(this.PbThumbnail_MouseMove);

9
ShareX/Controls/TaskPanel.cs
View file

@ -260,16 +260,9 @@ private void PbThumbnail_MouseMove(object sender, MouseEventArgs e)
Program.MainForm.AllowDrop = false;
dragBoxFromMouseDown = Rectangle.Empty;
pbThumbnail.DoDragDrop(dataObject, DragDropEffects.Copy | DragDropEffects.Move);
Program.MainForm.AllowDrop = true;
}
}
}
private void PbThumbnail_QueryContinueDrag(object sender, QueryContinueDragEventArgs e)
{
if (e.Action != DragAction.Continue)
{
Program.MainForm.AllowDrop = true;
}
}
}
}

1
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -350,7 +350,6 @@ private void InitializeComponent()
this.lvUploads.DrawItem += new System.Windows.Forms.DrawListViewItemEventHandler(this.LvUploads_DrawItem);
this.lvUploads.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.lvUploads_ItemDrag);
this.lvUploads.SelectedIndexChanged += new System.EventHandler(this.lvUploads_SelectedIndexChanged);
this.lvUploads.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.lvUploads_QueryContinueDrag);
this.lvUploads.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvUploads_KeyDown);
this.lvUploads.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvUploads_MouseDoubleClick);
this.lvUploads.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvUploads_MouseUp);

10
ShareX/Forms/MainForm.cs
View file

@ -1521,20 +1521,12 @@ private void lvUploads_ItemDrag(object sender, ItemDragEventArgs e)
if (dataObject != null)
{
AllowDrop = false;
lvUploads.DoDragDrop(dataObject, DragDropEffects.Copy | DragDropEffects.Move);
AllowDrop = true;
}
}
}
private void lvUploads_QueryContinueDrag(object sender, QueryContinueDragEventArgs e)
{
if (e.Action != DragAction.Continue)
{
AllowDrop = true;
}
}
private void pbDiscordOpen_Click(object sender, EventArgs e)
{
URLHelpers.OpenURL(Links.URL_DISCORD);

26
ShareX/Forms/MainForm.resx
View file

@ -292,7 +292,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="flpSupportUs.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -971,7 +971,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<metadata name="cmsTaskInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>286, 17</value>
@ -1959,7 +1959,7 @@
<value>NoControl</value>
</data>
<data name="btnCloseNews.Location" type="System.Drawing.Point, System.Drawing">
<value>720, 400</value>
<value>560, 400</value>
</data>
<data name="btnCloseNews.Size" type="System.Drawing.Size, System.Drawing">
<value>91, 23</value>
@ -1989,7 +1989,7 @@
<value>0, 0</value>
</data>
<data name="ucNews.Size" type="System.Drawing.Size, System.Drawing">
<value>834, 429</value>
<value>674, 429</value>
</data>
<data name="ucNews.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -2010,10 +2010,10 @@
<value>Fill</value>
</data>
<data name="pNews.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
<value>160, 0</value>
</data>
<data name="pNews.Size" type="System.Drawing.Size, System.Drawing">
<value>834, 429</value>
<value>674, 429</value>
</data>
<data name="pNews.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -2031,7 +2031,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pNews.ZOrder" xml:space="preserve">
<value>5</value>
<value>2</value>
</data>
<data name="lblThumbnailViewTip.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -2049,7 +2049,7 @@
<value>20, 20, 20, 20</value>
</data>
<data name="lblThumbnailViewTip.Size" type="System.Drawing.Size, System.Drawing">
<value>834, 429</value>
<value>674, 429</value>
</data>
<data name="lblThumbnailViewTip.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -2076,7 +2076,7 @@
<value>0, 0</value>
</data>
<data name="ucTaskView.Size" type="System.Drawing.Size, System.Drawing">
<value>834, 429</value>
<value>674, 429</value>
</data>
<data name="ucTaskView.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -2097,10 +2097,10 @@
<value>Fill</value>
</data>
<data name="pThumbnailView.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
<value>160, 0</value>
</data>
<data name="pThumbnailView.Size" type="System.Drawing.Size, System.Drawing">
<value>834, 429</value>
<value>674, 429</value>
</data>
<data name="pThumbnailView.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -2115,7 +2115,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pThumbnailView.ZOrder" xml:space="preserve">
<value>6</value>
<value>3</value>
</data>
<data name="flpCommunity.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@ -2178,7 +2178,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;flpCommunity.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>