From 880bc37d751d1ec96620396d4db44178f558df77 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Wed, 30 Aug 2017 06:39:51 -0400 Subject: DId the maximize things --- Histacom2.Engine/Template/WinClassic.cs | 12 +++++++++--- Histacom2.sln | 5 ++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs index 23ea562..5b72775 100644 --- a/Histacom2.Engine/Template/WinClassic.cs +++ b/Histacom2.Engine/Template/WinClassic.cs @@ -206,9 +206,11 @@ namespace Histacom2.Engine.Template } public bool max = false; - + public Size prevSize; + public Point prevPoint; private void maximizebutton_Click(object sender, EventArgs e) { + if (max == false) { this.right.Hide(); @@ -220,7 +222,10 @@ namespace Histacom2.Engine.Template this.topleftcorner.Hide(); this.toprightcorner.Hide(); this.Dock = DockStyle.Fill; - this.WindowState = FormWindowState.Maximized; + prevSize = this.Size; + prevPoint = this.Location; + this.Size = new Size(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height - 28); + this.Location = new Point(0, 0); max = true; maximizebutton.Image = Engine.Properties.Resources.WinClassicRestore; } @@ -235,7 +240,8 @@ namespace Histacom2.Engine.Template this.topleftcorner.Show(); this.toprightcorner.Show(); this.Dock = DockStyle.None; - this.WindowState = FormWindowState.Normal; + this.Size = prevSize; + this.Location = prevPoint; max = false; maximizebutton.Image = Engine.Properties.Resources.WinClassicMax; } diff --git a/Histacom2.sln b/Histacom2.sln index 4e0ee6a..25f48ed 100644 --- a/Histacom2.sln +++ b/Histacom2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.15 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Histacom2.Engine", "Histacom2.Engine\Histacom2.Engine.csproj", "{9477B70F-2D32-4E1D-857B-4624A1DEEB1B}" EndProject @@ -16,7 +16,6 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|Any CPU.Build.0 = Debug|Any CPU {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|x86.ActiveCfg = Debug|Any CPU {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|x86.Build.0 = Debug|Any CPU {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Release|Any CPU.ActiveCfg = Release|Any CPU -- cgit v1.2.3 From 4bc215e200214834e844443f81114280e9156f09 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Wed, 30 Aug 2017 06:47:04 -0400 Subject: Revert "DId the maximize things" This reverts commit 880bc37d751d1ec96620396d4db44178f558df77. --- Histacom2.Engine/Template/WinClassic.cs | 12 +++--------- Histacom2.sln | 5 +++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs index 5b72775..23ea562 100644 --- a/Histacom2.Engine/Template/WinClassic.cs +++ b/Histacom2.Engine/Template/WinClassic.cs @@ -206,11 +206,9 @@ namespace Histacom2.Engine.Template } public bool max = false; - public Size prevSize; - public Point prevPoint; + private void maximizebutton_Click(object sender, EventArgs e) { - if (max == false) { this.right.Hide(); @@ -222,10 +220,7 @@ namespace Histacom2.Engine.Template this.topleftcorner.Hide(); this.toprightcorner.Hide(); this.Dock = DockStyle.Fill; - prevSize = this.Size; - prevPoint = this.Location; - this.Size = new Size(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height - 28); - this.Location = new Point(0, 0); + this.WindowState = FormWindowState.Maximized; max = true; maximizebutton.Image = Engine.Properties.Resources.WinClassicRestore; } @@ -240,8 +235,7 @@ namespace Histacom2.Engine.Template this.topleftcorner.Show(); this.toprightcorner.Show(); this.Dock = DockStyle.None; - this.Size = prevSize; - this.Location = prevPoint; + this.WindowState = FormWindowState.Normal; max = false; maximizebutton.Image = Engine.Properties.Resources.WinClassicMax; } diff --git a/Histacom2.sln b/Histacom2.sln index 25f48ed..4e0ee6a 100644 --- a/Histacom2.sln +++ b/Histacom2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Histacom2.Engine", "Histacom2.Engine\Histacom2.Engine.csproj", "{9477B70F-2D32-4E1D-857B-4624A1DEEB1B}" EndProject @@ -16,6 +16,7 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|Any CPU.Build.0 = Debug|Any CPU {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|x86.ActiveCfg = Debug|Any CPU {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Debug|x86.Build.0 = Debug|Any CPU {9477B70F-2D32-4E1D-857B-4624A1DEEB1B}.Release|Any CPU.ActiveCfg = Release|Any CPU -- cgit v1.2.3 From 237ca231a4cf35da78c1e474f3d6bc8dc657d13f Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Wed, 30 Aug 2017 06:52:49 -0400 Subject: Made the maximize not cover the taskbar --- Histacom2.Engine/Template/WinClassic.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs index 23ea562..20e66f0 100644 --- a/Histacom2.Engine/Template/WinClassic.cs +++ b/Histacom2.Engine/Template/WinClassic.cs @@ -205,10 +205,13 @@ namespace Histacom2.Engine.Template WinClassic_Activated(null, null); } - public bool max = false; + public bool max = false; + public Size prevSize; + public Point prevPoint; private void maximizebutton_Click(object sender, EventArgs e) { + if (max == false) { this.right.Hide(); @@ -220,7 +223,10 @@ namespace Histacom2.Engine.Template this.topleftcorner.Hide(); this.toprightcorner.Hide(); this.Dock = DockStyle.Fill; - this.WindowState = FormWindowState.Maximized; + prevSize = this.Size; + prevPoint = this.Location; + this.Size = new Size(Screen.PrimaryScreen.Bounds.Width, Screen.PrimaryScreen.Bounds.Height - 28); + this.Location = new Point(0, 0); max = true; maximizebutton.Image = Engine.Properties.Resources.WinClassicRestore; } @@ -235,11 +241,12 @@ namespace Histacom2.Engine.Template this.topleftcorner.Show(); this.toprightcorner.Show(); this.Dock = DockStyle.None; - this.WindowState = FormWindowState.Normal; + this.Size = prevSize; + this.Location = prevPoint; max = false; maximizebutton.Image = Engine.Properties.Resources.WinClassicMax; } - + } // The rest of this code will automatically style the buttons on the form! -- cgit v1.2.3