From 5a3e6341b05ea22d1a25639519db7901eae05736 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Tue, 23 Feb 2016 07:16:09 +0100
Subject: [PATCH] Project updates, CS:GO fix for Corsair

---
 .../Modules/Games/CounterStrike/CounterStrikeModel.cs  | 10 +++++++++-
 Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml  |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs
index 2843fd51b..2c8ae0461 100644
--- a/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs
+++ b/Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs
@@ -16,6 +16,8 @@ namespace Artemis.Modules.Games.CounterStrike
 {
     public class CounterStrikeModel : GameModel
     {
+        private int _ammoWidth;
+
         public CounterStrikeModel(MainModel mainModel, CounterStrikeSettings settings) : base(mainModel)
         {
             Settings = settings;
@@ -47,9 +49,15 @@ namespace Artemis.Modules.Games.CounterStrike
             // Some keyboards have a different baseline, Corsair F-keys start at row 1
             int baseLine;
             if (MainModel.ActiveKeyboard is CorsairRGB)
+            {
                 baseLine = 1;
+                _ammoWidth = 19;
+            }
             else
+            {
                 baseLine = 0;
+                _ammoWidth = 16;
+            }
 
             AmmoRect = new KeyboardRectangle(MainModel.ActiveKeyboard, 0, baseLine, new List<Color>(),
                 LinearGradientMode.Horizontal) {Height = Scale, ContainedBrush = false};
@@ -154,7 +162,7 @@ namespace Artemis.Modules.Games.CounterStrike
                 return;
 
             var ammoPercentage = (int) Math.Ceiling(100.00/maxAmmo)*ammo;
-            AmmoRect.Width = (int) Math.Floor(16/100.00*ammoPercentage)*Scale;
+            AmmoRect.Width = (int) Math.Floor(_ammoWidth / 100.00*ammoPercentage)*Scale;
             AmmoRect.Colors = new List<Color>
             {
                 ColorHelpers.ToDrawingColor(Settings.AmmoMainColor),
diff --git a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
index f7a988923..b89bd924a 100644
--- a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
+++ b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
@@ -82,7 +82,7 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <TextBlock Grid.Row="0" Grid.Column="0" Text="Artemis pre-release" VerticalAlignment="Center"
+            <TextBlock Grid.Row="0" Grid.Column="0" Text="Artemis 1.0.0" VerticalAlignment="Center"
                        HorizontalAlignment="Left" />
             <Button Grid.Row="0" Grid.Column="1" Focusable="False" Style="{StaticResource AccentedSquareButtonStyle}"
                     cal:Message.Attach="[Action NavigateTo('https://github.com/SpoinkyNL/Artemis')]"