Skip to content

Commit

Permalink
Merge pull request #11 from PierroD/10-feat-add-safeArea
Browse files Browse the repository at this point in the history
Feat add safeArea to the FpsUnlocker
  • Loading branch information
PierroD authored Dec 3, 2023
2 parents ec734f6 + ede5378 commit 77af7ca
Show file tree
Hide file tree
Showing 29 changed files with 534 additions and 132 deletions.
11 changes: 11 additions & 0 deletions LINDRA - Market/LINDRA - Market/LINDRA - Market.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@
<Compile Include="form\FpsUnlocker\fps_unlocker.Designer.cs">
<DependentUpon>fps_unlocker.cs</DependentUpon>
</Compile>
<Compile Include="form\FpsUnlocker\Views\UC_Area.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="form\FpsUnlocker\Views\UC_Area.Designer.cs">
<DependentUpon>UC_Area.cs</DependentUpon>
</Compile>
<Compile Include="form\FpsUnlocker\Views\UC_Disable.cs">
<SubType>UserControl</SubType>
</Compile>
Expand Down Expand Up @@ -200,6 +206,9 @@
<EmbeddedResource Include="form\FpsUnlocker\fps_unlocker.resx">
<DependentUpon>fps_unlocker.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="form\FpsUnlocker\Views\UC_Area.resx">
<DependentUpon>UC_Area.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="form\FpsUnlocker\Views\UC_Disable.resx">
<DependentUpon>UC_Disable.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -367,6 +376,8 @@
<None Include="Resources\InfoLight.png" />
<None Include="Resources\SearchDark.png" />
<None Include="Resources\SearchLight.png" />
<None Include="Resources\FullScreenDark.png" />
<None Include="Resources\FullScreenLight.png" />
<Content Include="Resources\sliders_on_bo1.png" />
<None Include="Resources\UpdatesOn.png" />
<None Include="Resources\UpdatesDark.png" />
Expand Down
4 changes: 2 additions & 2 deletions LINDRA - Market/LINDRA - Market/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
// en utilisant '*', comme indiqué ci-dessous :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.7.0")]
[assembly: AssemblyFileVersion("2.3..0")]
[assembly: AssemblyVersion("2.4.7.0")]
[assembly: AssemblyFileVersion("2.4.7.0")]
20 changes: 20 additions & 0 deletions LINDRA - Market/LINDRA - Market/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 22 additions & 16 deletions LINDRA - Market/LINDRA - Market/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,23 @@
<data name="EyeDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\EyeDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ConsoleDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ConsoleDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HomeDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\HomeDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UpdatesLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\UpdatesLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="InfoLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\InfoLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PaletteLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\PaletteLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ConsoleLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ConsoleLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SettingsLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SettingsLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UpdatesDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\UpdatesDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HomeLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\HomeLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Expand All @@ -157,22 +163,22 @@
<data name="PaletteDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\PaletteDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SettingsLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SettingsLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UpdatesDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\UpdatesDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ConsoleDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ConsoleDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ConsoleLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ConsoleLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="UpdatesLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\UpdatesLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SearchDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SearchDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="PaletteLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\PaletteLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SearchLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SearchLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FullScreenDark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\FullScreenDark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FullScreenLight" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\FullScreenLight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions LINDRA - Market/LINDRA - Market/Utils/AppSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace LINDRA___Market.Utils
public static class AppSettings
{
public static bool isDarkMode { get; set; } = false;
public static string version { get; set; } = "2.3.7";
public static string latestVersion { get; set; } = "2.3.7";
public static string version { get; set; } = "2.4.7";
public static string latestVersion { get; set; } = "2.4.7";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Drawing;
using System.ComponentModel;

namespace LINDRA___Market.form
{
Expand All @@ -21,6 +22,9 @@ public class FpsSettings
public static bool sw_camos { get; set; } = false;
public static bool sw_bullet { get; set; } = false;

public static int bar_horizontal { get; set; } = 100;
public static int bar_vertical { get; set; } = 100;

public static Color allies_feed { get; set; } = Color.FromArgb(153, 163, 176);
public static Color axis_feed { get; set; } = Color.FromArgb(166, 145, 105); //"0.64999998 0.56999999 0.41";
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions LINDRA - Market/LINDRA - Market/form/FpsUnlocker/Views/UC_Area.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
using LINDRA___Market.Utils;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace LINDRA___Market.form.FpsUnlocker.Views
{
public partial class UC_Area : UserControl
{
public UC_Area()
{
InitializeComponent();
}

private void UC_Area_Load(object sender, EventArgs e)
{
this.BackColor = AppColors.backgroundColor;
labelSafeArea.ForeColor = AppColors.textColor;
labelSafeAreaXValue.ForeColor = AppColors.textColor;
labelSafeAreaYValue.ForeColor = AppColors.textColor;
trackbarSafeAreaX.ThumbColor = AppColors.primaryColor;
trackbarSafeAreaY.ThumbColor = AppColors.primaryColor;
}

private void update_timer_Tick(object sender, EventArgs e)
{
if (trackbarSafeAreaX.Value != FpsSettings.bar_horizontal) trackbarSafeAreaX.Value = FpsSettings.bar_horizontal;
if (trackbarSafeAreaY.Value != FpsSettings.bar_vertical) trackbarSafeAreaY.Value = FpsSettings.bar_vertical;
}

private void trackbarSafeAreaX_ValueChanged(object sender, EventArgs e)
{
labelSafeAreaXValue.Text = $"{(double)trackbarSafeAreaX.Value / 100}";
FpsSettings.bar_horizontal = trackbarSafeAreaX.Value;
}

private void trackbarSafeAreaY_ValueChanged(object sender, EventArgs e)
{
labelSafeAreaYValue.Text = $"{(double)trackbarSafeAreaY.Value / 100}";
FpsSettings.bar_vertical = trackbarSafeAreaY.Value;

}
}
}
Loading

0 comments on commit 77af7ca

Please sign in to comment.