Merge branch 'master' of https://github.com/TimeHACKDevs/TimeHACK.git

3 files changed, 17 insertions, 16 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs
index f7a9e99..2029995 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/Square.cs
@@ -37,6 +37,9 @@ namespace TimeHACK.OS.Win95.Win95Apps.MineSweeper
             _button.Click += new EventHandler(Click);
             _button.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender,args,2);
             _button.MouseDown += new MouseEventHandler(DismantleClick);
+            _button.FlatStyle = FlatStyle.Flat;
+            _button.FlatAppearance.BorderSize = 1;
+            _button.BackgroundImageLayout = ImageLayout.Stretch;
 
             _game.Panel.Controls.Add(Button);
         }
@@ -69,13 +72,13 @@ namespace TimeHACK.OS.Win95.Win95Apps.MineSweeper
                 if (Dismantled)
                 {
                     _dismantled = false;
-                    Button.BackColor = SystemColors.Control;
+                    Button.BackgroundImage = null;
                     Button.Text = "?";
                 }
                 else
                 {
                     _dismantled = true;
-                    Button.BackgroundImage = Properties.Resources.minsweeper_flag;
+                    Button.BackgroundImage = Properties.Resources.WinClassicMinesweeperFlag;
                 }
                 OnDismantle();
             }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
index bca6b99..e1e0d32 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.Designer.cs
@@ -256,7 +256,7 @@
             // 
             // button1
             // 
-            this.button1.BackgroundImage = global::TimeHACK.Properties.Resources.minsweeper_smile;
+            this.button1.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicMinesweeperSmile;
             this.button1.Location = new System.Drawing.Point(108, 32);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(25, 25);
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
index 6b6e297..657659b 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/MineSweeper/WinClassicMinesweeper.cs
@@ -29,32 +29,30 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             labelBombs.Text = (_game.Mines - _game.DismantledMines).ToString();
         }
+        public void calculateFormSize(int x, int y)
+        {
+            panel1.Size = new Size(x * 25, y * 25);
+            this.ParentForm.Size = new Size(x * 25 + 45, y * 25 + 100);
+            labelTime.Location = new Point(x * 25 - 38, button1.Location.Y);
+            button1.PerformClick();
+        }
         private void begginnerToolStripMenuItem_Click(object sender, EventArgs e)
         {
             level = "easy";
-            panel1.Size = new Size(200, 200);
-            this.ParentForm.Size = new Size(240, 275);
             button1.Location = new Point(108, 32);
-            labelTime.Location = new Point(162, 34);
-            button1.PerformClick();
+            calculateFormSize(8, 8);
         }
         private void intermediateToolStripMenuItem_Click(object sender, EventArgs e)
         {
             level = "medium";
-            panel1.Size = new Size(400,400);
-            this.ParentForm.Size = new Size(440, 480);
             button1.Location = new Point(208, 32);
-            labelTime.Location = new Point(362, 34);
-            button1.PerformClick();
+            calculateFormSize(16, 16);
         }
         private void expertToolStripMenuItem_Click(object sender, EventArgs e)
         {
             level = "hard";
-            panel1.Size = new Size(740, 400);
-            this.ParentForm.Size = new Size(776, 480);
             button1.Location = new Point(381, 32);
-            labelTime.Location = new Point(702, 34);
-            button1.PerformClick();
+            calculateFormSize(30, 16);
         }
         private void button1_Click(object sender, EventArgs e)
         {
@@ -87,7 +85,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
         private void WinClassicMinesweeper_Load(object sender, EventArgs e)
         {
-            button1.PerformClick();
+            begginnerToolStripMenuItem.PerformClick();
         }
     }
 }