From 228ad70b8d4d945871fdaac332071a0945e308c4 Mon Sep 17 00:00:00 2001 From: seerge Date: Thu, 30 Mar 2023 11:57:11 +0200 Subject: [PATCH] UI tweaks --- app/AnimeMatrix/AnimeMatrixDevice.cs | 2 +- app/ControlHelper.cs | 3 ++- app/CustomControls.cs | 4 ++-- app/HardwareMonitor.cs | 1 - app/Program.cs | 2 +- app/Settings.Designer.cs | 3 --- app/Settings.cs | 12 ++++++------ 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/AnimeMatrix/AnimeMatrixDevice.cs b/app/AnimeMatrix/AnimeMatrixDevice.cs index 2f3d8f0d..ba1c9e2d 100644 --- a/app/AnimeMatrix/AnimeMatrixDevice.cs +++ b/app/AnimeMatrix/AnimeMatrixDevice.cs @@ -390,7 +390,7 @@ namespace Starlight.AnimeMatrix } - public void GenerateFrame(Image image, InterpolationMode interpolation = InterpolationMode.HighQualityBicubic) + public void GenerateFrame(Image image, InterpolationMode interpolation = InterpolationMode.High) { int width = MaxColumns/2 * 6; diff --git a/app/ControlHelper.cs b/app/ControlHelper.cs index d873547a..79e1f028 100644 --- a/app/ControlHelper.cs +++ b/app/ControlHelper.cs @@ -106,7 +106,8 @@ public static class ControlHelper combo.BackColor = backMain; combo.ForeColor = foreMain; combo.BorderColor = backMain; - combo.ButtonColor = buttonMain; + combo.ButtonColor = backMain; + combo.ArrowColor = foreMain; } var gb = control as GroupBox; diff --git a/app/CustomControls.cs b/app/CustomControls.cs index 8d6fa718..71e6c023 100644 --- a/app/CustomControls.cs +++ b/app/CustomControls.cs @@ -71,8 +71,8 @@ namespace CustomControls } - private Color buttonColor = Color.FromArgb(255,230, 230, 230); - [DefaultValue(typeof(Color), "230, 230, 230")] + private Color buttonColor = Color.FromArgb(255, 255, 255, 255); + [DefaultValue(typeof(Color), "255, 255, 255")] public Color ButtonColor { get { return buttonColor; } diff --git a/app/HardwareMonitor.cs b/app/HardwareMonitor.cs index 1efb9066..52ef7695 100644 --- a/app/HardwareMonitor.cs +++ b/app/HardwareMonitor.cs @@ -19,7 +19,6 @@ public static class HardwareMonitor int max = 58; if (Program.config.ContainsModel("401")) max = 72; else if (Program.config.ContainsModel("503")) max = 68; - return Math.Max(max, Program.config.getConfig("fan_max")); } diff --git a/app/Program.cs b/app/Program.cs index 9faece96..4007dd98 100644 --- a/app/Program.cs +++ b/app/Program.cs @@ -154,7 +154,7 @@ namespace GHelper } catch { - Logger.WriteLine("Failed to run " + fileName); + Logger.WriteLine("Failed to run " + fileName); } diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index adca3b67..8cf979ba 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -163,7 +163,6 @@ namespace GHelper // comboMatrix // comboMatrix.BorderColor = Color.White; - comboMatrix.ButtonColor = SystemColors.ControlLight; comboMatrix.Dock = DockStyle.Top; comboMatrix.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboMatrix.FormattingEnabled = true; @@ -179,7 +178,6 @@ namespace GHelper // comboMatrixRunning // comboMatrixRunning.BorderColor = Color.White; - comboMatrixRunning.ButtonColor = SystemColors.ControlLight; comboMatrixRunning.Dock = DockStyle.Top; comboMatrixRunning.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); comboMatrixRunning.FormattingEnabled = true; @@ -890,7 +888,6 @@ namespace GHelper // comboKeyboard // comboKeyboard.BorderColor = Color.White; - comboKeyboard.ButtonColor = SystemColors.ControlLight; comboKeyboard.Dock = DockStyle.Top; comboKeyboard.FlatStyle = FlatStyle.Flat; comboKeyboard.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); diff --git a/app/Settings.cs b/app/Settings.cs index 6a3aec5b..de8904c3 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -855,13 +855,13 @@ namespace GHelper { Program.settingsForm.labelCPUFan.Text = "CPU" + cpuTemp + HardwareMonitor.cpuFan; Program.settingsForm.labelGPUFan.Text = "GPU" + gpuTemp + HardwareMonitor.gpuFan; - if (HardwareMonitor.midFan is not null) + if (HardwareMonitor.midFan is not null) Program.settingsForm.labelMidFan.Text = "Mid" + HardwareMonitor.midFan; - + Program.settingsForm.labelBattery.Text = battery; - Program.trayIcon.Text = "CPU" + cpuTemp + HardwareMonitor.cpuFan + "\n" - + "GPU" + gpuTemp + HardwareMonitor.gpuFan + + Program.trayIcon.Text = "CPU" + cpuTemp + HardwareMonitor.cpuFan + "\n" + + "GPU" + gpuTemp + HardwareMonitor.gpuFan + ((battery.Length > 0) ? ("\n" + battery) : ""); }); @@ -1026,10 +1026,10 @@ namespace GHelper if (SystemInformation.PowerStatus.PowerLineStatus == PowerLineStatus.Online) Aura.ApplyBrightness(3); - //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Up); + //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Up); else Aura.ApplyBrightness(0); - //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Down); + //Program.wmi.DeviceSet(ASUSWmi.UniversalControl, ASUSWmi.KB_Light_Down); }