jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #941 from IceStormNG/asus-mouse-support

Browse Source 
Mouse support fixes
This commit is contained in:
Serge
2023-07-30 17:58:53 +02:00
committed by GitHub
parent 1038d4479c 769c490d21
commit 50ae8ae843
3 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/AsusMouseSettings.Designer.cs generated
View File

@@ -60,7 +60,7 @@
labelPerformance = new Label(); labelPerformance = new Label();
panelLighting = new Panel(); panelLighting = new Panel();
panelLightingContent = new Panel(); panelLightingContent = new Panel();
tableLayoutPanel3 = new TableLayoutPanel(); tableLayoutLightingZones = new TableLayoutPanel();
buttonLightingZoneScroll = new UI.RButton(); buttonLightingZoneScroll = new UI.RButton();
buttonLightingZoneLogo = new UI.RButton(); buttonLightingZoneLogo = new UI.RButton();
buttonLightingZoneAll = new UI.RButton(); buttonLightingZoneAll = new UI.RButton();
@@ -111,7 +111,7 @@
((System.ComponentModel.ISupportInitialize)pictureKeyboard).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureKeyboard).BeginInit();
panelLighting.SuspendLayout(); panelLighting.SuspendLayout();
panelLightingContent.SuspendLayout(); panelLightingContent.SuspendLayout();
tableLayoutPanel3.SuspendLayout(); tableLayoutLightingZones.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxLightingColor).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBoxLightingColor).BeginInit();
panelLightingHeader.SuspendLayout(); panelLightingHeader.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxLighting).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBoxLighting).BeginInit();
@@ -570,7 +570,7 @@
// panelLightingContent // panelLightingContent
// //
panelLightingContent.AutoSize = true; panelLightingContent.AutoSize = true;
panelLightingContent.Controls.Add(tableLayoutPanel3); panelLightingContent.Controls.Add(tableLayoutLightingZones);
panelLightingContent.Controls.Add(comboBoxAnimationDirection); panelLightingContent.Controls.Add(comboBoxAnimationDirection);
panelLightingContent.Controls.Add(labelAnimationDirection); panelLightingContent.Controls.Add(labelAnimationDirection);
panelLightingContent.Controls.Add(checkBoxRandomColor); panelLightingContent.Controls.Add(checkBoxRandomColor);
@@ -587,29 +587,29 @@
panelLightingContent.Size = new Size(654, 274); panelLightingContent.Size = new Size(654, 274);
panelLightingContent.TabIndex = 42; panelLightingContent.TabIndex = 42;
// //
// tableLayoutPanel3 // tableLayoutLightingZones
// //
tableLayoutPanel3.AutoSize = true; tableLayoutLightingZones.AutoSize = true;
tableLayoutPanel3.AutoSizeMode = AutoSizeMode.GrowAndShrink; tableLayoutLightingZones.AutoSizeMode = AutoSizeMode.GrowAndShrink;
tableLayoutPanel3.ColumnCount = 5; tableLayoutLightingZones.ColumnCount = 5;
tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); tableLayoutLightingZones.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F));
tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); tableLayoutLightingZones.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F));
tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); tableLayoutLightingZones.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F));
tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); tableLayoutLightingZones.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F));
tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); tableLayoutLightingZones.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F));
tableLayoutPanel3.Controls.Add(buttonLightingZoneScroll, 0, 0); tableLayoutLightingZones.Controls.Add(buttonLightingZoneScroll, 0, 0);
tableLayoutPanel3.Controls.Add(buttonLightingZoneLogo, 0, 0); tableLayoutLightingZones.Controls.Add(buttonLightingZoneLogo, 0, 0);
tableLayoutPanel3.Controls.Add(buttonLightingZoneAll, 0, 0); tableLayoutLightingZones.Controls.Add(buttonLightingZoneAll, 0, 0);
tableLayoutPanel3.Controls.Add(buttonLightingZoneUnderglow, 1, 0); tableLayoutLightingZones.Controls.Add(buttonLightingZoneUnderglow, 1, 0);
tableLayoutPanel3.Controls.Add(buttonLightingZoneDock, 2, 0); tableLayoutLightingZones.Controls.Add(buttonLightingZoneDock, 2, 0);
tableLayoutPanel3.Dock = DockStyle.Top; tableLayoutLightingZones.Dock = DockStyle.Top;
tableLayoutPanel3.Location = new Point(0, 0); tableLayoutLightingZones.Location = new Point(0, 0);
tableLayoutPanel3.Margin = new Padding(6, 3, 6, 3); tableLayoutLightingZones.Margin = new Padding(6, 3, 6, 3);
tableLayoutPanel3.Name = "tableLayoutPanel3"; tableLayoutLightingZones.Name = "tableLayoutLightingZones";
tableLayoutPanel3.RowCount = 1; tableLayoutLightingZones.RowCount = 1;
tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 60F)); tableLayoutLightingZones.RowStyles.Add(new RowStyle(SizeType.Absolute, 60F));
tableLayoutPanel3.Size = new Size(654, 60); tableLayoutLightingZones.Size = new Size(654, 60);
tableLayoutPanel3.TabIndex = 56; tableLayoutLightingZones.TabIndex = 56;
// //
// buttonLightingZoneScroll // buttonLightingZoneScroll
// //
@@ -1179,8 +1179,8 @@
panelLighting.PerformLayout(); panelLighting.PerformLayout();
panelLightingContent.ResumeLayout(false); panelLightingContent.ResumeLayout(false);
panelLightingContent.PerformLayout(); panelLightingContent.PerformLayout();
tableLayoutPanel3.ResumeLayout(false); tableLayoutLightingZones.ResumeLayout(false);
tableLayoutPanel3.PerformLayout(); tableLayoutLightingZones.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxLightingColor).EndInit(); ((System.ComponentModel.ISupportInitialize)pictureBoxLightingColor).EndInit();
panelLightingHeader.ResumeLayout(false); panelLightingHeader.ResumeLayout(false);
panelLightingHeader.PerformLayout(); panelLightingHeader.PerformLayout();
@@ -1263,7 +1263,7 @@
private UI.RButton buttonSync; private UI.RButton buttonSync;
private Panel panelBottomButtons; private Panel panelBottomButtons;
private NumericUpDown numericUpDownCurrentDPI; private NumericUpDown numericUpDownCurrentDPI;
private TableLayoutPanel tableLayoutPanel3; private TableLayoutPanel tableLayoutLightingZones;
private UI.RButton buttonLightingZoneScroll; private UI.RButton buttonLightingZoneScroll;
private UI.RButton buttonLightingZoneLogo; private UI.RButton buttonLightingZoneLogo;
private UI.RButton buttonLightingZoneAll; private UI.RButton buttonLightingZoneAll;

23
app/AsusMouseSettings.cs
View File

@@ -173,6 +173,11 @@ namespace GHelper
private void ComboProfile_DropDownClosed(object? sender, EventArgs e) private void ComboProfile_DropDownClosed(object? sender, EventArgs e)
{ {
if (mouse.Profile == comboProfile.SelectedIndex)
{
return;
}
mouse.SetProfile(comboProfile.SelectedIndex); mouse.SetProfile(comboProfile.SelectedIndex);
Task task = Task.Run((Action)RefreshMouseData); Task task = Task.Run((Action)RefreshMouseData);
} }
@@ -532,10 +537,20 @@ namespace GHelper
if (mouse.HasRGB()) if (mouse.HasRGB())
{ {
buttonLightingZoneLogo.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Logo); if (mouse.SupportedLightingZones().Length > 1)
buttonLightingZoneScroll.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Scrollwheel); {
buttonLightingZoneUnderglow.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Underglow); buttonLightingZoneLogo.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Logo);
buttonLightingZoneDock.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Dock); buttonLightingZoneScroll.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Scrollwheel);
buttonLightingZoneUnderglow.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Underglow);
buttonLightingZoneDock.Visible = mouse.SupportedLightingZones().Contains(LightingZone.Dock);
}
else
{
buttonLightingZoneLogo.Visible = false;
buttonLightingZoneScroll.Visible = false;
buttonLightingZoneUnderglow.Visible = false;
buttonLightingZoneDock.Visible = false;
}
sliderBrightness.Max = mouse.MaxBrightness(); sliderBrightness.Max = mouse.MaxBrightness();

17
app/Peripherals/Mouse/AsusMouse.cs
View File

@@ -174,7 +174,15 @@ namespace GHelper.Peripherals.Mouse
this.path = path; this.path = path;
this.Wireless = wireless; this.Wireless = wireless;
DpiSettings = new AsusMouseDPI[1]; DpiSettings = new AsusMouseDPI[1];
LightingSetting = new LightingSetting[SupportedLightingZones().Length]; if (SupportedLightingZones().Length == 0)
{
LightingSetting = new LightingSetting[1];
}
else
{
LightingSetting = new LightingSetting[SupportedLightingZones().Length];
}
} }
public override bool Equals(object? obj) public override bool Equals(object? obj)
@@ -1068,7 +1076,7 @@ namespace GHelper.Peripherals.Mouse
public virtual LightingZone[] SupportedLightingZones() public virtual LightingZone[] SupportedLightingZones()
{ {
return new LightingZone[] { }; return new LightingZone[] { LightingZone.Logo };
} }
public virtual int IndexForZone(LightingZone zone) public virtual int IndexForZone(LightingZone zone)
@@ -1086,6 +1094,11 @@ namespace GHelper.Peripherals.Mouse
public virtual bool IsLightingZoned() public virtual bool IsLightingZoned()
{ {
if (LightingSetting.Length < 2)
{
return false;
}
//Check whether all zones are the same or not //Check whether all zones are the same or not
for (int i = 1; i < LightingSetting.Length; ++i) for (int i = 1; i < LightingSetting.Length; ++i)
{ {