Move LizardMouse/Buttons into DEBUG settings

This commit is contained in:
Kamil Trzciński 2022-12-10 10:29:37 +01:00
parent ef73516bfe
commit fdb94c42ed
6 changed files with 39 additions and 30 deletions

View file

@ -63,20 +63,6 @@ namespace SteamController
contextMenu.Items.Add(new ToolStripSeparator());
#if DEBUG
var lizardMouseItem = new ToolStripMenuItem("Use Lizard &Mouse");
lizardMouseItem.Click += delegate { DefaultGuideShortcutsProfile.SteamModeLizardMouse = !DefaultGuideShortcutsProfile.SteamModeLizardMouse; };
contextMenu.Opening += delegate { lizardMouseItem.Checked = DefaultGuideShortcutsProfile.SteamModeLizardMouse; };
contextMenu.Items.Add(lizardMouseItem);
var lizardButtonsItem = new ToolStripMenuItem("Use Lizard &Buttons");
lizardButtonsItem.Click += delegate { DefaultGuideShortcutsProfile.SteamModeLizardButtons = !DefaultGuideShortcutsProfile.SteamModeLizardButtons; };
contextMenu.Opening += delegate { lizardButtonsItem.Checked = DefaultGuideShortcutsProfile.SteamModeLizardButtons; };
contextMenu.Items.Add(lizardButtonsItem);
contextMenu.Items.Add(new ToolStripSeparator());
#endif
AddSteamOptions(contextMenu);
if (startupManager.IsAvailable)
@ -316,7 +302,8 @@ namespace SteamController
Desktop = ProfilesSettings.DesktopPanelSettings.Default,
X360 = ProfilesSettings.X360BackPanelSettings.Default,
X360Haptic = ProfilesSettings.X360HapticSettings.Default,
Application = Settings.Default
Application = Settings.Default,
DEBUG = SettingsDebug.Default
}
};

View file

@ -8,9 +8,6 @@ namespace SteamController.Profiles
{
public abstract class DefaultGuideShortcutsProfile : DefaultShortcutsProfile
{
public static bool SteamModeLizardButtons = false;
public static bool SteamModeLizardMouse = true;
public readonly TimeSpan HoldForKill = TimeSpan.FromSeconds(3);
public readonly TimeSpan HoldForClose = TimeSpan.FromSeconds(1);
@ -32,8 +29,8 @@ namespace SteamController.Profiles
private void SteamShortcuts(Context c)
{
c.Steam.LizardButtons = SteamModeLizardButtons;
c.Steam.LizardMouse = SteamModeLizardMouse;
c.Steam.LizardButtons = SettingsDebug.Default.LizardButtons;
c.Steam.LizardMouse = SettingsDebug.Default.LizardMouse;
EmulateScrollOnLPad(c);
EmulateMouseOnRPad(c);

View file

@ -37,8 +37,8 @@ namespace SteamController.Profiles
}
else
{
c.Steam.LizardButtons = SteamModeLizardButtons;
c.Steam.LizardMouse = SteamModeLizardMouse;
c.Steam.LizardButtons = SettingsDebug.Default.LizardButtons;
c.Steam.LizardMouse = SettingsDebug.Default.LizardMouse;
}
EmulateScrollOnLPad(c);

View file

@ -17,7 +17,7 @@ namespace SteamController.Profiles
public override Status Run(Context context)
{
context.Steam.LizardButtons = false;
context.Steam.LizardMouse = SteamModeLizardMouse;
context.Steam.LizardMouse = SettingsDebug.Default.LizardMouse;
context.X360.Connected = true;
// Controls

View file

@ -13,7 +13,7 @@ namespace SteamController
{
}
[BrowsableAttribute(false)]
[Browsable(false)]
public bool EnableSteamDetection
{
get { return Get<bool>("EnableSteamDetection", false); }
@ -21,7 +21,7 @@ namespace SteamController
}
[Description("Default profile used when going back to Desktop mode")]
[BrowsableAttribute(true)]
[Browsable(true)]
[TypeConverter(typeof(ProfilesSettings.Helpers.ProfileStringConverter))]
public string DefaultProfile
{
@ -36,7 +36,7 @@ namespace SteamController
}
[Description("Scroll direction for right pad and joystick.")]
[BrowsableAttribute(true)]
[Browsable(true)]
public ScrollMode ScrollDirection
{
get { return Get<ScrollMode>("ScrollDirection", ScrollMode.DownScrollDown); }
@ -49,7 +49,7 @@ namespace SteamController
Overwrite
}
[BrowsableAttribute(true)]
[Browsable(true)]
[Description("This does replace Steam configuration for controllers to prevent double inputs. " +
"Might require going to Steam > Settings > Controller > Desktop to apply " +
"'SteamController provided empty configuration'.")]
@ -59,9 +59,7 @@ namespace SteamController
set { Set("SteamControllerConfigs", value); }
}
[UserScopedSetting]
[BrowsableAttribute(true)]
[DefaultSettingValue("True")]
[Browsable(true)]
[Description("Show Touch Keyboard or CTRL+WIN+O")]
public bool ShowTouchKeyboard
{

View file

@ -0,0 +1,27 @@
using System.ComponentModel;
using System.Configuration;
namespace SteamController
{
[Category("Settings")]
[TypeConverter(typeof(ExpandableObjectConverter))]
internal sealed partial class SettingsDebug : CommonHelpers.BaseSettings
{
public static readonly SettingsDebug Default = new SettingsDebug();
public SettingsDebug() : base("SettingsDebug")
{
}
[Description("Use Lizard Buttons instead of emulated. This option is only for testing purposes.")]
public bool LizardButtons { get; set; } = false;
[Description("Use Lizard Mouse instead of emulated. This option is only for testing purposes.")]
public bool LizardMouse { get; set; } = true;
public override string ToString()
{
return "";
}
}
}