diff --git a/FizzyLauncher.csproj b/FizzyLauncher.csproj index f84d7eb..f39eacc 100644 --- a/FizzyLauncher.csproj +++ b/FizzyLauncher.csproj @@ -260,6 +260,7 @@ + \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index d6aba6e..735590f 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.1.1.109")] +[assembly: AssemblyFileVersion("0.1.1.113")] diff --git a/Resource1.Designer.cs b/Resource1.Designer.cs index 3d76540..529722f 100644 --- a/Resource1.Designer.cs +++ b/Resource1.Designer.cs @@ -19,7 +19,7 @@ namespace AppLauncher { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resource1 { @@ -220,6 +220,16 @@ namespace AppLauncher { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap maximise3_20 { + get { + object obj = ResourceManager.GetObject("maximise3_20", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Resource1.resx b/Resource1.resx index a9aa549..236baac 100644 --- a/Resource1.resx +++ b/Resource1.resx @@ -163,6 +163,9 @@ RyzStudio\Windows\Forms\Resources\maximise2_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + RyzStudio\Windows\Forms\Resources\maximise3_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + RyzStudio\Windows\Forms\Resources\maximise_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/RyzStudio/Windows/Forms/Resources/maximise3_20.png b/RyzStudio/Windows/Forms/Resources/maximise3_20.png new file mode 100644 index 0000000..fa1dcec Binary files /dev/null and b/RyzStudio/Windows/Forms/Resources/maximise3_20.png differ diff --git a/Windows/Forms/AForm.cs b/Windows/Forms/AForm.cs index 29fb1e3..1d75d60 100644 --- a/Windows/Forms/AForm.cs +++ b/Windows/Forms/AForm.cs @@ -9,7 +9,11 @@ namespace AppLauncher.Windows.Forms { protected readonly Color borderColour = Color.FromArgb(232, 231, 236); protected readonly int borderWidth = 1; + + protected readonly Color backColour = Color.FromArgb(254, 254, 254); + protected readonly Color titleBarColour = Color.FromArgb(237, 240, 247); + protected readonly Color titleColour = Color.FromArgb(156, 158, 171); protected readonly int titleBarHeight = 56; private bool isDragging = false; @@ -36,7 +40,10 @@ namespace AppLauncher.Windows.Forms this.StartPosition = FormStartPosition.Manual; } - notifyIcon1.Text = "Fizzy App Launcher"; + this.BackColor = backColour; + this.Padding = new Padding(0); + + notifyIcon1.Text = Application.ProductName; } protected override void OnLoad(EventArgs e) @@ -62,6 +69,12 @@ namespace AppLauncher.Windows.Forms panel1.Width = this.DisplayRectangle.Width; panel1.Anchor = (AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom); + if (this.DesignMode) + { + imageBox1.Visible = imageBox2.Visible = imageBox3.Visible = false; + panel1.Visible = false; + } + this.ResumeLayout(); } @@ -147,9 +160,9 @@ namespace AppLauncher.Windows.Forms g.FillRectangle(new SolidBrush(titleBarColour), area.X, area.Y, (area.Width + area.X), titleBarHeight); g.DrawLine(new Pen(borderColour, 1), area.X, (titleBarHeight + 1), (area.Width + area.X), (titleBarHeight + 1)); - g.DrawImageUnscaled(Properties.Resources.app_icon_24, 17, 17); + if (!DesignMode) g.DrawImageUnscaled(Properties.Resources.app_icon_24, 17, 17); - TextRenderer.DrawText(g, Application.ProductName, new Font(this.Font.FontFamily, 14F), new Point(58, 17), Color.FromArgb(156, 158, 171)); + if (!DesignMode) TextRenderer.DrawText(g, Application.ProductName, new Font(this.Font.FontFamily, 14F), new Point(58, 17), titleColour); } @@ -161,13 +174,13 @@ namespace AppLauncher.Windows.Forms } [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public override Color BackColor { get => base.BackColor; set => base.BackColor = Color.FromArgb(254, 254, 254); } + public override Color BackColor { get => base.BackColor; set => base.BackColor = value; } [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; } [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)] - public new Padding Padding { get => base.Padding; set => base.Padding = new Padding(0); } + public new Padding Padding { get => base.Padding; set => base.Padding = value; } [Category("Appearance")] public ContextMenuStrip TitleContextMenuStrip { get; set; } = null; @@ -334,6 +347,15 @@ namespace AppLauncher.Windows.Forms else if (e.Button == MouseButtons.Right) { this.TopMost = !this.TopMost; + + if (this.TopMost) + { + imageBox2.Image = imageBox2.ImageNormal = Resource1.maximise3_20; + } + else + { + imageBox2.Image = imageBox2.ImageNormal = Resource1.maximise_20; + } } }