CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-29 03:30:43 +12:00
Code Issues Packages Projects Releases Wiki Activity

Use vertical line as separator

Browse source
This commit is contained in:
Jaex 2022-03-31 19:02:52 +03:00
parent 112427071b
commit 339b801b76
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ShareX.HelpersLib/Forms/ImageViewer.cs
View file

@ -26,7 +26,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
namespace ShareX.HelpersLib
@ -42,6 +41,7 @@ public class ImageViewer : Form
public string[] Images { get; private set; }
public int CurrentImageIndex { get; private set; }
public int NavigationButtonWidth { get; set; } = 100;
public string Status { get; private set; }
private ImageViewer(Image img)
{
@ -79,7 +79,7 @@ private void LoadCurrentImage()
LoadImage(img);
}
UpdateStatusLabel();
UpdateStatus();
}
private void NavigateImage(int position)
@ -141,13 +141,13 @@ private void FilterImageFiles()
Images = filteredImages.ToArray();
}
private void UpdateStatusLabel()
private void UpdateStatus()
{
StringBuilder sbStatus = new StringBuilder();
Status = "";
if (CanNavigate)
{
sbStatus.Append($"{CurrentImageIndex + 1} / {Images.Length}");
AppendStatus($"{CurrentImageIndex + 1} / {Images.Length}");
}
string fileName = Helpers.GetFileNameSafe(CurrentImageFilePath);
@ -155,21 +155,29 @@ private void UpdateStatusLabel()
if (!string.IsNullOrEmpty(fileName))
{
fileName = fileName.Truncate(128, "...");
sbStatus.Append($" {fileName}");
AppendStatus(fileName);
}
if (CurrentImage != null)
{
sbStatus.Append($" ({CurrentImage.Width} x {CurrentImage.Height})");
AppendStatus($"{CurrentImage.Width} x {CurrentImage.Height}");
}
string status = sbStatus.ToString().Trim();
lblStatus.Visible = !string.IsNullOrEmpty(status);
lblStatus.Text = status;
lblStatus.Visible = !string.IsNullOrEmpty(Status);
lblStatus.Text = Status;
lblStatus.Location = new Point((ClientSize.Width - lblStatus.Width) / 2, 0);
}
private void AppendStatus(string text)
{
if (!string.IsNullOrEmpty(Status))
{
Status += " │ ";
}
Status += text;
}
public static void ShowImage(Image img)
{
if (img != null)
@ -214,7 +222,7 @@ public static void ShowImage(string[] files, int imageIndex = 0)
private void ImageViewer_Shown(object sender, EventArgs e)
{
UpdateStatusLabel();
UpdateStatus();
this.ForceActivate();
}
@ -249,7 +257,7 @@ private void pbPreview_MouseClick(object sender, MouseEventArgs e)
private void pbPreview_MouseMove(object sender, MouseEventArgs e)
{
lblStatus.Visible = !string.IsNullOrEmpty(lblStatus.Text) && !new Rectangle(lblStatus.Location, lblStatus.Size).Contains(e.Location);
lblStatus.Visible = !string.IsNullOrEmpty(Status) && !new Rectangle(lblStatus.Location, lblStatus.Size).Contains(e.Location);
lblLeft.Visible = CanNavigateLeft && new Rectangle(lblLeft.Location, lblLeft.Size).Contains(e.Location);
lblRight.Visible = CanNavigateRight && new Rectangle(lblRight.Location, lblRight.Size).Contains(e.Location);
}