From c8f4c4b0d4df5991ade171eeaf95e612617d8fe8 Mon Sep 17 00:00:00 2001 From: seerge Date: Sun, 5 Mar 2023 18:23:38 +0100 Subject: [PATCH] Added more actions for m3/m4, fixed scaling --- AnimeMatrix/AnimeMatrixDevice.cs | 2 - Communication/Device.cs | 1 - Communication/Packet.cs | 7 +- Fans.Designer.cs | 87 ++++++----- GHelper.csproj | 2 +- Keyboard.Designer.cs | 2 +- Keyboard.cs | 53 +++++-- NativeMethods.cs | 1 + Program.cs | 110 +++++++------ Settings.Designer.cs | 261 ++++++++++++++++--------------- Settings.cs | 6 +- 11 files changed, 291 insertions(+), 241 deletions(-) diff --git a/AnimeMatrix/AnimeMatrixDevice.cs b/AnimeMatrix/AnimeMatrixDevice.cs index 9c94f3c8..f6f6c6e2 100644 --- a/AnimeMatrix/AnimeMatrixDevice.cs +++ b/AnimeMatrix/AnimeMatrixDevice.cs @@ -5,7 +5,6 @@ using Starlight.Communication; namespace Starlight.AnimeMatrix { - public class BuiltInAnimation { public enum Startup @@ -138,7 +137,6 @@ namespace Starlight.AnimeMatrix public void SetLedPlanar(int x, int y, byte value) { EnsureRowInRange(y); - var ledsInRow = Columns(y); var start = RowToLinearAddress(y) - EmptyColumns(y); if (x > EmptyColumns(y)) diff --git a/Communication/Device.cs b/Communication/Device.cs index 2603d222..d57bf509 100644 --- a/Communication/Device.cs +++ b/Communication/Device.cs @@ -1,6 +1,5 @@ // Source thanks to https://github.com/vddCore/Starlight :) - using Starlight.Communication.Platform; namespace Starlight.Communication diff --git a/Communication/Packet.cs b/Communication/Packet.cs index 0aa0bc87..d743aa96 100644 --- a/Communication/Packet.cs +++ b/Communication/Packet.cs @@ -1,8 +1,5 @@ // Source thanks to https://github.com/vddCore/Starlight :) -using System.ComponentModel; -using HidSharp; - namespace Starlight.Communication { public abstract class Packet @@ -20,7 +17,7 @@ namespace Starlight.Communication "Packet length must be at least 1." ); } - + Data = new byte[packetLength]; Data[0] = reportId; @@ -33,7 +30,7 @@ namespace Starlight.Communication "Your packet length does not allow for initial data to be appended." ); } - + AppendData(data); } } diff --git a/Fans.Designer.cs b/Fans.Designer.cs index 774cba66..44d0a7cf 100644 --- a/Fans.Designer.cs +++ b/Fans.Designer.cs @@ -58,26 +58,29 @@ // chartArea1.Name = "ChartArea1"; chartCPU.ChartAreas.Add(chartArea1); - chartCPU.Location = new Point(362, 30); + chartCPU.Location = new Point(195, 14); + chartCPU.Margin = new Padding(2, 1, 2, 1); chartCPU.Name = "chartCPU"; - chartCPU.Size = new Size(772, 464); + chartCPU.Size = new Size(416, 218); chartCPU.TabIndex = 0; chartCPU.Text = "chartCPU"; // // buttonApply // - buttonApply.Location = new Point(879, 1016); + buttonApply.Location = new Point(473, 476); + buttonApply.Margin = new Padding(2, 1, 2, 1); buttonApply.Name = "buttonApply"; - buttonApply.Size = new Size(254, 46); + buttonApply.Size = new Size(137, 22); buttonApply.TabIndex = 1; buttonApply.Text = "Apply Fan Curve"; buttonApply.UseVisualStyleBackColor = true; // // buttonReset // - buttonReset.Location = new Point(362, 1016); + buttonReset.Location = new Point(195, 476); + buttonReset.Margin = new Padding(2, 1, 2, 1); buttonReset.Name = "buttonReset"; - buttonReset.Size = new Size(254, 46); + buttonReset.Size = new Size(137, 22); buttonReset.TabIndex = 2; buttonReset.Text = "Factory Defaults"; buttonReset.UseVisualStyleBackColor = true; @@ -86,9 +89,10 @@ // chartArea2.Name = "ChartArea1"; chartGPU.ChartAreas.Add(chartArea2); - chartGPU.Location = new Point(362, 511); + chartGPU.Location = new Point(195, 240); + chartGPU.Margin = new Padding(2, 1, 2, 1); chartGPU.Name = "chartGPU"; - chartGPU.Size = new Size(772, 480); + chartGPU.Size = new Size(416, 225); chartGPU.TabIndex = 3; chartGPU.Text = "chart1"; // @@ -103,10 +107,11 @@ groupBox1.Controls.Add(label1); groupBox1.Controls.Add(trackCPU); groupBox1.Controls.Add(trackTotal); - groupBox1.Location = new Point(12, 12); + groupBox1.Location = new Point(6, 6); + groupBox1.Margin = new Padding(2, 1, 2, 1); groupBox1.Name = "groupBox1"; - groupBox1.Padding = new Padding(5); - groupBox1.Size = new Size(330, 979); + groupBox1.Padding = new Padding(3, 2, 3, 2); + groupBox1.Size = new Size(178, 459); groupBox1.TabIndex = 4; groupBox1.TabStop = false; groupBox1.Text = "Power Limits (PPT)"; @@ -115,9 +120,10 @@ // labelApplied.AutoSize = true; labelApplied.ForeColor = Color.Tomato; - labelApplied.Location = new Point(14, 39); + labelApplied.Location = new Point(8, 18); + labelApplied.Margin = new Padding(2, 0, 2, 0); labelApplied.Name = "labelApplied"; - labelApplied.Size = new Size(143, 32); + labelApplied.Size = new Size(71, 15); labelApplied.TabIndex = 13; labelApplied.Text = "Not Applied"; // @@ -126,9 +132,10 @@ pictureFine.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; pictureFine.BackgroundImage = Properties.Resources.everything_is_fine_itsfine; pictureFine.BackgroundImageLayout = ImageLayout.Zoom; - pictureFine.Location = new Point(9, 731); + pictureFine.Location = new Point(5, 343); + pictureFine.Margin = new Padding(2, 1, 2, 1); pictureFine.Name = "pictureFine"; - pictureFine.Size = new Size(311, 240); + pictureFine.Size = new Size(167, 112); pictureFine.TabIndex = 12; pictureFine.TabStop = false; pictureFine.Visible = false; @@ -137,9 +144,10 @@ // labelInfo.AutoSize = true; labelInfo.Dock = DockStyle.Bottom; - labelInfo.Location = new Point(5, 942); + labelInfo.Location = new Point(3, 442); + labelInfo.Margin = new Padding(2, 0, 2, 0); labelInfo.Name = "labelInfo"; - labelInfo.Size = new Size(65, 32); + labelInfo.Size = new Size(32, 15); labelInfo.TabIndex = 11; labelInfo.Text = "label"; // @@ -147,9 +155,10 @@ // labelCPU.AutoSize = true; labelCPU.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelCPU.Location = new Point(197, 125); + labelCPU.Location = new Point(106, 59); + labelCPU.Margin = new Padding(2, 0, 2, 0); labelCPU.Name = "labelCPU"; - labelCPU.Size = new Size(61, 32); + labelCPU.Size = new Size(30, 15); labelCPU.TabIndex = 10; labelCPU.Text = "CPU"; labelCPU.TextAlign = ContentAlignment.MiddleCenter; @@ -158,9 +167,10 @@ // labelTotal.AutoSize = true; labelTotal.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelTotal.Location = new Point(39, 125); + labelTotal.Location = new Point(21, 59); + labelTotal.Margin = new Padding(2, 0, 2, 0); labelTotal.Name = "labelTotal"; - labelTotal.Size = new Size(70, 32); + labelTotal.Size = new Size(34, 15); labelTotal.TabIndex = 9; labelTotal.Text = "Total"; labelTotal.TextAlign = ContentAlignment.MiddleCenter; @@ -168,9 +178,10 @@ // label2 // label2.AutoSize = true; - label2.Location = new Point(200, 91); + label2.Location = new Point(108, 43); + label2.Margin = new Padding(2, 0, 2, 0); label2.Name = "label2"; - label2.Size = new Size(58, 32); + label2.Size = new Size(30, 15); label2.TabIndex = 8; label2.Text = "CPU"; label2.TextAlign = ContentAlignment.MiddleCenter; @@ -178,33 +189,36 @@ // label1 // label1.AutoSize = true; - label1.Location = new Point(41, 91); + label1.Location = new Point(22, 43); + label1.Margin = new Padding(2, 0, 2, 0); label1.Name = "label1"; - label1.Size = new Size(65, 32); + label1.Size = new Size(32, 15); label1.TabIndex = 7; label1.Text = "Total"; label1.TextAlign = ContentAlignment.MiddleCenter; // // trackCPU // - trackCPU.Location = new Point(203, 178); + trackCPU.Location = new Point(109, 83); + trackCPU.Margin = new Padding(2, 1, 2, 1); trackCPU.Maximum = 85; trackCPU.Minimum = 15; trackCPU.Name = "trackCPU"; trackCPU.Orientation = Orientation.Vertical; - trackCPU.Size = new Size(90, 444); + trackCPU.Size = new Size(45, 208); trackCPU.TabIndex = 6; trackCPU.TickFrequency = 5; trackCPU.Value = 80; // // trackTotal // - trackTotal.Location = new Point(42, 178); + trackTotal.Location = new Point(23, 83); + trackTotal.Margin = new Padding(2, 1, 2, 1); trackTotal.Maximum = 150; trackTotal.Minimum = 15; trackTotal.Name = "trackTotal"; trackTotal.Orientation = Orientation.Vertical; - trackTotal.Size = new Size(90, 444); + trackTotal.Size = new Size(45, 208); trackTotal.TabIndex = 5; trackTotal.TickFrequency = 5; trackTotal.TickStyle = TickStyle.TopLeft; @@ -212,9 +226,10 @@ // // buttonApplyPower // - buttonApplyPower.Location = new Point(15, 1016); + buttonApplyPower.Location = new Point(8, 476); + buttonApplyPower.Margin = new Padding(2, 1, 2, 1); buttonApplyPower.Name = "buttonApplyPower"; - buttonApplyPower.Size = new Size(327, 46); + buttonApplyPower.Size = new Size(176, 22); buttonApplyPower.TabIndex = 11; buttonApplyPower.Text = "Apply Power Limits"; buttonApplyPower.UseVisualStyleBackColor = true; @@ -222,18 +237,19 @@ // checkAuto // checkAuto.AutoSize = true; - checkAuto.Location = new Point(708, 1022); + checkAuto.Location = new Point(381, 479); + checkAuto.Margin = new Padding(2, 1, 2, 1); checkAuto.Name = "checkAuto"; - checkAuto.Size = new Size(165, 36); + checkAuto.Size = new Size(86, 19); checkAuto.TabIndex = 12; checkAuto.Text = "Auto Apply"; checkAuto.UseVisualStyleBackColor = true; // // Fans // - AutoScaleDimensions = new SizeF(13F, 32F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1154, 1089); + ClientSize = new Size(621, 510); Controls.Add(checkAuto); Controls.Add(buttonApplyPower); Controls.Add(groupBox1); @@ -242,6 +258,7 @@ Controls.Add(buttonApply); Controls.Add(chartCPU); FormBorderStyle = FormBorderStyle.FixedSingle; + Margin = new Padding(2, 1, 2, 1); MaximizeBox = false; MdiChildrenMinimizedAnchorBottom = false; MinimizeBox = false; diff --git a/GHelper.csproj b/GHelper.csproj index 4e26af8b..f76c71d7 100644 --- a/GHelper.csproj +++ b/GHelper.csproj @@ -15,7 +15,7 @@ GHelper x64 False - 0.15 + 0.15.1 True diff --git a/Keyboard.Designer.cs b/Keyboard.Designer.cs index e0c58709..bbea83e8 100644 --- a/Keyboard.Designer.cs +++ b/Keyboard.Designer.cs @@ -91,7 +91,7 @@ // comboM3 // comboM3.FormattingEnabled = true; - comboM3.Items.AddRange(new object[] { "Volume Mute", "Play / Pause", "Toggle Aura", "Custom" }); + comboM3.Items.AddRange(new object[] { "Default", "Volume Mute", "Play / Pause", "PrintScreen", "Toggle Aura", "Custom" }); comboM3.Location = new Point(93, 54); comboM3.Name = "comboM3"; comboM3.Size = new Size(312, 40); diff --git a/Keyboard.cs b/Keyboard.cs index da9fc701..5cf390eb 100644 --- a/Keyboard.cs +++ b/Keyboard.cs @@ -1,16 +1,36 @@ -namespace GHelper +using System.Diagnostics.Metrics; + +namespace GHelper { public partial class Keyboard : Form { + + + Dictionary customActions = new Dictionary + { + {"","--------------" }, + {"mute", "Volume Mute"}, + {"screenshot", "Screenshot"}, + {"play", "Play/Pause"}, + {"aura", "Aura"}, + {"custom", "Custom"} + }; + + public Keyboard() { InitializeComponent(); comboM3.DropDownStyle = ComboBoxStyle.DropDownList; - comboM3.SelectedIndex = 0; + comboM3.DataSource = new BindingSource(customActions, null); + comboM3.DisplayMember = "Value"; + comboM3.ValueMember = "Key"; + customActions[""] = "Performance"; comboM4.DropDownStyle = ComboBoxStyle.DropDownList; - comboM4.SelectedIndex = 0; + comboM4.DataSource = new BindingSource(customActions, null); + comboM4.DisplayMember = "Value"; + comboM4.ValueMember = "Key"; comboM3.SelectedValueChanged += ComboM3_SelectedValueChanged; comboM4.SelectedValueChanged += ComboM4_SelectedValueChanged; @@ -35,18 +55,23 @@ Program.config.setConfig("m4_custom", tb.Text); } - private void ComboM4_SelectedValueChanged(object? sender, EventArgs e) + private void ComboKeyChanged(object? sender, string name = "m3") { if (sender is null) return; ComboBox cmb = (ComboBox)sender; - Program.config.setConfig("m4", cmb.SelectedIndex); + + if (cmb.SelectedValue is not null) + Program.config.setConfig(name, cmb.SelectedValue.ToString()); + } + + private void ComboM4_SelectedValueChanged(object? sender, EventArgs e) + { + ComboKeyChanged(sender, "m4"); } private void ComboM3_SelectedValueChanged(object? sender, EventArgs e) { - if (sender is null) return; - ComboBox cmb = (ComboBox)sender; - Program.config.setConfig("m3", cmb.SelectedIndex); + ComboKeyChanged(sender, "m3"); } private void Keyboard_Shown(object? sender, EventArgs e) @@ -55,14 +80,14 @@ Top = Program.settingsForm.Top; Left = Program.settingsForm.Left - Width - 5; - int m3 = Program.config.getConfig("m3"); - int m4 = Program.config.getConfig("m4"); + string m3 = Program.config.getConfigString("m3"); + string m4 = Program.config.getConfigString("m4"); - if (m3 != -1) - comboM3.SelectedIndex = m3; + comboM3.SelectedValue = (m3 is not null) ? m3 : ""; + comboM4.SelectedValue = (m4 is not null) ? m4 : ""; - if (m4 != -1) - comboM4.SelectedIndex = m4; + if (comboM3.SelectedValue is null) comboM3.SelectedValue = ""; + if (comboM4.SelectedValue is null) comboM4.SelectedValue = ""; textM3.Text = Program.config.getConfigString("m3_custom"); textM4.Text = Program.config.getConfigString("m4_custom"); diff --git a/NativeMethods.cs b/NativeMethods.cs index c8f5b887..139f814c 100644 --- a/NativeMethods.cs +++ b/NativeMethods.cs @@ -11,6 +11,7 @@ public class NativeMethods public const int VK_MEDIA_PLAY_PAUSE = 0xB3; public const int VK_MEDIA_PREV_TRACK = 0xB1; public const int VK_VOLUME_MUTE = 0xAD; + public const int VK_SNAPSHOT = 0x2C; [DllImport("user32.dll", SetLastError = true)] public static extern void keybd_event(byte virtualKey, byte scanCode, uint flags, IntPtr extraInfo); diff --git a/Program.cs b/Program.cs index 8e7e4447..31d3b13a 100644 --- a/Program.cs +++ b/Program.cs @@ -109,6 +109,63 @@ namespace GHelper } + static void CustomKey(string configKey = "m3") + { + string command = config.getConfigString(configKey + "_custom"); + int intKey; + + try + { + intKey = Convert.ToInt32(command, 16); + } catch + { + intKey = -1; + } + + + if (intKey > 0) + NativeMethods.KeyPress(intKey); + else + LaunchProcess(command); + + } + + static void KeyProcess(string name = "m3") + { + string action = config.getConfigString(name); + + if (action.Length == 0) + { + if (name == "m4") + action = "performance"; + } + + switch (action) + { + case "mute": + NativeMethods.KeyPress(NativeMethods.VK_VOLUME_MUTE); + break; + case "play": + NativeMethods.KeyPress(NativeMethods.VK_MEDIA_PLAY_PAUSE); + break; + case "screenshot": + NativeMethods.KeyPress(NativeMethods.VK_SNAPSHOT); + break; + case "aura": + settingsForm.BeginInvoke(settingsForm.CycleAuraMode); + break; + case "performance": + settingsForm.BeginInvoke(settingsForm.CyclePerformanceMode); + break; + case "custom": + CustomKey(name); + break; + default: + break; + } + } + + static void WatcherEventArrived(object sender, EventArrivedEventArgs e) { var collection = (ManagementEventWatcher)sender; @@ -122,64 +179,17 @@ namespace GHelper switch (EventID) { case 124: // M3 - switch (config.getConfig("m3")) - { - case 1: - NativeMethods.KeyPress(NativeMethods.VK_MEDIA_PLAY_PAUSE); - break; - case 2: - settingsForm.BeginInvoke(settingsForm.CycleAuraMode); - break; - case 3: - LaunchProcess(config.getConfigString("m3_custom")); - break; - default: - NativeMethods.KeyPress(NativeMethods.VK_VOLUME_MUTE); - break; - } + KeyProcess("m3"); return; case 56: // M4 / Rog button - switch (config.getConfig("m4")) - { - case 1: - settingsForm.BeginInvoke(SettingsToggle); - break; - case 2: - LaunchProcess(config.getConfigString("m4_custom")); - break; - default: - settingsForm.BeginInvoke(settingsForm.CyclePerformanceMode); - break; - } + KeyProcess("m4"); return; case 174: // FN+F5 settingsForm.BeginInvoke(settingsForm.CyclePerformanceMode); return; case 179: // FN+F4 - settingsForm.BeginInvoke(delegate - { - settingsForm.CycleAuraMode(); - }); + settingsForm.BeginInvoke(settingsForm.CycleAuraMode); return; - case 87: // Battery - /* - settingsForm.BeginInvoke(delegate - { - settingsForm.AutoGPUMode(0); - settingsForm.AutoScreen(0); - }); - */ - return; - case 88: // Plugged - /* - settingsForm.BeginInvoke(delegate - { - settingsForm.AutoScreen(1); - settingsForm.AutoGPUMode(1); - }); - */ - return; - } diff --git a/Settings.Designer.cs b/Settings.Designer.cs index 2c9d5585..a0a14213 100644 --- a/Settings.Designer.cs +++ b/Settings.Designer.cs @@ -88,10 +88,10 @@ // checkStartup // checkStartup.AutoSize = true; - checkStartup.Location = new Point(35, 1138); - checkStartup.Margin = new Padding(4, 2, 4, 2); + checkStartup.Location = new Point(18, 569); + checkStartup.Margin = new Padding(2, 1, 2, 1); checkStartup.Name = "checkStartup"; - checkStartup.Size = new Size(206, 36); + checkStartup.Size = new Size(105, 19); checkStartup.TabIndex = 2; checkStartup.Text = "Run on Startup"; checkStartup.UseVisualStyleBackColor = true; @@ -101,12 +101,12 @@ // trackBattery.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; trackBattery.LargeChange = 20; - trackBattery.Location = new Point(22, 1030); - trackBattery.Margin = new Padding(4, 2, 4, 2); + trackBattery.Location = new Point(11, 515); + trackBattery.Margin = new Padding(2, 1, 2, 1); trackBattery.Maximum = 100; trackBattery.Minimum = 50; trackBattery.Name = "trackBattery"; - trackBattery.Size = new Size(682, 90); + trackBattery.Size = new Size(341, 45); trackBattery.SmallChange = 10; trackBattery.TabIndex = 3; trackBattery.TickFrequency = 10; @@ -117,10 +117,10 @@ // labelBatteryTitle.AutoSize = true; labelBatteryTitle.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelBatteryTitle.Location = new Point(80, 992); - labelBatteryTitle.Margin = new Padding(4, 0, 4, 0); + labelBatteryTitle.Location = new Point(40, 496); + labelBatteryTitle.Margin = new Padding(2, 0, 2, 0); labelBatteryTitle.Name = "labelBatteryTitle"; - labelBatteryTitle.Size = new Size(248, 32); + labelBatteryTitle.Size = new Size(122, 15); labelBatteryTitle.TabIndex = 4; labelBatteryTitle.Text = "Battery Charge Limit"; // @@ -128,20 +128,20 @@ // pictureBattery.BackgroundImage = (Image)resources.GetObject("pictureBattery.BackgroundImage"); pictureBattery.BackgroundImageLayout = ImageLayout.Zoom; - pictureBattery.Location = new Point(38, 990); - pictureBattery.Margin = new Padding(4, 2, 4, 2); + pictureBattery.Location = new Point(19, 495); + pictureBattery.Margin = new Padding(2, 1, 2, 1); pictureBattery.Name = "pictureBattery"; - pictureBattery.Size = new Size(36, 38); + pictureBattery.Size = new Size(18, 19); pictureBattery.TabIndex = 6; pictureBattery.TabStop = false; // // labelGPUFan // labelGPUFan.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelGPUFan.Location = new Point(344, 262); - labelGPUFan.Margin = new Padding(4, 0, 4, 0); + labelGPUFan.Location = new Point(172, 131); + labelGPUFan.Margin = new Padding(2, 0, 2, 0); labelGPUFan.Name = "labelGPUFan"; - labelGPUFan.Size = new Size(348, 32); + labelGPUFan.Size = new Size(174, 16); labelGPUFan.TabIndex = 8; labelGPUFan.Text = " "; labelGPUFan.TextAlign = ContentAlignment.TopRight; @@ -156,12 +156,12 @@ tableGPU.Controls.Add(buttonUltimate, 2, 0); tableGPU.Controls.Add(buttonStandard, 1, 0); tableGPU.Controls.Add(buttonEco, 0, 0); - tableGPU.Location = new Point(22, 304); - tableGPU.Margin = new Padding(4, 2, 4, 2); + tableGPU.Location = new Point(11, 152); + tableGPU.Margin = new Padding(2, 1, 2, 1); tableGPU.Name = "tableGPU"; tableGPU.RowCount = 1; - tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 108F)); - tableGPU.Size = new Size(682, 108); + tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 54F)); + tableGPU.Size = new Size(341, 54); tableGPU.TabIndex = 7; // // buttonUltimate @@ -170,10 +170,10 @@ buttonUltimate.Dock = DockStyle.Fill; buttonUltimate.FlatAppearance.BorderSize = 0; buttonUltimate.FlatStyle = FlatStyle.Flat; - buttonUltimate.Location = new Point(462, 12); - buttonUltimate.Margin = new Padding(8, 12, 8, 12); + buttonUltimate.Location = new Point(230, 6); + buttonUltimate.Margin = new Padding(4, 6, 4, 6); buttonUltimate.Name = "buttonUltimate"; - buttonUltimate.Size = new Size(212, 84); + buttonUltimate.Size = new Size(107, 42); buttonUltimate.TabIndex = 2; buttonUltimate.Text = "Ultimate"; buttonUltimate.UseVisualStyleBackColor = false; @@ -184,10 +184,10 @@ buttonStandard.Dock = DockStyle.Fill; buttonStandard.FlatAppearance.BorderSize = 0; buttonStandard.FlatStyle = FlatStyle.Flat; - buttonStandard.Location = new Point(235, 12); - buttonStandard.Margin = new Padding(8, 12, 8, 12); + buttonStandard.Location = new Point(117, 6); + buttonStandard.Margin = new Padding(4, 6, 4, 6); buttonStandard.Name = "buttonStandard"; - buttonStandard.Size = new Size(211, 84); + buttonStandard.Size = new Size(105, 42); buttonStandard.TabIndex = 1; buttonStandard.Text = "Standard"; buttonStandard.UseVisualStyleBackColor = false; @@ -199,10 +199,10 @@ buttonEco.Dock = DockStyle.Fill; buttonEco.FlatAppearance.BorderSize = 0; buttonEco.FlatStyle = FlatStyle.Flat; - buttonEco.Location = new Point(8, 12); - buttonEco.Margin = new Padding(8, 12, 8, 12); + buttonEco.Location = new Point(4, 6); + buttonEco.Margin = new Padding(4, 6, 4, 6); buttonEco.Name = "buttonEco"; - buttonEco.Size = new Size(211, 84); + buttonEco.Size = new Size(105, 42); buttonEco.TabIndex = 0; buttonEco.Text = "Eco"; buttonEco.UseVisualStyleBackColor = false; @@ -211,10 +211,10 @@ // labelGPU.AutoSize = true; labelGPU.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelGPU.Location = new Point(78, 264); - labelGPU.Margin = new Padding(4, 0, 4, 0); + labelGPU.Location = new Point(39, 132); + labelGPU.Margin = new Padding(2, 0, 2, 0); labelGPU.Name = "labelGPU"; - labelGPU.Size = new Size(136, 32); + labelGPU.Size = new Size(67, 15); labelGPU.TabIndex = 9; labelGPU.Text = "GPU Mode"; // @@ -222,20 +222,20 @@ // pictureGPU.BackgroundImage = (Image)resources.GetObject("pictureGPU.BackgroundImage"); pictureGPU.BackgroundImageLayout = ImageLayout.Zoom; - pictureGPU.Location = new Point(36, 262); - pictureGPU.Margin = new Padding(4, 2, 4, 2); + pictureGPU.Location = new Point(18, 131); + pictureGPU.Margin = new Padding(2, 1, 2, 1); pictureGPU.Name = "pictureGPU"; - pictureGPU.Size = new Size(36, 38); + pictureGPU.Size = new Size(18, 19); pictureGPU.TabIndex = 10; pictureGPU.TabStop = false; // // labelCPUFan // labelCPUFan.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelCPUFan.Location = new Point(326, 38); - labelCPUFan.Margin = new Padding(4, 0, 4, 0); + labelCPUFan.Location = new Point(163, 19); + labelCPUFan.Margin = new Padding(2, 0, 2, 0); labelCPUFan.Name = "labelCPUFan"; - labelCPUFan.Size = new Size(366, 32); + labelCPUFan.Size = new Size(183, 16); labelCPUFan.TabIndex = 12; labelCPUFan.Text = " "; labelCPUFan.TextAlign = ContentAlignment.TopRight; @@ -250,12 +250,12 @@ tablePerf.Controls.Add(buttonTurbo, 2, 0); tablePerf.Controls.Add(buttonBalanced, 1, 0); tablePerf.Controls.Add(buttonSilent, 0, 0); - tablePerf.Location = new Point(22, 76); - tablePerf.Margin = new Padding(4, 2, 4, 2); + tablePerf.Location = new Point(11, 38); + tablePerf.Margin = new Padding(2, 1, 2, 1); tablePerf.Name = "tablePerf"; tablePerf.RowCount = 1; - tablePerf.RowStyles.Add(new RowStyle(SizeType.Absolute, 108F)); - tablePerf.Size = new Size(682, 108); + tablePerf.RowStyles.Add(new RowStyle(SizeType.Absolute, 54F)); + tablePerf.Size = new Size(341, 54); tablePerf.TabIndex = 11; // // buttonTurbo @@ -265,10 +265,10 @@ buttonTurbo.FlatAppearance.BorderColor = Color.FromArgb(192, 0, 0); buttonTurbo.FlatAppearance.BorderSize = 0; buttonTurbo.FlatStyle = FlatStyle.Flat; - buttonTurbo.Location = new Point(462, 12); - buttonTurbo.Margin = new Padding(8, 12, 8, 12); + buttonTurbo.Location = new Point(230, 6); + buttonTurbo.Margin = new Padding(4, 6, 4, 6); buttonTurbo.Name = "buttonTurbo"; - buttonTurbo.Size = new Size(212, 84); + buttonTurbo.Size = new Size(107, 42); buttonTurbo.TabIndex = 2; buttonTurbo.Text = "Turbo"; buttonTurbo.UseVisualStyleBackColor = false; @@ -280,10 +280,10 @@ buttonBalanced.FlatAppearance.BorderColor = Color.FromArgb(0, 0, 192); buttonBalanced.FlatAppearance.BorderSize = 0; buttonBalanced.FlatStyle = FlatStyle.Flat; - buttonBalanced.Location = new Point(235, 12); - buttonBalanced.Margin = new Padding(8, 12, 8, 12); + buttonBalanced.Location = new Point(117, 6); + buttonBalanced.Margin = new Padding(4, 6, 4, 6); buttonBalanced.Name = "buttonBalanced"; - buttonBalanced.Size = new Size(211, 84); + buttonBalanced.Size = new Size(105, 42); buttonBalanced.TabIndex = 1; buttonBalanced.Text = "Balanced"; buttonBalanced.UseVisualStyleBackColor = false; @@ -296,10 +296,10 @@ buttonSilent.FlatAppearance.BorderColor = Color.FromArgb(0, 192, 192); buttonSilent.FlatAppearance.BorderSize = 0; buttonSilent.FlatStyle = FlatStyle.Flat; - buttonSilent.Location = new Point(8, 12); - buttonSilent.Margin = new Padding(8, 12, 8, 12); + buttonSilent.Location = new Point(4, 6); + buttonSilent.Margin = new Padding(4, 6, 4, 6); buttonSilent.Name = "buttonSilent"; - buttonSilent.Size = new Size(211, 84); + buttonSilent.Size = new Size(105, 42); buttonSilent.TabIndex = 0; buttonSilent.Text = "Silent"; buttonSilent.UseVisualStyleBackColor = false; @@ -309,10 +309,10 @@ picturePerf.BackgroundImage = (Image)resources.GetObject("picturePerf.BackgroundImage"); picturePerf.BackgroundImageLayout = ImageLayout.Zoom; picturePerf.InitialImage = null; - picturePerf.Location = new Point(36, 36); - picturePerf.Margin = new Padding(4, 2, 4, 2); + picturePerf.Location = new Point(18, 18); + picturePerf.Margin = new Padding(2, 1, 2, 1); picturePerf.Name = "picturePerf"; - picturePerf.Size = new Size(36, 38); + picturePerf.Size = new Size(18, 19); picturePerf.TabIndex = 14; picturePerf.TabStop = false; // @@ -320,10 +320,10 @@ // labelPerf.AutoSize = true; labelPerf.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelPerf.Location = new Point(78, 38); - labelPerf.Margin = new Padding(4, 0, 4, 0); + labelPerf.Location = new Point(39, 19); + labelPerf.Margin = new Padding(2, 0, 2, 0); labelPerf.Name = "labelPerf"; - labelPerf.Size = new Size(234, 32); + labelPerf.Size = new Size(115, 15); labelPerf.TabIndex = 13; labelPerf.Text = "Performance Mode"; // @@ -331,10 +331,10 @@ // checkGPU.AutoSize = true; checkGPU.ForeColor = SystemColors.GrayText; - checkGPU.Location = new Point(32, 412); - checkGPU.Margin = new Padding(4, 2, 4, 2); + checkGPU.Location = new Point(16, 206); + checkGPU.Margin = new Padding(2, 1, 2, 1); checkGPU.Name = "checkGPU"; - checkGPU.Size = new Size(550, 36); + checkGPU.Size = new Size(273, 19); checkGPU.TabIndex = 15; checkGPU.Text = "Set Eco on battery and Standard when plugged"; checkGPU.UseVisualStyleBackColor = true; @@ -344,10 +344,10 @@ // buttonQuit.Anchor = AnchorStyles.Top | AnchorStyles.Right; buttonQuit.BackColor = SystemColors.ButtonFace; - buttonQuit.Location = new Point(584, 1130); - buttonQuit.Margin = new Padding(4, 2, 4, 2); + buttonQuit.Location = new Point(292, 565); + buttonQuit.Margin = new Padding(2, 1, 2, 1); buttonQuit.Name = "buttonQuit"; - buttonQuit.Size = new Size(120, 48); + buttonQuit.Size = new Size(60, 24); buttonQuit.TabIndex = 16; buttonQuit.Text = "Quit"; buttonQuit.UseVisualStyleBackColor = false; @@ -356,10 +356,10 @@ // pictureScreen.BackgroundImage = (Image)resources.GetObject("pictureScreen.BackgroundImage"); pictureScreen.BackgroundImageLayout = ImageLayout.Zoom; - pictureScreen.Location = new Point(36, 496); - pictureScreen.Margin = new Padding(4, 2, 4, 2); + pictureScreen.Location = new Point(18, 248); + pictureScreen.Margin = new Padding(2, 1, 2, 1); pictureScreen.Name = "pictureScreen"; - pictureScreen.Size = new Size(36, 38); + pictureScreen.Size = new Size(18, 19); pictureScreen.TabIndex = 18; pictureScreen.TabStop = false; // @@ -367,10 +367,10 @@ // labelSreen.AutoSize = true; labelSreen.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelSreen.Location = new Point(78, 496); - labelSreen.Margin = new Padding(4, 0, 4, 0); + labelSreen.Location = new Point(39, 248); + labelSreen.Margin = new Padding(2, 0, 2, 0); labelSreen.Name = "labelSreen"; - labelSreen.Size = new Size(176, 32); + labelSreen.Size = new Size(87, 15); labelSreen.TabIndex = 17; labelSreen.Text = "Laptop Screen"; // @@ -383,12 +383,12 @@ tableScreen.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.33333F)); tableScreen.Controls.Add(button120Hz, 1, 0); tableScreen.Controls.Add(button60Hz, 0, 0); - tableScreen.Location = new Point(22, 536); - tableScreen.Margin = new Padding(4, 2, 4, 2); + tableScreen.Location = new Point(11, 268); + tableScreen.Margin = new Padding(2, 1, 2, 1); tableScreen.Name = "tableScreen"; tableScreen.RowCount = 1; - tableScreen.RowStyles.Add(new RowStyle(SizeType.Absolute, 108F)); - tableScreen.Size = new Size(682, 108); + tableScreen.RowStyles.Add(new RowStyle(SizeType.Absolute, 54F)); + tableScreen.Size = new Size(341, 54); tableScreen.TabIndex = 19; // // button120Hz @@ -398,10 +398,10 @@ button120Hz.FlatAppearance.BorderColor = SystemColors.ActiveBorder; button120Hz.FlatAppearance.BorderSize = 0; button120Hz.FlatStyle = FlatStyle.Flat; - button120Hz.Location = new Point(235, 12); - button120Hz.Margin = new Padding(8, 12, 8, 12); + button120Hz.Location = new Point(117, 6); + button120Hz.Margin = new Padding(4, 6, 4, 6); button120Hz.Name = "button120Hz"; - button120Hz.Size = new Size(211, 84); + button120Hz.Size = new Size(105, 42); button120Hz.TabIndex = 1; button120Hz.Text = "120Hz + OD"; button120Hz.UseVisualStyleBackColor = false; @@ -415,10 +415,10 @@ button60Hz.FlatAppearance.BorderSize = 0; button60Hz.FlatStyle = FlatStyle.Flat; button60Hz.ForeColor = SystemColors.ControlText; - button60Hz.Location = new Point(8, 12); - button60Hz.Margin = new Padding(8, 12, 8, 12); + button60Hz.Location = new Point(4, 6); + button60Hz.Margin = new Padding(4, 6, 4, 6); button60Hz.Name = "button60Hz"; - button60Hz.Size = new Size(211, 84); + button60Hz.Size = new Size(105, 42); button60Hz.TabIndex = 0; button60Hz.Text = "60Hz"; button60Hz.UseVisualStyleBackColor = false; @@ -427,10 +427,10 @@ // checkScreen.AutoSize = true; checkScreen.ForeColor = SystemColors.GrayText; - checkScreen.Location = new Point(32, 644); - checkScreen.Margin = new Padding(4, 2, 4, 2); + checkScreen.Location = new Point(16, 322); + checkScreen.Margin = new Padding(2, 1, 2, 1); checkScreen.Name = "checkScreen"; - checkScreen.Size = new Size(527, 36); + checkScreen.Size = new Size(261, 19); checkScreen.TabIndex = 20; checkScreen.Text = "Set 60Hz on battery, and back when plugged"; checkScreen.UseVisualStyleBackColor = true; @@ -439,10 +439,10 @@ // checkBoost.AutoSize = true; checkBoost.ForeColor = SystemColors.GrayText; - checkBoost.Location = new Point(32, 184); - checkBoost.Margin = new Padding(4, 2, 4, 2); + checkBoost.Location = new Point(16, 92); + checkBoost.Margin = new Padding(2, 1, 2, 1); checkBoost.Name = "checkBoost"; - checkBoost.Size = new Size(320, 36); + checkBoost.Size = new Size(161, 19); checkBoost.TabIndex = 21; checkBoost.Text = "CPU Turbo Boost enabled"; checkBoost.UseVisualStyleBackColor = true; @@ -451,10 +451,10 @@ // pictureKeyboard.BackgroundImage = Properties.Resources.icons8_keyboard_48; pictureKeyboard.BackgroundImageLayout = ImageLayout.Zoom; - pictureKeyboard.Location = new Point(36, 724); - pictureKeyboard.Margin = new Padding(4, 2, 4, 2); + pictureKeyboard.Location = new Point(18, 362); + pictureKeyboard.Margin = new Padding(2, 1, 2, 1); pictureKeyboard.Name = "pictureKeyboard"; - pictureKeyboard.Size = new Size(36, 36); + pictureKeyboard.Size = new Size(18, 18); pictureKeyboard.TabIndex = 23; pictureKeyboard.TabStop = false; // @@ -462,10 +462,10 @@ // label1.AutoSize = true; label1.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - label1.Location = new Point(78, 724); - label1.Margin = new Padding(4, 0, 4, 0); + label1.Location = new Point(39, 362); + label1.Margin = new Padding(2, 0, 2, 0); label1.Name = "label1"; - label1.Size = new Size(210, 32); + label1.Size = new Size(101, 15); label1.TabIndex = 22; label1.Text = "Laptop Keyboard"; // @@ -473,12 +473,12 @@ // comboKeyboard.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboKeyboard.FormattingEnabled = true; - comboKeyboard.ItemHeight = 32; + comboKeyboard.ItemHeight = 15; comboKeyboard.Items.AddRange(new object[] { "Static", "Breathe", "Strobe", "Rainbow", "Dingding" }); - comboKeyboard.Location = new Point(30, 770); + comboKeyboard.Location = new Point(15, 385); comboKeyboard.Margin = new Padding(0); comboKeyboard.Name = "comboKeyboard"; - comboKeyboard.Size = new Size(211, 40); + comboKeyboard.Size = new Size(108, 23); comboKeyboard.TabIndex = 24; comboKeyboard.TabStop = false; // @@ -489,10 +489,10 @@ buttonKeyboardColor.FlatAppearance.BorderColor = Color.Red; buttonKeyboardColor.FlatAppearance.BorderSize = 2; buttonKeyboardColor.ForeColor = SystemColors.ControlText; - buttonKeyboardColor.Location = new Point(257, 766); + buttonKeyboardColor.Location = new Point(128, 383); buttonKeyboardColor.Margin = new Padding(0); buttonKeyboardColor.Name = "buttonKeyboardColor"; - buttonKeyboardColor.Size = new Size(211, 48); + buttonKeyboardColor.Size = new Size(106, 25); buttonKeyboardColor.TabIndex = 25; buttonKeyboardColor.Text = "Color "; buttonKeyboardColor.UseVisualStyleBackColor = false; @@ -500,10 +500,10 @@ // labelBattery // labelBattery.Anchor = AnchorStyles.Top | AnchorStyles.Right; - labelBattery.Location = new Point(420, 991); - labelBattery.Margin = new Padding(4, 0, 4, 0); + labelBattery.Location = new Point(210, 496); + labelBattery.Margin = new Padding(2, 0, 2, 0); labelBattery.Name = "labelBattery"; - labelBattery.Size = new Size(276, 32); + labelBattery.Size = new Size(138, 16); labelBattery.TabIndex = 27; labelBattery.Text = " "; labelBattery.TextAlign = ContentAlignment.TopRight; @@ -513,10 +513,10 @@ buttonFans.Anchor = AnchorStyles.Top | AnchorStyles.Right; buttonFans.BackColor = SystemColors.ButtonFace; buttonFans.FlatAppearance.BorderSize = 0; - buttonFans.Location = new Point(486, 186); - buttonFans.Margin = new Padding(4, 2, 4, 2); + buttonFans.Location = new Point(243, 93); + buttonFans.Margin = new Padding(2, 1, 2, 1); buttonFans.Name = "buttonFans"; - buttonFans.Size = new Size(210, 48); + buttonFans.Size = new Size(105, 24); buttonFans.TabIndex = 28; buttonFans.Text = "Fans and Power"; buttonFans.UseVisualStyleBackColor = false; @@ -526,27 +526,29 @@ buttonKeyboard.Anchor = AnchorStyles.Top | AnchorStyles.Right; buttonKeyboard.BackColor = SystemColors.ButtonFace; buttonKeyboard.FlatAppearance.BorderSize = 0; - buttonKeyboard.Location = new Point(486, 765); - buttonKeyboard.Margin = new Padding(4, 2, 4, 2); + buttonKeyboard.Location = new Point(243, 382); + buttonKeyboard.Margin = new Padding(2, 1, 2, 1); buttonKeyboard.Name = "buttonKeyboard"; - buttonKeyboard.Size = new Size(209, 48); + buttonKeyboard.Size = new Size(104, 24); buttonKeyboard.TabIndex = 29; buttonKeyboard.Text = "Extra"; buttonKeyboard.UseVisualStyleBackColor = false; // // pictureColor // - pictureColor.Location = new Point(431, 781); + pictureColor.Location = new Point(216, 390); + pictureColor.Margin = new Padding(2, 2, 2, 2); pictureColor.Name = "pictureColor"; - pictureColor.Size = new Size(20, 20); + pictureColor.Size = new Size(10, 10); pictureColor.TabIndex = 30; pictureColor.TabStop = false; // // pictureColor2 // - pictureColor2.Location = new Point(405, 781); + pictureColor2.Location = new Point(202, 390); + pictureColor2.Margin = new Padding(2, 2, 2, 2); pictureColor2.Name = "pictureColor2"; - pictureColor2.Size = new Size(20, 20); + pictureColor2.Size = new Size(10, 10); pictureColor2.TabIndex = 31; pictureColor2.TabStop = false; // @@ -555,9 +557,10 @@ labelVersion.AutoSize = true; labelVersion.Font = new Font("Segoe UI", 9F, FontStyle.Underline, GraphicsUnit.Point); labelVersion.ForeColor = SystemColors.ControlDark; - labelVersion.Location = new Point(36, 1088); + labelVersion.Location = new Point(18, 544); + labelVersion.Margin = new Padding(2, 0, 2, 0); labelVersion.Name = "labelVersion"; - labelVersion.Size = new Size(44, 32); + labelVersion.Size = new Size(22, 15); labelVersion.TabIndex = 32; labelVersion.Text = "v.0"; // @@ -565,10 +568,10 @@ // pictureMatrix.BackgroundImage = Properties.Resources.icons8_matrix_desktop_48; pictureMatrix.BackgroundImageLayout = ImageLayout.Zoom; - pictureMatrix.Location = new Point(36, 858); - pictureMatrix.Margin = new Padding(4, 2, 4, 2); + pictureMatrix.Location = new Point(18, 429); + pictureMatrix.Margin = new Padding(2, 1, 2, 1); pictureMatrix.Name = "pictureMatrix"; - pictureMatrix.Size = new Size(36, 36); + pictureMatrix.Size = new Size(18, 18); pictureMatrix.TabIndex = 34; pictureMatrix.TabStop = false; // @@ -576,10 +579,10 @@ // labelMatrix.AutoSize = true; labelMatrix.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - labelMatrix.Location = new Point(78, 858); - labelMatrix.Margin = new Padding(4, 0, 4, 0); + labelMatrix.Location = new Point(39, 429); + labelMatrix.Margin = new Padding(2, 0, 2, 0); labelMatrix.Name = "labelMatrix"; - labelMatrix.Size = new Size(170, 32); + labelMatrix.Size = new Size(83, 15); labelMatrix.TabIndex = 33; labelMatrix.Text = "Anime Matrix"; // @@ -587,12 +590,12 @@ // comboMatrix.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboMatrix.FormattingEnabled = true; - comboMatrix.ItemHeight = 32; + comboMatrix.ItemHeight = 15; comboMatrix.Items.AddRange(new object[] { "Off", "Dim", "Medium", "Bright" }); - comboMatrix.Location = new Point(30, 910); + comboMatrix.Location = new Point(15, 455); comboMatrix.Margin = new Padding(0); comboMatrix.Name = "comboMatrix"; - comboMatrix.Size = new Size(211, 40); + comboMatrix.Size = new Size(108, 23); comboMatrix.TabIndex = 35; comboMatrix.TabStop = false; // @@ -600,12 +603,12 @@ // comboMatrixRunning.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboMatrixRunning.FormattingEnabled = true; - comboMatrixRunning.ItemHeight = 32; + comboMatrixRunning.ItemHeight = 15; comboMatrixRunning.Items.AddRange(new object[] { "Binary Banner", "Rog Logo", "Picture" }); - comboMatrixRunning.Location = new Point(257, 910); + comboMatrixRunning.Location = new Point(128, 455); comboMatrixRunning.Margin = new Padding(0); comboMatrixRunning.Name = "comboMatrixRunning"; - comboMatrixRunning.Size = new Size(211, 40); + comboMatrixRunning.Size = new Size(108, 23); comboMatrixRunning.TabIndex = 36; comboMatrixRunning.TabStop = false; // @@ -614,19 +617,19 @@ buttonMatrix.Anchor = AnchorStyles.Top | AnchorStyles.Right; buttonMatrix.BackColor = SystemColors.ButtonFace; buttonMatrix.FlatAppearance.BorderSize = 0; - buttonMatrix.Location = new Point(486, 905); - buttonMatrix.Margin = new Padding(4, 2, 4, 2); + buttonMatrix.Location = new Point(243, 452); + buttonMatrix.Margin = new Padding(2, 1, 2, 1); buttonMatrix.Name = "buttonMatrix"; - buttonMatrix.Size = new Size(209, 48); + buttonMatrix.Size = new Size(104, 24); buttonMatrix.TabIndex = 37; buttonMatrix.Text = "Picture"; buttonMatrix.UseVisualStyleBackColor = false; // // SettingsForm // - AutoScaleDimensions = new SizeF(192F, 192F); + AutoScaleDimensions = new SizeF(96F, 96F); AutoScaleMode = AutoScaleMode.Dpi; - ClientSize = new Size(736, 1203); + ClientSize = new Size(368, 602); Controls.Add(buttonMatrix); Controls.Add(comboMatrixRunning); Controls.Add(comboMatrix); @@ -662,12 +665,12 @@ Controls.Add(trackBattery); Controls.Add(checkStartup); FormBorderStyle = FormBorderStyle.FixedSingle; - Margin = new Padding(4, 2, 4, 2); + Margin = new Padding(2, 1, 2, 1); MaximizeBox = false; MdiChildrenMinimizedAnchorBottom = false; MinimizeBox = false; Name = "SettingsForm"; - Padding = new Padding(8, 12, 8, 12); + Padding = new Padding(4, 6, 4, 6); ShowIcon = false; StartPosition = FormStartPosition.CenterScreen; Text = "G-Helper"; diff --git a/Settings.cs b/Settings.cs index 590f6b67..4036b1b8 100644 --- a/Settings.cs +++ b/Settings.cs @@ -572,7 +572,7 @@ namespace GHelper if (Program.config.getConfig("fan_rpm") == 1) return " Fan: " + (fan * 100).ToString() + "RPM"; else - return " Fan: " + Math.Round(fan / 0.6).ToString() + "%"; // relatively to 6000 rpm + return " Fan: " + Math.Min(Math.Round(fan / 0.6), 100).ToString() + "%"; // relatively to 6000 rpm } private static void RefreshSensors() @@ -604,7 +604,7 @@ namespace GHelper private static void OnTimedEvent(Object? source, ElapsedEventArgs? e) { RefreshSensors(); - aTimer.Interval = 1000; + aTimer.Interval = 2000; } private void SettingsForm_VisibleChanged(object? sender, EventArgs e) @@ -617,7 +617,7 @@ namespace GHelper this.Top = Screen.FromControl(this).WorkingArea.Height - 10 - this.Height; this.Activate(); - aTimer.Interval = 100; + aTimer.Interval = 300; aTimer.Enabled = true; }