Merge branch 'release/v24.1.1' into main

Documentation/topics/conversion/converting-to-v24-1.md

@@ -159,7 +159,7 @@ The [UIColor](xref:@ActiproUIRoot.Drawing.UIColor) class has been updated with a
 
 ## Previously Deprecated Items Removed
 
-The following members were deprecated in previous releases have been removed in this release.
+The following members were deprecated in previous releases and have been removed in this release.
 
-- (Docking) [AssemblyInfo](xref:ActiproSoftware.Products.Docking.AssemblyInfo).`GetImage` method that did not accept a scale factor was removed. Use the [GetImage](xref:ActiproSoftware.Products.Docking.AssemblyInfo.GetImage*) method that accepts a scale factor.
+- (Docking) `AssemblyInfo.GetImage` method that did not accept a scale factor was removed. Use the `GetImage` method that accepts a scale factor instead.
 - (SyntaxEditor) [IntelliPromptSessionTypes](xref:@ActiproUIRoot.Controls.SyntaxEditor.IntelliPrompt.IntelliPromptSessionTypes).`CodeSnippet` was removed. Use the [CodeSnippetTemplate](xref:@ActiproUIRoot.Controls.SyntaxEditor.IntelliPrompt.IntelliPromptSessionTypes.CodeSnippetTemplate) property instead.

Documentation/topics/licensing.md

@@ -152,7 +152,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=24.1.0.0, Culture=neutral, PublicKeyToken=c27e062d3c1a4763
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.WinForms, Version=24.1.1.0, Culture=neutral, PublicKeyToken=c27e062d3c1a4763
 ```
 
 > [!IMPORTANT]

Documentation/topics/recent-updates.md

@@ -9,6 +9,10 @@ WinForms Studio's documentation has frequent updates, so this topic is the best
 
 If you are looking for a list of recently-added major new features to WinForms Studio products, please see the **Sample Browser**'s Release History pages instead.
 
+## Updates for v24.1.1
+
+- **SyntaxEditor:** Removed "Control Key Down Opacity" from [Overlay Panes](syntaxeditor/user-interface/editor-view/overlay-panes.md) topic since the WinForms platform does not support that feature.
+
 ## Updates for v24.1.0
 
 - **All:** Added [Troubleshooting (General)](troubleshooting.md) topic.

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

@@ -48,12 +48,16 @@ To prevent these keys (or any other key combination) from reaching the `SyntaxEd
 
 }
 
+@if (wpf) {
+
 ## Control Key Down Opacity
 
 Overlay panes can become semi-transparent when the <kbd>Ctrl</kbd> key is held down, thereby allowing the end user to see the text behind it. The [IOverlayPane](xref:@ActiproUIRoot.Controls.SyntaxEditor.IOverlayPane).[ControlKeyDownOpacity](xref:@ActiproUIRoot.Controls.SyntaxEditor.IOverlayPane.ControlKeyDownOpacity) property specifies the opacity when the popup is semi-transparent.
 
 The property value `0.25` is recommended for transparency. Set this property to `1.0` to prevent the pane from becoming semi-transparent.
 
+}
+
 ## Single or Multiple Views
 
 The [IOverlayPane](xref:@ActiproUIRoot.Controls.SyntaxEditor.IOverlayPane).[InstanceKind](xref:@ActiproUIRoot.Controls.SyntaxEditor.IOverlayPane.InstanceKind) property specifies how many instances of the overlay pane are permitted across all views of the same `SyntaxEditor` control.

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

@@ -122,12 +122,16 @@ The [SyntaxEditor](xref:@ActiproUIRoot.Controls.SyntaxEditor.SyntaxEditor).[View
 
 Search results can be highlighted as the find text and other search options are altered in the search overlay pane.  For this functionality to work, please make sure the appropriate display classification type is registered per the requirements listed in the [Search Result Highlighting](search-result-highlighting.md) topic.
 
+@if (wpf) {
+
 ## Control Key Down Opacity
 
 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 pane from being semi-transparent.
 
+}
+
 ## Programmatically Opening the Pane
 
 This code shows how to programmatically the pane:

Documentation/topics/visual-studio-designer.md

@@ -39,16 +39,27 @@ The following outlines the compatibility of Actipro WinForms Controls with versi
 <tbody>
 
 <tr>
-<td>WinForms Controls v23.1</td>
+<td>WinForms Controls v24.1</td>
 <td>
 
-- Visual Studio 2022 v17.0-17.6
+- Visual Studio 2022 v17.0-17.11
 - Visual Studio 2019 v16.10-16.11
 - *Minor updates to v16 and v17 are expected to be supported and will be verified as they are released*
 
 </td>
 </tr>
 
+<tr>
+<td>WinForms Controls v23.1</td>
+<td>
+
+- Visual Studio 2022 v17.0-17.8
+- Visual Studio 2019 v16.10-16.11
+- *Minor updates to v16 and v17 are expected to be supported, but are no longer verified on older control releases*
+
+</td>
+</tr>
+
 <tr>
 <td>WinForms Controls v22.1</td>
 <td>

Samples/SampleBrowser/ActiproSoftware.References.props

@@ -8,7 +8,7 @@
 		https://www.actiprosoftware.com/docs/controls/winforms/nuget
 	 -->
 	<PropertyGroup>
-		<ActiproVersion>24.1.0</ActiproVersion>
+		<ActiproVersion>24.1.1</ActiproVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

Samples/SampleBrowser/ProductSamples/SyntaxEditorSamples/Demo/SdiCodeEditor/MainControl.cs

@@ -34,6 +34,8 @@ namespace ActiproSoftware.ProductSamples.SyntaxEditorSamples.Demo.SdiCodeEditor
 	/// </summary>
 	public partial class MainControl : UserControl, IProductSample {
 
+		private float				defaultFontSize;
+		private int					defaultIndicatorMarginWidth;
 		private bool				hasPendingParseData;
 
 		// Project assemblies used by C#/VB in the .NET Languages Add-on
@@ -50,6 +52,11 @@ public partial class MainControl : UserControl, IProductSample {
 		public MainControl() {
 			InitializeComponent();
 
+			// Cache the default font size and indicator margin width that can be used to auto-scale the indicator margin
+			// as the font size changes.
+			defaultFontSize = editor.Font.Size;
+			defaultIndicatorMarginWidth = editor.IndicatorMarginWidth;
+
 			// Finalize initialization
 			DpiHelper.RescaleListViewColumns(errorListView, DpiHelper.DefaultDeviceDpi, DpiHelper.GetSystemDeviceDpi());
 
@@ -320,9 +327,21 @@ private void OnErrorListViewMouseDoubleClick(object sender, MouseEventArgs e) {
 		/// <param name="sender">The sender of the event.</param>
 		/// <param name="e">The <see cref="EventArgs"/> that contains the event data.</param>
 		private void OnFontSizeToolStripMenuItemDropDownOpening(object sender, EventArgs e) {
+			fontSize6ToolStripMenuItem.Checked = (editor.Font.Size == 6);
+			fontSize8ToolStripMenuItem.Checked = (editor.Font.Size == 8);
 			fontSize10ToolStripMenuItem.Checked = (editor.Font.Size == 10);
+			fontSize12ToolStripMenuItem.Checked = (editor.Font.Size == 12);
 			fontSize14ToolStripMenuItem.Checked = (editor.Font.Size == 14);
+			fontSize16ToolStripMenuItem.Checked = (editor.Font.Size == 16);
 			fontSize18ToolStripMenuItem.Checked = (editor.Font.Size == 18);
+			fontSize20ToolStripMenuItem.Checked = (editor.Font.Size == 20);
+			fontSize22ToolStripMenuItem.Checked = (editor.Font.Size == 22);
+			fontSize24ToolStripMenuItem.Checked = (editor.Font.Size == 24);
+			fontSize26ToolStripMenuItem.Checked = (editor.Font.Size == 26);
+			fontSize28ToolStripMenuItem.Checked = (editor.Font.Size == 28);
+			fontSize36ToolStripMenuItem.Checked = (editor.Font.Size == 36);
+			fontSize48ToolStripMenuItem.Checked = (editor.Font.Size == 48);
+			fontSize72ToolStripMenuItem.Checked = (editor.Font.Size == 72);
 		}
 
 		/// <summary>
@@ -332,6 +351,10 @@ private void OnFontSizeToolStripMenuItemDropDownOpening(object sender, EventArgs
 		/// <param name="e">A <see cref="EventArgs"/> that contains the event data.</param>
 		private void OnFontSizeToolStripMenuItemDropDownItemClicked(object sender, ToolStripItemClickedEventArgs e) {
 			editor.Font = new Font(editor.Font.FontFamily, int.Parse(e.ClickedItem.Text));
+
+			// Scale the indicator margin width based on the size of the font
+			var fontScale = editor.Font.Size / defaultFontSize;
+			editor.IndicatorMarginWidth = (int)Math.Round(defaultIndicatorMarginWidth * fontScale, MidpointRounding.AwayFromZero);
 		}
 
 		/// <summary>

Samples/SampleBrowser/Properties/AssemblyInfo.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("24.1.0.0")]
-[assembly: AssemblyInformationalVersion("24.1.0.0 - 20240206")]
+[assembly: AssemblyVersion("24.1.1.0")]
+[assembly: AssemblyInformationalVersion("24.1.1.0 - 20240223")]

Samples/SampleBrowser/Properties/licenses.licx

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

Samples/SampleBrowser/SampleBrowser.csproj

@@ -28,7 +28,7 @@
 
 		<AssemblyName>SampleBrowser</AssemblyName>
 
-		<Version>24.1.0.0</Version>
+		<Version>24.1.1.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>