Merge pull request #673 from stevencohn/672-fix-hanging-bubble-window

672 Fix hanging MoreBubbleWindow

Author: stevencohn

OneMore/OneMore.csproj

@@ -629,6 +629,9 @@
     <Compile Include="UI\MoreLinkLabel.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="UI\MoreRichLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="UI\ProgressDialog.cs">
       <SubType>Form</SubType>
     </Compile>

OneMore/UI/MoreBubbleWindow.Designer.cs

@@ -42,7 +42,7 @@ public MoreBubbleWindow()
 
 		public void SetMessage(string text)
 		{
-			textBox.Text = text;
+			messageBox.Text = text;
 		}
 
 
@@ -54,6 +54,13 @@ public static DialogResult Show(IWin32Window owner, string text)
 		}
 
 
+		private void PauseTimer(object sender, EventArgs e)
+		{
+			timer.Stop();
+			Opacity = 100;
+		}
+
+
 		private void Tick(object sender, EventArgs e)
 		{
 			time += timer.Interval;
@@ -73,6 +80,12 @@ private void Tick(object sender, EventArgs e)
 		}
 
 
+		private void Unclick(object sender, EventArgs e)
+		{
+			okButton.Focus();
+		}
+
+
 		protected override void OnLoad(EventArgs e)
 		{
 			base.OnLoad(e);
@@ -117,11 +130,6 @@ private void CloseWindow(object sender, EventArgs e)
 			timer.Stop();
 			timer.Dispose();
 			Close();
-
-			// attempt to reactive OneNote window and text caret...
-			// doesn't fully activate but at least sets focus
-			using var one = new OneNote();
-			Native.SetForegroundWindow(one.WindowHandle);
 		}
 	}
 }

OneMore/UI/MoreBubbleWindow.cs

@@ -0,0 +1,40 @@
+//************************************************************************************************
+// Copyright © 2022 Steven M Cohn.  All rights reserved.
+//************************************************************************************************
+
+namespace River.OneMoreAddIn.UI
+{
+	using System.ComponentModel;
+	using System.Windows.Forms;
+
+
+	internal class MoreRichLabel : RichTextBox
+	{
+		private const int WM_SETFOCUS = 0x0007;
+		private const int WM_KILLFOCUS = 0x0008;
+
+
+		public MoreRichLabel()
+			: base()
+		{
+
+		}
+
+
+		/// <summary>
+		/// Gets or sets whether text can be selected. Default is false.
+		/// </summary>
+		[DefaultValue(false)]
+		public bool Selectable { get; set; } = false;
+
+
+		protected override void WndProc(ref Message m)
+		{
+			if (m.Msg == WM_SETFOCUS && !Selectable)
+			{
+				m.Msg = WM_KILLFOCUS;
+			}
+			base.WndProc(ref m);
+		}
+	}
+}