Changed drivers

- removed HidGuardian, if you need it, read the README

.gitignore

@@ -263,3 +263,5 @@ __pycache__/
 /BetterJoyForCemu/FodyWeavers.xsd
 /title.png
 /title.pdn
+/Drivers
+/! Install the drivers in the Drivers folder

BetterJoy.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.28307.852
+VisualStudioVersion = 16.0.30002.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetterJoy", "BetterJoyForCemu\BetterJoy.csproj", "{1BF709E9-C133-41DF-933A-C9FF3F664C7B}"
 EndProject
@@ -21,8 +21,7 @@ Global
 		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Debug|x64.Build.0 = Debug|x64
 		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Debug|x86.ActiveCfg = Debug|x86
 		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Debug|x86.Build.0 = Debug|x86
-		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|Any CPU.ActiveCfg = Release|x86
-		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|x64.ActiveCfg = Release|x64
 		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|x64.Build.0 = Release|x64
 		{1BF709E9-C133-41DF-933A-C9FF3F664C7B}.Release|x86.ActiveCfg = Release|x86

BetterJoyForCemu/App.config

@@ -68,6 +68,6 @@
 	<!-- Changes drag behaviour. -->
 	<!-- Will only apply to mouse buttons being mapped -->
 	<!-- Default: false -->
-	<add key="DragToggle" value="true"/>
+	<add key="DragToggle" value="false"/>
   </appSettings>
 </configuration>

BetterJoyForCemu/BetterJoy.csproj

@@ -32,25 +32,6 @@
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
@@ -65,7 +46,7 @@
     <OutputPath>bin\x86\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -85,7 +66,7 @@
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -179,6 +160,9 @@
     <Compile Include="UpdServer.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="! Install the drivers in the Drivers folder">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
@@ -186,6 +170,12 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include=".nuget\mouse-keyboard-hook-logo.png" />
+    <Content Include="Drivers\README.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Drivers\ViGEmBus_Setup_1.16.116.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Icons\snes.png" />
     <None Include="Properties\app.manifest" />
     <Content Include="Icons\betterjoyforcemu_icon.ico" />

BetterJoyForCemu/Drivers/README.txt

@@ -0,0 +1,7 @@
+Driver installer provided for convenience.
+
+Latest ViGEmBus releases are here: https://github.com/ViGEm/ViGEmBus/releases
+
+If you're on Win7, please read the instructions on the page.
+
+HidGuardian is not provided by default anymore because it was buggy and caused a lot of users a lot of headaches because they didn't know what to do with it. If you require the drivers for it, look at older BetterJoy releases.

BetterJoyForCemu/Reassign.Designer.cs

@@ -93,8 +93,8 @@ namespace BetterJoyForCemu {
 			this.btn_sl_r = new BetterJoyForCemu.SplitButton();
 			this.lbl_sr_r = new System.Windows.Forms.Label();
 			this.btn_sr_r = new BetterJoyForCemu.SplitButton();
-			this.btn_close = new BetterJoyForCemu.SplitButton();
+			this.btn_close = new Button();
-			this.btn_apply = new BetterJoyForCemu.SplitButton();
+			this.btn_apply = new Button();
 			this.tip_reassign = new System.Windows.Forms.ToolTip(this.components);
 			this.lbl_reset_mouse = new System.Windows.Forms.Label();
 			this.btn_reset_mouse = new BetterJoyForCemu.SplitButton();
@@ -316,8 +316,8 @@ namespace BetterJoyForCemu {
 		private SplitButton btn_sl_r;
 		private System.Windows.Forms.Label lbl_sr_r;
 		private SplitButton btn_sr_r;
-		private SplitButton btn_close;
+		private Button btn_close;
-		private SplitButton btn_apply;
+		private Button btn_apply;
 		private System.Windows.Forms.ToolTip tip_reassign;
 		private System.Windows.Forms.Label lbl_reset_mouse;
 		private SplitButton btn_reset_mouse;