From b80b375df1535095c6c19283051fb78f6487207a Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Sun, 14 Jul 2019 01:40:13 +0200 Subject: [PATCH] move code before base.OnShown so scripts can use the ContextMenu --- Changelog.md | 4 ++++ mpv.net/Properties/AssemblyInfo.cs | 4 ++-- mpv.net/WinForms/MainForm.Designer.cs | 2 +- mpv.net/WinForms/MainForm.cs | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index c4bc45c..e1c2779 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +### 4.7.2 + +- fix cursor showing load activity on startup + ### 4.7.1 - few layout problems were fixed, autosize for instance did not work diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs index ebf74ca..51987f4 100644 --- a/mpv.net/Properties/AssemblyInfo.cs +++ b/mpv.net/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("4.7.1.0")] -[assembly: AssemblyFileVersion("4.7.1.0")] +[assembly: AssemblyVersion("4.7.2.0")] +[assembly: AssemblyFileVersion("4.7.2.0")] diff --git a/mpv.net/WinForms/MainForm.Designer.cs b/mpv.net/WinForms/MainForm.Designer.cs index f954462..e2c7297 100644 --- a/mpv.net/WinForms/MainForm.Designer.cs +++ b/mpv.net/WinForms/MainForm.Designer.cs @@ -45,7 +45,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(288F, 288F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.Color.Black; - this.ClientSize = new System.Drawing.Size(348, 0); + this.ClientSize = new System.Drawing.Size(542, 0); this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs index 7b442b1..1ea6f92 100644 --- a/mpv.net/WinForms/MainForm.cs +++ b/mpv.net/WinForms/MainForm.cs @@ -511,7 +511,6 @@ namespace mpvnet protected override void OnShown(EventArgs e) { - base.OnShown(e); if (App.IsDarkMode) ToolStripRendererEx.ColorTheme = Color.Black; ContextMenu = new ContextMenuStripEx(components); ContextMenu.Opened += ContextMenu_Opened; @@ -521,6 +520,7 @@ namespace mpvnet IgnoreDpiChanged = false; CheckClipboardForURL(); Cursor.Position = new Point(Cursor.Position.X + 1, Cursor.Position.Y); + base.OnShown(e); } protected override void OnActivated(EventArgs e)