Skip to content

Commit 77a4a86

Browse files
sergiyesergiye
committed
gadget background changed to solid black;
Font size menu items replaced with Decrease/Increase Font Size; Keyboard shortcuts have been changed to not conflict with search
1 parent 4878766 commit 77a4a86

5 files changed

Lines changed: 38 additions & 92 deletions

File tree

‎OpenHardwareMonitor/Resources/gadget.png‎

-3.81 KB
Loading

‎OpenHardwareMonitor/UI/GadgetWindow.cs‎

Lines changed: 16 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,14 @@ private void MoveToTopMost(IntPtr handle)
6767
NativeMethods.SetWindowPos(handle, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOSENDCHANGING);
6868
}
6969

70-
private CreateParams CreateParams
70+
private CreateParams CreateParams => new CreateParams
7171
{
72-
get
73-
{
74-
CreateParams cp = new CreateParams
75-
{
76-
Width = 4096,
77-
Height = 4096,
78-
X = _location.X,
79-
Y = _location.Y,
80-
ExStyle = WS_EX_LAYERED | WS_EX_TOOLWINDOW
81-
};
82-
83-
return cp;
84-
}
85-
}
72+
Width = 4096,
73+
Height = 4096,
74+
X = _location.X,
75+
Y = _location.Y,
76+
ExStyle = WS_EX_LAYERED | WS_EX_TOOLWINDOW
77+
};
8678

8779
protected override void WndProc(ref Message message)
8880
{
@@ -212,9 +204,7 @@ private void CreateBuffer()
212204
IntPtr hBmp = NativeMethods.CreateDIBSection(_handleBitmapDC, ref info, 0, out IntPtr _, IntPtr.Zero, 0);
213205
IntPtr hBmpOld = NativeMethods.SelectObject(_handleBitmapDC, hBmp);
214206
NativeMethods.DeleteObject(hBmpOld);
215-
216207
_graphics = Graphics.FromHdc(_handleBitmapDC);
217-
218208
if (Environment.OSVersion.Version.Major > 5)
219209
{
220210
_graphics.TextRenderingHint = TextRenderingHint.SystemDefault;
@@ -256,10 +246,7 @@ public void Redraw()
256246

257247
public byte Opacity
258248
{
259-
get
260-
{
261-
return _opacity;
262-
}
249+
get => _opacity;
263250
set
264251
{
265252
if (_opacity != value)
@@ -273,17 +260,13 @@ public byte Opacity
273260

274261
public bool Visible
275262
{
276-
get
277-
{
278-
return _visible;
279-
}
263+
get => _visible;
280264
set
281265
{
282266
if (_visible != value)
283267
{
284268
_visible = value;
285269
NativeMethods.SetWindowPos(Handle, IntPtr.Zero, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER | (value ? SWP_SHOWWINDOW : SWP_HIDEWINDOW));
286-
287270
if (value)
288271
{
289272
if (!_alwaysOnTop)
@@ -303,27 +286,21 @@ public bool Visible
303286

304287
public bool AlwaysOnTop
305288
{
306-
get
307-
{
308-
return _alwaysOnTop;
309-
}
289+
get => _alwaysOnTop;
310290
set
311291
{
312292
if (value != _alwaysOnTop)
313293
{
314294
_alwaysOnTop = value;
315-
316295
if (_alwaysOnTop)
317296
{
318297
if (_visible)
319298
ShowDesktop.Instance.ShowDesktopChanged -= ShowDesktopChanged;
320-
321299
MoveToTopMost(Handle);
322300
}
323301
else
324302
{
325303
MoveToBottom(Handle);
326-
327304
if (_visible)
328305
ShowDesktop.Instance.ShowDesktopChanged += ShowDesktopChanged;
329306
}
@@ -333,10 +310,7 @@ public bool AlwaysOnTop
333310

334311
public Size Size
335312
{
336-
get
337-
{
338-
return _size;
339-
}
313+
get => _size;
340314
set
341315
{
342316
if (_size != value)
@@ -350,10 +324,7 @@ public Size Size
350324

351325
public Point Location
352326
{
353-
get
354-
{
355-
return _location;
356-
}
327+
get => _location;
357328
set
358329
{
359330
if (_location != value)
@@ -461,25 +432,10 @@ private enum WindowAttribute : int
461432
/// </summary>
462433
private static class Macros
463434
{
464-
public static ushort LOWORD(IntPtr l)
465-
{
466-
return (ushort)((ulong)l & 0xFFFF);
467-
}
468-
469-
public static ushort HIWORD(IntPtr l)
470-
{
471-
return (ushort)(((ulong)l >> 16) & 0xFFFF);
472-
}
473-
474-
public static int GET_X_LPARAM(IntPtr lp)
475-
{
476-
return (short)LOWORD(lp);
477-
}
478-
479-
public static int GET_Y_LPARAM(IntPtr lp)
480-
{
481-
return (short)HIWORD(lp);
482-
}
435+
public static ushort LOWORD(IntPtr l) => (ushort)((ulong)l & 0xFFFF);
436+
public static ushort HIWORD(IntPtr l) => (ushort)(((ulong)l >> 16) & 0xFFFF);
437+
public static int GET_X_LPARAM(IntPtr lp) => (short)LOWORD(lp);
438+
public static int GET_Y_LPARAM(IntPtr lp) => (short)HIWORD(lp);
483439
}
484440

485441
/// <summary>

‎OpenHardwareMonitor/UI/MainForm.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenHardwareMonitor/UI/MainForm.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -746,18 +746,18 @@ private void TreeView_KeyDown(object sender, KeyEventArgs e)
746746
var node = treeView.SelectedNode;
747747
if (node is not {Tag: SensorNode sensorNode} || sensorNode.Sensor == null)
748748
return;
749-
if (e.KeyCode == Keys.H)
749+
if (e.KeyCode == Keys.H && e.Control)
750750
{
751751
treeView.SelectedNode = node.NextNode ?? node.PreviousNode;
752752
sensorNode.IsVisible = !sensorNode.IsVisible;
753753
e.SuppressKeyPress = true;
754754
e.Handled = true;
755755
}
756-
else if (e.KeyCode == Keys.P)
756+
else if (e.KeyCode == Keys.P && e.Control)
757757
{
758758
ShowParameterForm(sensorNode.Sensor);
759759
}
760-
else if (e.KeyCode == Keys.R)
760+
else if (e.KeyCode == Keys.R && e.Control)
761761
{
762762
sensorNode.PenColor = null;
763763
// treeView.SelectedNode = node.NextNode ?? node.PreviousNode;
@@ -794,7 +794,7 @@ private void TreeView_Click(object sender, EventArgs e)
794794
treeContextMenu.Items.Clear();
795795
if (node.Sensor.Parameters.Count > 0)
796796
{
797-
item = new ToolStripMenuItem("Parameters... (P)");
797+
item = new ToolStripMenuItem("Parameters... (Ctrl+P)");
798798
item.Click += delegate { ShowParameterForm(node.Sensor); };
799799
treeContextMenu.Items.Add(item);
800800
}
@@ -808,13 +808,13 @@ private void TreeView_Click(object sender, EventArgs e)
808808

809809
if (node.IsVisible)
810810
{
811-
item = new ToolStripMenuItem("Hide (H)");
811+
item = new ToolStripMenuItem("Hide (Ctrl+H)");
812812
item.Click += delegate { node.IsVisible = false; };
813813
treeContextMenu.Items.Add(item);
814814
}
815815
else
816816
{
817-
item = new ToolStripMenuItem("Unhide (H)");
817+
item = new ToolStripMenuItem("Unhide (Ctrl+H)");
818818
item.Click += delegate { node.IsVisible = true; };
819819
treeContextMenu.Items.Add(item);
820820
}
@@ -832,7 +832,7 @@ private void TreeView_Click(object sender, EventArgs e)
832832
};
833833
treeContextMenu.Items.Add(item);
834834

835-
item = new ToolStripMenuItem("Reset Pen Color (R)");
835+
item = new ToolStripMenuItem("Reset Pen Color (Ctrl+R)");
836836
item.Click += delegate { node.PenColor = null; };
837837
treeContextMenu.Items.Add(item);
838838

‎OpenHardwareMonitor/UI/SensorGadget.cs‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -126,31 +126,19 @@ public SensorGadget(IComputer computer, PersistentSettings settings)
126126
contextMenuStrip.Renderer = new ThemedToolStripRenderer();
127127
ToolStripMenuItem hardwareNamesItem = new ToolStripMenuItem("Hardware Names");
128128
contextMenuStrip.Items.Add(hardwareNamesItem);
129-
ToolStripMenuItem fontSizeMenu = new ToolStripMenuItem("Font Size");
130-
for (int i = 0; i < 4; i++)
129+
contextMenuStrip.Items.Add(new ToolStripMenuItem("Decrease Font Size", null, (_, _) =>
131130
{
132-
float size;
133-
string name;
134-
switch (i)
135-
{
136-
case 0: size = 6.5f; name = "Small"; break;
137-
case 1: size = 7.5f; name = "Medium"; break;
138-
case 2: size = 9f; name = "Large"; break;
139-
case 3: size = 11f; name = "Very Large"; break;
140-
default: throw new NotImplementedException();
141-
}
142-
143-
ToolStripItem item = new ToolStripMenuItem(name) { Checked = _fontSize == size };
144-
item.Click += delegate
145-
{
146-
SetFontSize(size);
147-
settings.SetValue("sensorGadget.FontSize", size);
148-
foreach (ToolStripMenuItem mi in fontSizeMenu.DropDownItems)
149-
mi.Checked = mi == item;
150-
};
151-
fontSizeMenu.DropDownItems.Add(item);
152-
}
153-
contextMenuStrip.Items.Add(fontSizeMenu);
131+
float newSize = _fontSize - 1;
132+
if (newSize <= 0) return;
133+
SetFontSize(newSize);
134+
settings.SetValue("sensorGadget.FontSize", newSize);
135+
}));
136+
contextMenuStrip.Items.Add(new ToolStripMenuItem("Increase Font Size", null, (_, _) =>
137+
{
138+
float newSize = _fontSize + 1;
139+
SetFontSize(newSize);
140+
settings.SetValue("sensorGadget.FontSize", newSize);
141+
}));
154142

155143
Color fontColor = settings.GetValue("sensorGadget.FontColor", Color.White);
156144
int fontColorArgb = fontColor.ToArgb();
@@ -425,6 +413,8 @@ private Font CreateFont(float size, FontStyle style)
425413
private void SetFontSize(float size)
426414
{
427415
_fontSize = size;
416+
_largeFont?.Dispose();
417+
_smallFont?.Dispose();
428418
_largeFont = CreateFont(_fontSize, FontStyle.Bold);
429419
_smallFont = CreateFont(_fontSize, FontStyle.Regular);
430420

0 commit comments

Comments
 (0)