From 16772609467354907c6ab71118d59ae437dedcae Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 30 Sep 2022 07:00:36 +0300 Subject: [PATCH] Overlay visual improvements --- .../Controls/TaskThumbnailPanel.Designer.cs | 8 ++--- ShareX/Controls/TaskThumbnailPanel.cs | 36 ++++++++----------- ShareX/Controls/TaskThumbnailPanel.resx | 10 +++--- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/ShareX/Controls/TaskThumbnailPanel.Designer.cs b/ShareX/Controls/TaskThumbnailPanel.Designer.cs index fab610e23..ec133cca3 100644 --- a/ShareX/Controls/TaskThumbnailPanel.Designer.cs +++ b/ShareX/Controls/TaskThumbnailPanel.Designer.cs @@ -65,6 +65,7 @@ private void InitializeComponent() // // pThumbnail // + this.pThumbnail.AllowDrop = true; this.pThumbnail.BackColor = System.Drawing.Color.Transparent; this.pThumbnail.Controls.Add(this.lblCombineVertical); this.pThumbnail.Controls.Add(this.lblError); @@ -77,6 +78,9 @@ private void InitializeComponent() this.pThumbnail.Radius = 5F; this.pThumbnail.Selected = false; this.pThumbnail.StatusLocation = ShareX.ThumbnailTitleLocation.Top; + this.pThumbnail.DragDrop += new System.Windows.Forms.DragEventHandler(this.pThumbnail_DragDrop); + this.pThumbnail.DragEnter += new System.Windows.Forms.DragEventHandler(this.pThumbnail_DragEnter); + this.pThumbnail.DragLeave += new System.EventHandler(this.pThumbnail_DragLeave); // // lblCombineVertical // @@ -129,16 +133,12 @@ private void InitializeComponent() // // TaskThumbnailPanel // - this.AllowDrop = true; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.pThumbnail); this.Controls.Add(this.lblTitle); this.Name = "TaskThumbnailPanel"; - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TaskThumbnailPanel_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.TaskThumbnailPanel_DragEnter); - this.DragLeave += new System.EventHandler(this.TaskThumbnailPanel_DragLeave); this.pThumbnail.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbThumbnail)).EndInit(); this.ResumeLayout(false); diff --git a/ShareX/Controls/TaskThumbnailPanel.cs b/ShareX/Controls/TaskThumbnailPanel.cs index 4edcd0bd5..78c62d1df 100644 --- a/ShareX/Controls/TaskThumbnailPanel.cs +++ b/ShareX/Controls/TaskThumbnailPanel.cs @@ -233,7 +233,6 @@ public Size ThumbnailSize public ThumbnailViewClickAction ClickAction { get; set; } private Rectangle dragBoxFromMouseDown; - private Orientation combineOrientation; public TaskThumbnailPanel(WorkerTask task) { @@ -322,10 +321,10 @@ private void UpdateLayout() lblError.Location = new Point((ClientSize.Width - lblError.Width) / 2, pThumbnail.Height - lblError.Height - 1); } - lblCombineHorizontal.Location = new Point(0, 0); - lblCombineHorizontal.Size = new Size(pThumbnail.Width, pThumbnail.Height / 2); - lblCombineVertical.Location = new Point(0, pThumbnail.Height / 2 - 1); - lblCombineVertical.Size = new Size(pThumbnail.Width, pThumbnail.Height / 2); + lblCombineHorizontal.Location = new Point(pbThumbnail.Left, pbThumbnail.Top); + lblCombineHorizontal.Size = new Size(pbThumbnail.Width, pbThumbnail.Height / 2); + lblCombineVertical.Location = new Point(pbThumbnail.Left, pbThumbnail.Top + pbThumbnail.Height / 2 - 1); + lblCombineVertical.Size = new Size(pbThumbnail.Width, pbThumbnail.Height / 2 + 1); } public void UpdateThumbnail(Bitmap bmp = null) @@ -570,7 +569,7 @@ private void PbThumbnail_MouseMove(object sender, MouseEventArgs e) { if (Task.Info != null && !string.IsNullOrEmpty(Task.Info.FilePath) && File.Exists(Task.Info.FilePath)) { - AllowDrop = false; + pThumbnail.AllowDrop = false; Program.MainForm.AllowDrop = false; try @@ -581,7 +580,7 @@ private void PbThumbnail_MouseMove(object sender, MouseEventArgs e) } finally { - AllowDrop = true; + pThumbnail.AllowDrop = true; Program.MainForm.AllowDrop = true; } } @@ -592,7 +591,7 @@ private void PbThumbnail_MouseMove(object sender, MouseEventArgs e) } } - private void TaskThumbnailPanel_DragEnter(object sender, DragEventArgs e) + private void pThumbnail_DragEnter(object sender, DragEventArgs e) { string filePath = Task.Info.FilePath; @@ -610,28 +609,21 @@ private void TaskThumbnailPanel_DragEnter(object sender, DragEventArgs e) } } - private void TaskThumbnailPanel_DragLeave(object sender, EventArgs e) + private void pThumbnail_DragLeave(object sender, EventArgs e) { lblCombineHorizontal.Visible = false; lblCombineVertical.Visible = false; } - private void TaskThumbnailPanel_DragDrop(object sender, DragEventArgs e) + private void pThumbnail_DragDrop(object sender, DragEventArgs e) { - Rectangle horizontal = lblCombineHorizontal.RectangleToScreen(lblCombineHorizontal.ClientRectangle); + Orientation combineOrientation = Orientation.Horizontal; - if (horizontal.Contains(e.X, e.Y)) - { - combineOrientation = Orientation.Horizontal; - } - else - { - Rectangle vertical = lblCombineVertical.RectangleToScreen(lblCombineVertical.ClientRectangle); + Point vertical = lblCombineVertical.PointToScreen(lblCombineVertical.ClientRectangle.Location); - if (vertical.Contains(e.X, e.Y)) - { - combineOrientation = Orientation.Vertical; - } + if (e.Y >= vertical.Y) + { + combineOrientation = Orientation.Vertical; } string filePath = Task.Info.FilePath; diff --git a/ShareX/Controls/TaskThumbnailPanel.resx b/ShareX/Controls/TaskThumbnailPanel.resx index 0bfd9a2ea..ff41cd986 100644 --- a/ShareX/Controls/TaskThumbnailPanel.resx +++ b/ShareX/Controls/TaskThumbnailPanel.resx @@ -147,7 +147,7 @@ 1 - Segoe UI, 20.25pt + Segoe UI, 14.25pt 40, 128 @@ -159,7 +159,8 @@ 6 - Vertical + Combine images +(Vertical) False @@ -211,7 +212,7 @@ 1 - Segoe UI, 20.25pt + Segoe UI, 14.25pt 40, 40 @@ -223,7 +224,8 @@ 5 - Horizontal + Combine images +(Horizontal) False