Merge branch 'release/v23.1.3' into main

Author: billhenn

Documentation/topics/licensing.md

@@ -144,7 +144,7 @@ The contents of a *licenses.licx* file are pretty simple.  It needs a single lin
 This single line (update the version to match the one you use) should be added to the *licenses.licx* file in any project that uses Actipro @@PlatformName control or SyntaxEditor add-on products:
 
 ```
-ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.WinForms, Version=23.1.2.0, Culture=neutral, PublicKeyToken=c27e062d3c1a4763
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.WinForms, Version=23.1.3.0, Culture=neutral, PublicKeyToken=c27e062d3c1a4763
 ```
 
 ### Notes on Build Machines When Using Licenses.licx Files

Documentation/topics/syntaxeditor/text-parsing/core-text/text-changes.md

@@ -144,6 +144,18 @@ while (!reader.IsAtSnapshotEnd) {
 }
 ```
 
+### Setting the Post-Change Selection
+
+After a text change is applied, an editor view's selection will by default be collapsed to the offset location after the last operation.  This is accurate for many scenarios, however in some cases, the exact selection needs to be set to something else.
+
+This can be done by setting the [ITextChange](xref:ActiproSoftware.Text.ITextChange).[PostSelectionPositionRanges](xref:ActiproSoftware.Text.ITextChange.PostSelectionPositionRanges) property to an [ITextPositionRangeCollection](xref:ActiproSoftware.Text.ITextPositionRangeCollection) instance.  The static [TextPositionRange](xref:ActiproSoftware.Text.TextPositionRange).[CreateCollection](xref:ActiproSoftware.Text.TextPositionRange.CreateCollection*) method can create an [ITextPositionRangeCollection](xref:ActiproSoftware.Text.ITextPositionRangeCollection) instance.  The first overload for that method is most commonly used.  It takes a single [TextPositionRange](xref:ActiproSoftware.Text.TextPositionRange) and indicates if it should be a block or continuous stream selection.  The second overload is for supporting multiple selection ranges.
+
+This code uses a [TextPositionRange](xref:ActiproSoftware.Text.TextPositionRange) value in variable `selectionPositionRange` to indicate what the final editor view selection should become after the text change is applied:
+
+```csharp
+change.PostSelectionPositionRanges = TextPositionRange.CreateCollection(selectionPositionRange, isBlock: false)
+```
+
 ### Applying the Text Change
 
 Finally, when you have completely constructed the text change, call its [Apply](xref:ActiproSoftware.Text.ITextChange.Apply*) method to perform the text change on the document.

Documentation/topics/syntaxeditor/user-interface/editor-view/overlay-panes.md

@@ -33,9 +33,9 @@ Pressing keys like <kbd>Tab</kbd> and <kbd>Shift</kbd>+<kbd>Tab</kbd>, which nor
 To prevent these keys (or any other key combination) from reaching the `SyntaxEditor` control, override the overlay pane control's `OnKeyDown` method and set `KeyEventArgs.Handled = true`.
 
 > [!TIP]
-> The [OverlayPaneBase](xref:@ActiproUIRoot.Controls.SyntaxEditor.OverlayPaneBase) control has built-in support for handling key presses. By default, <kbd>Tab</kbd> and <kbd>Shift</kbd>+<kbd>Tab</kbd> will be handled and used to move keyboard focus. Override the [OnMoveFocus](xref:@ActiproUIRoot.Controls.SyntaxEditor.OverlayPaneBase.OnMoveFocus) method to customize which elements receive focus.  Set [AllowTabKeyToMoveFocus](xref:@ActiproUIRoot.Controls.SyntaxEditor.OverlayPaneBase.AllowTabKeyToMoveFocus) = `false` to disable the automatic handling of these keys.
+> The [OverlayPaneBase](xref:@ActiproUIRoot.Controls.SyntaxEditor.Implementation.OverlayPaneBase) control has built-in support for handling key presses. By default, <kbd>Tab</kbd> and <kbd>Shift</kbd>+<kbd>Tab</kbd> will be handled and used to move keyboard focus. Override the [OnMoveFocus](xref:@ActiproUIRoot.Controls.SyntaxEditor.Implementation.OverlayPaneBase.OnMoveFocus*) method to customize which elements receive focus.  Set [AllowTabKeyToMoveFocus](xref:@ActiproUIRoot.Controls.SyntaxEditor.Implementation.OverlayPaneBase.AllowTabKeyToMoveFocus) = `false` to disable the automatic handling of these keys.
 >
->To customize the handling of additional keys, override the [ProcessKeyDown](xref:@ActiproUIRoot.Controls.SyntaxEditor.OverlayPaneBase.ProcessKeyDown) method and return `true` for any keys that were handled by the overlay pane.
+>To customize the handling of additional keys, override the [ProcessKeyDown](xref:@ActiproUIRoot.Controls.SyntaxEditor.Implementation.OverlayPaneBase.ProcessKeyDown*) method and return `true` for any keys that were handled by the overlay pane.
 
 }
 

Documentation/topics/syntaxeditor/user-interface/searching/search-overlay-pane.md

@@ -126,7 +126,7 @@ Search results can be highlighted as the find text and other search options are
 
 The search overlay pane animates to be semi-transparent when the <kbd>Ctrl</kbd> key is held down, thereby allowing the end user to see the text behind it. [SearchOverlayPane](xref:@ActiproUIRoot.Controls.SyntaxEditor.Primitives.SearchOverlayPane).[ControlKeyDownOpacity](xref:@ActiproUIRoot.Controls.SyntaxEditor.Primitives.SearchOverlayPane.ControlKeyDownOpacity) property specifies the opacity when the popup is semi-transparent.
 
-Set this property to `1.0` to prevent the list from being semi-transparent.
+Set this property to `1.0` to prevent the pane from being semi-transparent.
 
 ## Programmatically Opening the Pane
 

Samples/SampleBrowser/ProductSamples/DockingSamples/Demo/DockingFeatures/MainForm.cs

@@ -34,6 +34,14 @@ public MainForm() {
 			//
 			InitializeComponent();
 
+			#if NETFRAMEWORK
+			// 11/15/2023 - Workaround for issue detected on Win11 23H2 (OS Build 22635.2700) where the 'resize' event of the panel
+			// that contains these property grids was not being raised and, as a result, the property grid layout was incorrect until
+			// they were resized.  Could not reproduce on Win11 22H2.  Issue was not present on "netcoreapp3.1" or "net6.0-windows".
+			ResizeDockManagerPropertyGrid();
+			ResizeToolWindowPropertyGrid();
+			#endif
+
 			// Select the first item
 			if (toolWindowPropertyGridComboBox.Items.Count > 0)
 				toolWindowPropertyGridComboBox.SelectedIndex = 0;
@@ -353,16 +361,7 @@ private void dockManagerPropertyGridComboBox_SelectedIndexChanged(object sender,
 		/// <param name="sender">Sender of the event.</param>
 		/// <param name="e">Event arguments.</param>
 		private void dockManagerPropertyGridPanel_Resize(object sender, EventArgs e) {
-			dockManagerPropertyGrid.SuspendLayout();
-
-			// Reset the Anchor that is only used to keep designer layout consistent
-			dockManagerPropertyGrid.Anchor = AnchorStyles.None;
-
-			// Set the size/location of the PropertyGrid to be 1px bigger than the containing panel so the PropertyGrid border is not visible
-			dockManagerPropertyGrid.Location = new Point(-1, -1);
-			dockManagerPropertyGrid.Size = new Size(dockManagerPropertyGridPanel.Width + 2, dockManagerPropertyGridPanel.Height + 2);
-
-			dockManagerPropertyGrid.ResumeLayout();
+			ResizeDockManagerPropertyGrid();
 		}
 
 		/// <summary>
@@ -731,16 +730,7 @@ private void toolWindowPropertyGridComboBox_SelectedIndexChanged(object sender,
 		/// <param name="sender">Sender of the event.</param>
 		/// <param name="e">Event arguments.</param>
 		private void toolWindowPropertyGridPanel_Resize(object sender, EventArgs e) {
-			toolWindowPropertyGrid.SuspendLayout();
-
-			// Reset the Anchor that is only used to keep designer layout consistent
-			toolWindowPropertyGrid.Anchor = AnchorStyles.None;
-
-			// Set the size/location of the PropertyGrid to be 1px bigger than the containing panel so the PropertyGrid border is not visible
-			toolWindowPropertyGrid.Location = new Point(-1, -1);
-			toolWindowPropertyGrid.Size = new Size(toolWindowPropertyGridPanel.Width + 2, toolWindowPropertyGridPanel.Height + 2);
-
-			toolWindowPropertyGrid.ResumeLayout();
+			ResizeToolWindowPropertyGrid();
 		}
 
 		/// <summary>
@@ -1560,6 +1550,27 @@ private bool PromptSaveDocument(DocumentWindow document) {
 			return true;
 		}
 
+		private void ResizeDockManagerPropertyGrid() {
+			ResizePropertyGridWithinPanel(dockManagerPropertyGrid, dockManagerPropertyGridPanel);
+		}
+
+		private void ResizeToolWindowPropertyGrid() {
+			ResizePropertyGridWithinPanel(toolWindowPropertyGrid, toolWindowPropertyGridPanel);
+		}
+
+		private void ResizePropertyGridWithinPanel(PropertyGrid propertyGrid, Panel panel) {
+			propertyGrid.SuspendLayout();
+
+			// Reset the Anchor that is only used to keep designer layout consistent
+			propertyGrid.Anchor = AnchorStyles.None;
+
+			// Set the size/location of the PropertyGrid to be 1px bigger than the containing panel so the PropertyGrid border is not visible
+			propertyGrid.Location = new Point(-1, -1);
+			propertyGrid.Size = new Size(panel.Width + 2, panel.Height + 2);
+
+			propertyGrid.ResumeLayout();
+		}
+
 		/// <summary>
 		/// Update the border styles of child controls.
 		/// </summary>

Samples/SampleBrowser/ProductSamples/SyntaxEditorSamples/QuickStart/DocumentSwapping/MainControl.Designer.cs

@@ -49,7 +49,8 @@ private void OnSessionCommitting(object sender, CancelEventArgs e) {
 					e.Cancel = true;
 
 					// Show a messagebox instead
-					MessageBox.Show("Show a dialog for building a URL here.  Note that auto-complete was cancelled in code-behind.", "URL Builder", MessageBoxButtons.OK, MessageBoxIcon.Information);
+					var owner = session.View?.SyntaxEditor?.FindForm();
+					MessageBox.Show(owner, "Show a dialog for building a URL here.  Note that auto-complete was cancelled in code-behind.", "URL Builder", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				}
 			}
 		}

Samples/SampleBrowser/ProductSamples/SyntaxEditorSamples/QuickStart/IntelliPromptCompletionCustomActions/CustomCompletionProvider.cs

@@ -32,12 +32,29 @@ public MainControl() {
 
 			// Refresh highlights
 			this.RefreshHighlights();
+
+			// Listen for changes in the active view so highlights can be moved
+			editor.ActiveViewChanged += this.OnEditorActiveViewChanged;
 		}
 
 		/////////////////////////////////////////////////////////////////////////////////////////////////////
 		// NON-PUBLIC PROCEDURES
 		/////////////////////////////////////////////////////////////////////////////////////////////////////
 
+		/// <summary>
+		/// Occurs when the active view in the editor is changed.
+		/// </summary>
+		/// <param name="sender">The sender of the event.</param>
+		/// <param name="e">A <see cref="EditorViewChangedEventArgs"/> that contains the event data.</param>
+		private void OnEditorActiveViewChanged(object sender, EditorViewChangedEventArgs e) {
+			// Clear search options from the inactive view
+			if (e.OldValue != null)
+				e.OldValue.HighlightedResultSearchOptions = null;
+
+			// Apply highlights to the newly active view
+			RefreshHighlights();
+		}
+
 		/// <summary>
 		/// Occurs when the control becomes the active control on the form.
 		/// </summary>

Samples/SampleBrowser/ProductSamples/SyntaxEditorSamples/QuickStart/SearchResultHighlighting/MainControl.cs

@@ -29,5 +29,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("23.1.2.0")]
-[assembly: AssemblyInformationalVersion("23.1.2.0 - 20230403")]
+[assembly: AssemblyVersion("23.1.3.0")]
+[assembly: AssemblyInformationalVersion("23.1.3.0 - 20230911")]

Samples/SampleBrowser/Properties/AssemblyInfo.cs

@@ -1 +1 @@
-ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.WinForms, Version=23.1.2.0, Culture=neutral, PublicKeyToken=c27e062d3c1a4763
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.WinForms, Version=23.1.3.0, Culture=neutral, PublicKeyToken=c27e062d3c1a4763