mirror of
https://github.com/Hofknecht/SystemTrayMenu.git
synced 2024-09-29 08:41:12 +13:00
parent
3ead0424d2
commit
24c370b738
12 changed files with 27 additions and 29 deletions
|
@ -212,7 +212,7 @@ namespace SystemTrayMenu.Controls
|
|||
public IEnumerable<CultureInfo> GetCultureList(
|
||||
CultureTypes cultureType = CultureTypes.SpecificCultures)
|
||||
{
|
||||
var cultureList = CultureInfo.GetCultures(cultureType).ToList();
|
||||
List<CultureInfo> cultureList = CultureInfo.GetCultures(cultureType).ToList();
|
||||
cultureList.Sort((p1, p2) => string.Compare(
|
||||
p1.NativeName, p2.NativeName, true));
|
||||
return cultureList;
|
||||
|
@ -234,12 +234,12 @@ namespace SystemTrayMenu.Controls
|
|||
}
|
||||
public static Bitmap ResizeImage(Image image, int width, int height)
|
||||
{
|
||||
var destRect = new Rectangle(0, 0, width, height);
|
||||
var destImage = new Bitmap(width, height);
|
||||
Rectangle destRect = new Rectangle(0, 0, width, height);
|
||||
Bitmap destImage = new Bitmap(width, height);
|
||||
|
||||
destImage.SetResolution(image.HorizontalResolution, image.VerticalResolution);
|
||||
|
||||
using (var graphics = Graphics.FromImage(destImage))
|
||||
using (Graphics graphics = Graphics.FromImage(destImage))
|
||||
{
|
||||
graphics.CompositingMode = CompositingMode.SourceCopy;
|
||||
graphics.CompositingQuality = CompositingQuality.HighQuality;
|
||||
|
@ -247,7 +247,7 @@ namespace SystemTrayMenu.Controls
|
|||
graphics.SmoothingMode = SmoothingMode.HighQuality;
|
||||
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
|
||||
|
||||
using (var wrapMode = new ImageAttributes())
|
||||
using (ImageAttributes wrapMode = new ImageAttributes())
|
||||
{
|
||||
wrapMode.SetWrapMode(WrapMode.TileFlipXY);
|
||||
graphics.DrawImage(image, destRect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, wrapMode);
|
||||
|
|
|
@ -168,7 +168,7 @@ namespace SystemTrayMenu
|
|||
{
|
||||
DataGridViewElementStates states = DataGridViewElementStates.None;
|
||||
dgv.AutoResizeRows();
|
||||
int height = (int)(dgv.Rows.GetRowsHeight(states));
|
||||
int height = dgv.Rows.GetRowsHeight(states);
|
||||
int heightMax = screen.Bounds.Height -
|
||||
new Taskbar().Size.Height -
|
||||
labelTitle.Height;
|
||||
|
@ -209,7 +209,7 @@ namespace SystemTrayMenu
|
|||
DataGridView dgv = menuPredecessor.GetDataGridView();
|
||||
if (dgv.Rows.Count > trigger.RowIndex)
|
||||
{
|
||||
var cellRectangle = dgv.GetCellDisplayRectangle(
|
||||
Rectangle cellRectangle = dgv.GetCellDisplayRectangle(
|
||||
0, trigger.RowIndex, false);
|
||||
int y = menuPredecessor.Location.Y +
|
||||
menuPredecessor.dgv.Location.Y +
|
||||
|
@ -229,7 +229,7 @@ namespace SystemTrayMenu
|
|||
DataGridViewExtensions.FastAutoSizeColumns(dgv);
|
||||
|
||||
bool scrollbarShown = false;
|
||||
foreach (var scroll in dgv.Controls.OfType<VScrollBar>())
|
||||
foreach (VScrollBar scroll in dgv.Controls.OfType<VScrollBar>())
|
||||
{
|
||||
if (scroll.Visible)
|
||||
{
|
||||
|
@ -312,7 +312,7 @@ namespace SystemTrayMenu
|
|||
{
|
||||
get
|
||||
{
|
||||
var Params = base.CreateParams;
|
||||
CreateParams Params = base.CreateParams;
|
||||
Params.ExStyle |= 0x80;
|
||||
return Params;
|
||||
}
|
||||
|
|
|
@ -77,7 +77,7 @@ namespace SystemTrayMenu.Controls
|
|||
else
|
||||
{
|
||||
IWshShell shell = new WshShell();
|
||||
var lnk = shell.CreateShortcut(TargetFilePath)
|
||||
IWshShortcut lnk = shell.CreateShortcut(TargetFilePath)
|
||||
as IWshShortcut;
|
||||
Arguments = lnk.Arguments;
|
||||
WorkingDirectory = lnk.WorkingDirectory;
|
||||
|
@ -156,7 +156,7 @@ namespace SystemTrayMenu.Controls
|
|||
private bool SetSln()
|
||||
{
|
||||
bool handled = false;
|
||||
var executable = new StringBuilder(1024);
|
||||
StringBuilder executable = new StringBuilder(1024);
|
||||
try
|
||||
{
|
||||
_ = FindExecutable(TargetFilePath, string.Empty, executable);
|
||||
|
|
|
@ -46,8 +46,8 @@ namespace SystemTrayMenu.Handler
|
|||
{
|
||||
if (!string.IsNullOrEmpty(Properties.Settings.Default.HotKey))
|
||||
{
|
||||
var cvt = new KeysConverter();
|
||||
var key = (Keys)cvt.ConvertFrom(
|
||||
KeysConverter cvt = new KeysConverter();
|
||||
Keys key = (Keys)cvt.ConvertFrom(
|
||||
Properties.Settings.Default.HotKey);
|
||||
try
|
||||
{
|
||||
|
|
|
@ -21,8 +21,8 @@ namespace SystemTrayMenu.Helper
|
|||
[MethodImpl(MethodImplOptions.NoInlining)]
|
||||
private static string GetCurrentMethod()
|
||||
{
|
||||
var st = new StackTrace();
|
||||
var sf = st.GetFrame(1);
|
||||
StackTrace st = new StackTrace();
|
||||
StackFrame sf = st.GetFrame(1);
|
||||
|
||||
return sf.GetMethod().Name;
|
||||
}
|
||||
|
|
|
@ -8,16 +8,16 @@ namespace SystemTrayMenu.Helper
|
|||
{
|
||||
public static void FastAutoSizeColumns(this DataGridView dgv)
|
||||
{
|
||||
var rows = dgv.Rows
|
||||
System.Collections.Generic.IEnumerable<DataGridViewRow> rows = dgv.Rows
|
||||
.Cast<DataGridViewRow>();
|
||||
using (var gfx = dgv.CreateGraphics())
|
||||
using (System.Drawing.Graphics gfx = dgv.CreateGraphics())
|
||||
{
|
||||
int i = 1;
|
||||
gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
|
||||
float widthMax = dgv.Columns[i].HeaderCell.Size.Width;
|
||||
foreach (DataGridViewRow row in rows)
|
||||
{
|
||||
var checkWidth = gfx.MeasureString(
|
||||
float checkWidth = gfx.MeasureString(
|
||||
row.Cells[i].Value.ToString() + "_",
|
||||
dgv.RowTemplate.DefaultCellStyle.Font).Width;
|
||||
if (checkWidth > widthMax)
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace SystemTrayMenu.Helper
|
|||
if (userChoiceKey == null)
|
||||
{
|
||||
//Read default browser path from Win XP registry key
|
||||
var browserKey = Registry.ClassesRoot.OpenSubKey(@"HTTP\shell\open\command", false);
|
||||
RegistryKey browserKey = Registry.ClassesRoot.OpenSubKey(@"HTTP\shell\open\command", false);
|
||||
|
||||
//If browser path wasn’t found, try Win Vista (and newer) registry key
|
||||
if (browserKey == null)
|
||||
|
@ -31,7 +31,7 @@ namespace SystemTrayMenu.Helper
|
|||
Registry.CurrentUser.OpenSubKey(
|
||||
urlAssociation, false);
|
||||
}
|
||||
var path = CleanifyBrowserPath(browserKey.GetValue(null) as string);
|
||||
string path = CleanifyBrowserPath(browserKey.GetValue(null) as string);
|
||||
browserKey.Close();
|
||||
return path;
|
||||
}
|
||||
|
@ -43,7 +43,7 @@ namespace SystemTrayMenu.Helper
|
|||
|
||||
// now look up the path of the executable
|
||||
string concreteBrowserKey = browserPathKey.Replace("$BROWSER$", progId);
|
||||
var kp = Registry.ClassesRoot.OpenSubKey(concreteBrowserKey, false);
|
||||
RegistryKey kp = Registry.ClassesRoot.OpenSubKey(concreteBrowserKey, false);
|
||||
browserPath = CleanifyBrowserPath(kp.GetValue(null) as string);
|
||||
kp.Close();
|
||||
}
|
||||
|
|
|
@ -214,8 +214,8 @@ namespace SystemTrayMenu.Helper
|
|||
|
||||
public static Icon AddIconOverlay(Icon originalIcon, Icon overlay)
|
||||
{
|
||||
var target = new Bitmap(originalIcon.Width, originalIcon.Height, PixelFormat.Format32bppArgb);
|
||||
var graphics = Graphics.FromImage(target);
|
||||
Bitmap target = new Bitmap(originalIcon.Width, originalIcon.Height, PixelFormat.Format32bppArgb);
|
||||
Graphics graphics = Graphics.FromImage(target);
|
||||
graphics.DrawIcon(originalIcon, 0, 0);
|
||||
graphics.DrawIcon(overlay, 0, 0);
|
||||
target.MakeTransparent(target.GetPixel(1, 1));
|
||||
|
|
|
@ -31,7 +31,7 @@ namespace SystemTrayMenu.Helper
|
|||
int LogicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES);
|
||||
int PhysicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES);
|
||||
|
||||
Factor = (float)PhysicalScreenHeight / (float)LogicalScreenHeight; // 1.25 = 125%
|
||||
Factor = PhysicalScreenHeight / (float)LogicalScreenHeight; // 1.25 = 125%
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1578,7 +1578,7 @@ namespace SystemTrayMenu.Helper
|
|||
m_filterFunc,
|
||||
IntPtr.Zero,
|
||||
#pragma warning disable CS0618 // depricated
|
||||
(int)AppDomain.GetCurrentThreadId());
|
||||
AppDomain.GetCurrentThreadId());
|
||||
#pragma warning restore CS0618 // depricated
|
||||
}
|
||||
// ************************************************************************
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace SystemTrayMenu.Helper
|
||||
|
|
Loading…
Reference in a new issue