Auto Init Aura

This commit is contained in:
Serge
2023-07-18 22:26:15 +02:00
parent 840c07b366
commit 21048b6aa1
4 changed files with 31 additions and 25 deletions

View File

@@ -175,12 +175,14 @@ namespace GHelper
public static void SetColor(int colorCode)
{
Color1 = Color.FromArgb(colorCode);
if (colorCode == -1) Color1 = Color.Red;
else Color1 = Color.FromArgb(colorCode);
}
public static void SetColor2(int colorCode)
{
Color2 = Color.FromArgb(colorCode);
if (colorCode == -1) Color2 = Color.White;
else Color2 = Color.FromArgb(colorCode);
}
@@ -367,6 +369,11 @@ namespace GHelper
public static void ApplyAura()
{
Mode = AppConfig.Get("aura_mode");
Speed = AppConfig.Get("aura_speed");
SetColor(AppConfig.Get("aura_color"));
SetColor2(AppConfig.Get("aura_color2"));
int _speed;
switch (Speed)

View File

@@ -444,7 +444,7 @@ namespace GHelper
private void ComboKeyboardSpeed_SelectedValueChanged(object? sender, EventArgs e)
{
AppConfig.Set("aura_speed", (int)comboKeyboardSpeed.SelectedValue);
Program.settingsForm.SetAura();
AsusUSB.ApplyAura();
}

View File

@@ -132,6 +132,9 @@ namespace GHelper.Helpers
public void RunToast(string text, ToastIcon? icon = null)
{
if (AppConfig.Is("disable_osd")) return;
Program.settingsForm.Invoke(delegate
{
//Hide();

View File

@@ -489,7 +489,8 @@ namespace GHelper
if (colorDlg.ShowDialog() == DialogResult.OK)
{
AppConfig.Set("aura_color2", colorDlg.Color.ToArgb());
SetAura();
AsusUSB.ApplyAura();
VisualiseAura();
}
}
@@ -554,7 +555,8 @@ namespace GHelper
if (colorDlg.ShowDialog() == DialogResult.OK)
{
AppConfig.Set("aura_color", colorDlg.Color.ToArgb());
SetAura();
AsusUSB.ApplyAura();
VisualiseAura();
}
}
@@ -572,9 +574,6 @@ namespace GHelper
comboKeyboard.SelectedValue = AsusUSB.Mode;
comboKeyboard.SelectedValueChanged += ComboKeyboard_SelectedValueChanged;
pictureColor.BackColor = AsusUSB.Color1;
pictureColor2.BackColor = AsusUSB.Color2;
pictureColor2.Visible = AsusUSB.HasSecondColor();
if (AsusUSB.HasColor())
{
@@ -586,6 +585,15 @@ namespace GHelper
comboKeyboard.Visible = false;
}
VisualiseAura();
}
public void VisualiseAura()
{
pictureColor.BackColor = AsusUSB.Color1;
pictureColor2.BackColor = AsusUSB.Color2;
pictureColor2.Visible = AsusUSB.HasSecondColor();
}
public void InitMatrix()
@@ -606,21 +614,6 @@ namespace GHelper
}
public void SetAura()
{
AsusUSB.Mode = AppConfig.Get("aura_mode");
AsusUSB.Speed = AppConfig.Get("aura_speed");
AsusUSB.SetColor(AppConfig.Get("aura_color"));
AsusUSB.SetColor2(AppConfig.Get("aura_color2"));
pictureColor.BackColor = AsusUSB.Color1;
pictureColor2.BackColor = AsusUSB.Color2;
pictureColor2.Visible = AsusUSB.HasSecondColor();
AsusUSB.ApplyAura();
}
public void CycleAuraMode()
{
if (comboKeyboard.SelectedIndex < comboKeyboard.Items.Count - 1)
@@ -632,7 +625,8 @@ namespace GHelper
private void ComboKeyboard_SelectedValueChanged(object? sender, EventArgs e)
{
AppConfig.Set("aura_mode", (int)comboKeyboard.SelectedValue);
SetAura();
AsusUSB.ApplyAura();
VisualiseAura();
}
@@ -861,9 +855,11 @@ namespace GHelper
public void AutoKeyboard()
{
InputDispatcher.SetBacklightAuto(true);
AsusUSB.ApplyAuraPower();
AsusUSB.ApplyAura();
InputDispatcher.SetBacklightAuto(true);
if (Program.acpi.IsXGConnected())
AsusUSB.ApplyXGMLight(AppConfig.Is("xmg_light"));