CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-04 04:06:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

fixed #1251: Get proper size tray icon in high dpi

Browse source
This commit is contained in:
Jaex 2016-01-17 10:40:26 +02:00
parent ead29ac5fb
commit 3e15a3c76a
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX/Forms/MainForm.cs
View file

@ -515,7 +515,7 @@ private void CleanCustomClipboardFormats()
private void LoadSettings()
{
niTray.Icon = ShareXResources.Icon;
niTray.Icon = TaskHelpers.GetTrayIcon();
niTray.Visible = Program.Settings.ShowTray;
if (Program.Settings.RecentLinksRemember)

2
ShareX/Forms/ScreenRecordForm.cs
View file

@ -53,7 +53,7 @@ public partial class ScreenRecordForm : BaseForm
public ScreenRecordForm(Rectangle regionRectangle, bool activateWindow = true, float duration = 0)
{
InitializeComponent();
niTray.Icon = ShareXResources.Icon;
niTray.Icon = TaskHelpers.GetTrayIcon();
this.activateWindow = activateWindow;
this.duration = duration;

8
ShareX/TaskHelpers.cs
View file

@ -332,6 +332,14 @@ public static PointInfo SelectPointColor()
return null;
}
public static Icon GetTrayIcon()
{
using (Icon icon = ShareXResources.Icon)
{
return new Icon(icon, SystemInformation.SmallIconSize);
}
}
public static Icon GetProgressIcon(int percentage)
{
using (Bitmap bmp = new Bitmap(16, 16))

4
ShareX/TaskManager.cs
View file

@ -451,12 +451,12 @@ public static void UpdateTrayIcon(int progress = -1)
DebugHelper.WriteException(e);
progress = -1;
if (lastIconStatus == progress) return;
icon = ShareXResources.Icon;
icon = TaskHelpers.GetTrayIcon();
}
}
else
{
icon = ShareXResources.Icon;
icon = TaskHelpers.GetTrayIcon();
}
using (Icon oldIcon = Program.MainForm.niTray.Icon)