Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

# Conflicts:
#	TimeHACK.Main/bin/Release/TimeHACK.Engine.dll
#	TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb
#	TimeHACK.Main/bin/Release/TimeHACK.application
#	TimeHACK.Main/bin/Release/TimeHACK.exe
#	TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
#	TimeHACK.Main/bin/Release/TimeHACK.pdb
#	TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe

#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache

#	TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
#	TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources
#	TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources
#	TimeHACK.Main/obj/Release/TimeHACK.application
#	TimeHACK.Main/obj/Release/TimeHACK.exe
#	TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
#	TimeHACK.Main/obj/Release/TimeHACK.pdb

6 files changed, 21 insertions, 17 deletions

diff --git a/TimeHACK.Engine/Template/WinClassic.Designer.cs b/TimeHACK.Engine/Template/WinClassic.Designer.cs
index 0bd8a43..0d26710 100644
--- a/TimeHACK.Engine/Template/WinClassic.Designer.cs
+++ b/TimeHACK.Engine/Template/WinClassic.Designer.cs
@@ -32,6 +32,7 @@
             this.program = new System.Windows.Forms.Panel();
             this.programContent = new System.Windows.Forms.Panel();
             this.programtopbar = new System.Windows.Forms.Panel();
+            this.programIcon = new System.Windows.Forms.PictureBox();
             this.maximizebutton = new System.Windows.Forms.PictureBox();
             this.minimizebutton = new System.Windows.Forms.PictureBox();
             this.Title = new System.Windows.Forms.Label();
@@ -44,13 +45,12 @@
             this.bottom = new System.Windows.Forms.Panel();
             this.right = new System.Windows.Forms.Panel();
             this.top = new System.Windows.Forms.Panel();
-            this.programIcon = new System.Windows.Forms.PictureBox();
             this.program.SuspendLayout();
             this.programtopbar.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.closebutton)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit();
             this.SuspendLayout();
             // 
             // program
@@ -93,7 +93,18 @@
             this.programtopbar.Name = "programtopbar";
             this.programtopbar.Size = new System.Drawing.Size(292, 18);
             this.programtopbar.TabIndex = 0;
-            this.programtopbar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.programtopbar_drag);
+            this.programtopbar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag);
+            // 
+            // programIcon
+            // 
+            this.programIcon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.programIcon.ErrorImage = null;
+            this.programIcon.InitialImage = null;
+            this.programIcon.Location = new System.Drawing.Point(2, 1);
+            this.programIcon.Name = "programIcon";
+            this.programIcon.Size = new System.Drawing.Size(16, 16);
+            this.programIcon.TabIndex = 0;
+            this.programIcon.TabStop = false;
             // 
             // maximizebutton
             // 
@@ -126,6 +137,7 @@
             this.Title.Size = new System.Drawing.Size(99, 13);
             this.Title.TabIndex = 3;
             this.Title.Text = "Application Title";
+            this.Title.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag);
             // 
             // closebutton
             // 
@@ -214,17 +226,6 @@
             this.top.Size = new System.Drawing.Size(300, 4);
             this.top.TabIndex = 8;
             // 
-            // programIcon
-            // 
-            this.programIcon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.programIcon.ErrorImage = null;
-            this.programIcon.InitialImage = null;
-            this.programIcon.Location = new System.Drawing.Point(2, 1);
-            this.programIcon.Name = "programIcon";
-            this.programIcon.Size = new System.Drawing.Size(16, 16);
-            this.programIcon.TabIndex = 0;
-            this.programIcon.TabStop = false;
-            // 
             // WinClassic
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -237,10 +238,10 @@
             this.program.ResumeLayout(false);
             this.programtopbar.ResumeLayout(false);
             this.programtopbar.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.programIcon)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.closebutton)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.programIcon)).EndInit();
             this.ResumeLayout(false);
 
         }
diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs
index da8494d..8814e70 100644
--- a/TimeHACK.Engine/Template/WinClassic.cs
+++ b/TimeHACK.Engine/Template/WinClassic.cs
@@ -22,7 +22,7 @@ namespace TimeHACK.Engine.Template
         [DllImportAttribute("user32.dll")]
         public static extern bool ReleaseCapture();
 
-        private void programtopbar_drag(object sender, MouseEventArgs e)
+        private void Programtopbar_drag(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Left)
             {
@@ -51,6 +51,7 @@ namespace TimeHACK.Engine.Template
                 this.topleftcorner.Hide();
                 this.toprightcorner.Hide();
                 this.Dock = DockStyle.Fill;
+                this.WindowState = FormWindowState.Maximized;
                 max = true;
                 maximizebutton.Image = Properties.Resources.WinClassicRestore;
             }
@@ -65,6 +66,7 @@ namespace TimeHACK.Engine.Template
                 this.topleftcorner.Show();
                 this.toprightcorner.Show();
                 this.Dock = DockStyle.None;
+                this.WindowState = FormWindowState.Normal;
                 max = false;
                 maximizebutton.Image = Properties.Resources.WinClassicMax;
             }
diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs
index d471835..c59cd26 100644
--- a/TimeHACK.Engine/WindowManager.cs
+++ b/TimeHACK.Engine/WindowManager.cs
@@ -11,6 +11,7 @@ namespace TimeHACK.Engine
         {
             // Setup Window
             WinClassic app = new WinClassic();
+            app.Text = title;
             app.Title.Text = title;
             app.Width = content.Width + 8;
             app.Height = content.Height + 26;
@@ -29,7 +30,7 @@ namespace TimeHACK.Engine
             if (MaxButton == false)
             {
                 app.maximizebutton.Visible = false;
-                app.minimizebutton.Location = new Point(app.closebutton.Location.X - 16, app.minimizebutton.Location.Y);
+                app.minimizebutton.Location = new Point(app.closebutton.Location.X - 14, app.minimizebutton.Location.Y);
             }
 
             // Check if Min button is enabled
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
index 7901de8..934fb3e 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
index e569db6..4dce794 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
index 668c688..7d792d6 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb