Skip to content

Commit 3acd913

Browse files
committed
Added some cs2 theming and colours, cs2 bg, fixed up some of the ui
removed animation on radio button
1 parent b26a832 commit 3acd913

File tree

8 files changed

+332
-49
lines changed

8 files changed

+332
-49
lines changed

CS2 Server Picker/CS2 Server Picker.csproj

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
</PropertyGroup>
1313

1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15-
<DebugType>none</DebugType>
15+
<DebugType>embedded</DebugType>
1616
</PropertyGroup>
1717

1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
19-
<DebugType>none</DebugType>
19+
<DebugType>embedded</DebugType>
2020
</PropertyGroup>
2121

2222
<ItemGroup>
@@ -36,6 +36,11 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39+
<Compile Update="Properties\Resources.Designer.cs">
40+
<DesignTime>True</DesignTime>
41+
<AutoGen>True</AutoGen>
42+
<DependentUpon>Resources.resx</DependentUpon>
43+
</Compile>
3944
<Compile Update="Properties\Settings.Designer.cs">
4045
<DesignTimeSharedInput>True</DesignTimeSharedInput>
4146
<AutoGen>True</AutoGen>
@@ -50,4 +55,15 @@
5055
</None>
5156
</ItemGroup>
5257

58+
<ItemGroup>
59+
<Folder Include="Resources\" />
60+
</ItemGroup>
61+
62+
<ItemGroup>
63+
<EmbeddedResource Update="Properties\Resources.resx">
64+
<Generator>ResXFileCodeGenerator</Generator>
65+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
66+
</EmbeddedResource>
67+
</ItemGroup>
68+
5369
</Project>

CS2 Server Picker/Properties/Resources.Designer.cs

Lines changed: 73 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="cs2bg_resized" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\cs2bg_resized.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
124+
</root>
48.2 KB
Loading

CS2 Server Picker/UI/Custom/CardPanel.cs

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Drawing;
34
using System.Drawing.Drawing2D;
45
using System.Linq;
56
using System.Text;
@@ -9,31 +10,31 @@
910
namespace CS2_Server_Picker.UI.Custom
1011
{
1112
/// <summary>
12-
/// A custom panel with rounded corners, soft shadow, and configurable styling.
13+
/// A custom CS2-themed panel with rounded corners, tactical colors, and subtle shadow.
1314
/// </summary>
1415
public class CardPanel : Panel
1516
{
16-
// Designer-hidden properties for visual customization
17+
// Default CS2-style properties
1718
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
18-
public int CornerRadius { get; set; } = 12;
19+
public int CornerRadius { get; set; } = 10;
1920

2021
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
21-
public Color BorderColor { get; set; } = Color.LightGray;
22+
public Color BorderColor { get; set; } = Color.FromArgb(255, 255, 128, 0); // CS2 orange accent
2223

2324
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
24-
public int BorderThickness { get; set; } = 1;
25+
public int BorderThickness { get; set; } = 2;
2526

2627
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
27-
public Color FillColor { get; set; } = Color.White;
28+
public Color FillColor { get; set; } = Color.FromArgb(30, 30, 30); // dark steel background
2829

2930
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
30-
public int ShadowSize { get; set; } = 8;
31+
public int ShadowSize { get; set; } = 6;
3132

3233
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
33-
public Color ShadowColor { get; set; } = Color.FromArgb(60, 0, 0, 0); // semi-transparent black
34+
public Color ShadowColor { get; set; } = Color.FromArgb(100, 0, 0, 0); // subtle dark shadow
3435

3536
/// <summary>
36-
/// Custom paint logic for rounded card with shadow and border.
37+
/// Custom paint logic for CS2-themed rounded card.
3738
/// </summary>
3839
protected override void OnPaint(PaintEventArgs e)
3940
{
@@ -50,19 +51,27 @@ protected override void OnPaint(PaintEventArgs e)
5051

5152
using var path = RoundedRect(rect, CornerRadius);
5253

53-
// Draw soft shadow using gradient brush
54-
using var shadowBrush = new PathGradientBrush(path)
54+
// Draw soft shadow behind the panel
55+
using (var shadowBrush = new PathGradientBrush(path)
5556
{
5657
CenterColor = ShadowColor,
5758
SurroundColors = new[] { Color.Transparent }
58-
};
59-
g.FillPath(shadowBrush, path);
59+
})
60+
{
61+
g.FillPath(shadowBrush, path);
62+
}
63+
64+
// Fill background
65+
using (var brush = new SolidBrush(FillColor))
66+
{
67+
g.FillPath(brush, path);
68+
}
6069

61-
// Draw card fill and border
62-
using var brush = new SolidBrush(FillColor);
63-
using var pen = new Pen(BorderColor, BorderThickness);
64-
g.FillPath(brush, path);
65-
g.DrawPath(pen, path);
70+
// Draw CS2 orange border
71+
using (var pen = new Pen(BorderColor, BorderThickness))
72+
{
73+
g.DrawPath(pen, path);
74+
}
6675
}
6776

6877
/// <summary>

0 commit comments

Comments
 (0)