diff --git a/ReleaseNotes.md b/ReleaseNotes.md index ebb95f57..c99c8641 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,3 +1,8 @@ +2.17: +- Replace SmoothScrollingBehavior with AdvancedScrollWheelBehavior +- Fix scrolling behavior in AdvancedScrollWheelBehavior, improve support for touchpad scrolling +- Shortcut to attach AdvancedScrollWheelBehavior with or without animation + 2.16: - Add the smooth scrolling behavior to extend the scroll viewer mouse wheel behavior. diff --git a/docs/LastBuild.log b/docs/LastBuild.log index a65f6813..d3cb2ac2 100644 --- a/docs/LastBuild.log +++ b/docs/LastBuild.log @@ -1,5 +1,5 @@ - + The Sandcastle tools are located in 'C:\Program Files (x86)\EWSoftware\Sandcastle Help File Builder' Locating components in the following folder(s): @@ -108,18 +108,18 @@ Copying XML comments files Generating shared content files (en-US, English (United States))... - Last step completed in 00:00:00,0090 + Last step completed in 00:00:00,0030 Generating API filter for MRefBuilder... - Last step completed in 00:00:00,0090 + Last step completed in 00:00:00,0040 Generating reflection information... -[C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin\amd64\MSBuild.exe - GenerateRefInfo-f855ac06-b0bb-43a8-a3a2-11be88b86ee9.proj] -Build started 31.07.2024 13:30:15. +[C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin\amd64\MSBuild.exe - GenerateRefInfo-201997e3-6234-4cb6-b4e5-3f9d232b0e84.proj] +Build started 01.08.2024 08:48:12. -Project "C:\dev\GitHub\TomsToolbox\docs\Working\GenerateRefInfo-f855ac06-b0bb-43a8-a3a2-11be88b86ee9.proj" on node 1 (default targets). +Project "C:\dev\GitHub\TomsToolbox\docs\Working\GenerateRefInfo-201997e3-6234-4cb6-b4e5-3f9d232b0e84.proj" on node 1 (default targets). PrepareForBuild: Creating directory "obj\Debug\". GenerateRefInfo: @@ -127,15 +127,15 @@ GenerateRefInfo: c Microsoft Corporation. All rights reserved. No source code context base path specified. Source context information is unavailable. Loaded 14 assemblies for reflection and 25 dependency assemblies. - Wrote information on 21 namespaces, 234 types, and 1359 members + Wrote information on 20 namespaces, 233 types, and 1358 members Merging duplicate type and member information Merged 0 duplicate type(s) and 0 duplicate member(s) -Done Building Project "C:\dev\GitHub\TomsToolbox\docs\Working\GenerateRefInfo-f855ac06-b0bb-43a8-a3a2-11be88b86ee9.proj" (default targets). - Last step completed in 00:00:00,7738 +Done Building Project "C:\dev\GitHub\TomsToolbox\docs\Working\GenerateRefInfo-201997e3-6234-4cb6-b4e5-3f9d232b0e84.proj" (default targets). + Last step completed in 00:00:00,7469 Applying document model to reflection output... - Last step completed in 00:00:00,1300 + Last step completed in 00:00:00,0970 Adding topic filenames to API members... @@ -260,21 +260,21 @@ Adding topic filenames to API members... Unique name 4F420DEA generated for M:TomsToolbox.Wpf.Converters.ThicknessMultiplyConverter.Convert(System.Object,System.Type,System.Object,System.Globalization.CultureInfo) Unique name DB5A80DB generated for M:TomsToolbox.Wpf.Converters.ValueConverterExtensions.TraceError(System.Windows.Data.IValueConverter,System.String,System.String) Unique name C73FFCA9 generated for M:TomsToolbox.Wpf.Styles.WpfStyles.Defaults(System.Windows.Window) - Last step completed in 00:00:00,1230 + Last step completed in 00:00:00,1206 Generating API topic manifest... - Last step completed in 00:00:00,0360 + Last step completed in 00:00:00,0293 Generating namespace summary information... - Last step completed in 00:00:00,0600 + Last step completed in 00:00:00,0628 Generating inherited documentation... [C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin\amd64\MSBuild.exe - GenerateInheritedDocs.proj] - Last step completed in 00:00:00,8523 + Last step completed in 00:00:00,8593 Copying conceptual content... @@ -284,37 +284,37 @@ Copying images and creating the media map file... Generating conceptual topic files Parsing topic file 'C:\dev\GitHub\TomsToolbox\src\Documentation\Content\Welcome.aml' C:\dev\GitHub\TomsToolbox\src\Documentation\Content\Welcome.aml -> C:\dev\GitHub\TomsToolbox\docs\Working\ddueXml\70e0e697-583b-46c1-94a3-a992d398d79a.xml - Last step completed in 00:00:00,0217 + Last step completed in 00:00:00,0140 Creating conceptual topic configuration files... Companion files _ContentMetadata_.xml Merging topic IDs into reference topic manifest file - Last step completed in 00:00:00,0110 + Last step completed in 00:00:00,0040 Copying additional content files... C:\dev\GitHub\TomsToolbox\src\Documentation\icons\Help.png -> C:\dev\GitHub\TomsToolbox\docs\Working\Output\Website\icons\Help.png C:\dev\GitHub\TomsToolbox\src\Documentation\Readme.md -> C:\dev\GitHub\TomsToolbox\docs\Working\Output\Website\Readme.md - Last step completed in 00:00:00,0320 + Last step completed in 00:00:00,0030 Merging conceptual and additional tables of contents... - Last step completed in 00:00:00,0037 + Last step completed in 00:00:00,0000 Generating intermediate table of contents file for API content... Generating conceptual content intermediate TOC file... - Last step completed in 00:00:00,0548 + Last step completed in 00:00:00,0380 Creating Sandcastle configuration files... - Last step completed in 00:00:00,1483 + Last step completed in 00:00:00,1020 Combining conceptual and API intermediate TOC files... - Last step completed in 00:00:00,0172 + Last step completed in 00:00:00,0050 Merging custom build component configurations @@ -328,7 +328,7 @@ C:\dev\GitHub\TomsToolbox\docs\Working\BuildAssembler.config Replacing default configuration for 'Code Block Component' with the custom configuration Replacing default configuration for 'Syntax Component' with the custom configuration Removing unused ExampleComponent. - Last step completed in 00:00:00,0248 + Last step completed in 00:00:00,0040 Building help topics... @@ -371,22 +371,21 @@ SHFB: Warning BE0066: ResolveReferenceLinksComponent: [T:TomsToolbox.Wpf.Interac SHFB: Warning BE0066: ResolveReferenceLinksComponent: [Fields.T:TomsToolbox.Wpf.Interactivity.SmoothScrollingBehavior] Unknown reference link target 'P:TomsToolbox.Wfp.Interactivity.SmoothScrollingBehavior.Register'. SHFB: Warning BE0066: ResolveReferenceLinksComponent: [F:TomsToolbox.Wpf.Interactivity.SmoothScrollingBehavior.RegisterProperty] Unknown reference link target 'P:TomsToolbox.Wfp.Interactivity.SmoothScrollingBehavior.Register'. SHFB: Warning BE0066: ShowMissingComponent: [M:TomsToolbox.Wpf.Styles.WpfStyles.RegisterDefaultStyles(System.Windows.ResourceDictionary)] Missing <returns> documentation -SHFB: Warning BE0066: ShowMissingComponent: [N:XamlGeneratedNamespace] Missing <summary> documentation -Processed 2114 topic(s) -35 warning(s) +Processed 2110 topic(s) +34 warning(s) CopyFromIndexComponent: "metadata" in-memory cache entries used: 1 of 15. ResolveArtLinksComponent: Copying media files... CopyFromIndexComponent: "reflection" in-memory cache entries used: 15 of 15. -CopyFromIndexComponent: "comments" in-memory cache entries used: 16 of 30. - Last step completed in 00:00:07,0196 +CopyFromIndexComponent: "comments" in-memory cache entries used: 15 of 30. + Last step completed in 00:00:06,6861 Extracting HTML info for HTML Help 1 and/or website... Using LCID '1033', code page '65001', encoding charset 'UTF-8'. Processing website files in C:\dev\GitHub\TomsToolbox\docs\Working\Output\Website -Processed 2114 HTML files. Sorting keywords and generating See Also indices. +Processed 2110 HTML files. Sorting keywords and generating See Also indices. Saving website table of contents to C:\dev\GitHub\TomsToolbox\docs\Working\\WebTOC.xml - Last step completed in 00:00:00,1030 + Last step completed in 00:00:00,0740 Copying standard help content... @@ -465,14 +464,14 @@ C:\Program Files (x86)\EWSoftware\Sandcastle Help File Builder\Components\VS2013 C:\Program Files (x86)\EWSoftware\Sandcastle Help File Builder\Components\VS2013\Web\scripts\branding-Website.js -> C:\dev\GitHub\TomsToolbox\docs\Working\Output\Website\scripts\branding-Website.js C:\Program Files (x86)\EWSoftware\Sandcastle Help File Builder\Components\VS2013\Web\scripts\clipboard.min.js -> C:\dev\GitHub\TomsToolbox\docs\Working\Output\Website\scripts\clipboard.min.js C:\Program Files (x86)\EWSoftware\Sandcastle Help File Builder\Components\VS2013\Web\scripts\jquery-3.5.1.min.js -> C:\dev\GitHub\TomsToolbox\docs\Working\Output\Website\scripts\jquery-3.5.1.min.js - Last step completed in 00:00:00,1340 + Last step completed in 00:00:00,1350 Generating full-text index for the website... Adding lightweight search and TOC elements to each topic... - Last step completed in 00:00:00,9240 + Last step completed in 00:00:00,8540 Copying website files to output folder... @@ -482,16 +481,16 @@ Copied 1000 files Copied 1500 files Copied 2000 files Copied 2500 files -Copied 2950 files for the website content - Last step completed in 00:00:01,7822 +Copied 2944 files for the website content + Last step completed in 00:00:01,7797 Removing intermediate files... - Last step completed in 00:00:00,2820 + Last step completed in 00:00:00,2765 -Build completed successfully at 31.07.2024 13:30:27. Total time: 00:00:16,0719 +Build completed successfully at 01.08.2024 08:48:23. Total time: 00:00:14,9440 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9239eccd..4764d34f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -5,7 +5,7 @@ tom-englert.de © 2012-2024 tom-englert.de Tom's Toolbox - 2.16.0 + 2.17.0 .Net Tools Extensions A set of classes and functions to ease our daily .Net development tasks. LICENSE diff --git a/src/TomsToolbox.Composition.Analyzer.Tests/TomsToolbox.Composition.Analyzer.Tests.csproj b/src/TomsToolbox.Composition.Analyzer.Tests/TomsToolbox.Composition.Analyzer.Tests.csproj index 0fb54c62..9bad0929 100644 --- a/src/TomsToolbox.Composition.Analyzer.Tests/TomsToolbox.Composition.Analyzer.Tests.csproj +++ b/src/TomsToolbox.Composition.Analyzer.Tests/TomsToolbox.Composition.Analyzer.Tests.csproj @@ -14,6 +14,9 @@ + + + diff --git a/src/TomsToolbox.Composition.Tests/MetadataReaderTest.ReadSampleAppMef2Test.verified.txt b/src/TomsToolbox.Composition.Tests/MetadataReaderTest.ReadSampleAppMef2Test.verified.txt index f2dd6bb7..3b4de777 100644 --- a/src/TomsToolbox.Composition.Tests/MetadataReaderTest.ReadSampleAppMef2Test.verified.txt +++ b/src/TomsToolbox.Composition.Tests/MetadataReaderTest.ReadSampleAppMef2Test.verified.txt @@ -42,6 +42,42 @@ "IsShared": false, "SharingBoundary": null }, + { + "Type": "SampleApp.Samples.AdvancedScrollingView, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", + "Metadata": [ + { + "ContractName": "{41cf1dfc-9c56-4e06-b177-703b4a24b0e1}", + "ContractType": "System.Windows.DependencyObject, WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", + "DataType": "SampleApp.Samples.AdvancedScrollingViewModel, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", + "Role": null, + "TypeId": "TomsToolbox.Wpf.Composition.AttributedModel.DataTemplateAttribute, TomsToolbox.Wpf.Composition.AttributedModel, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2" + } + ], + "IsShared": false, + "SharingBoundary": null + }, + { + "Type": "SampleApp.Samples.AdvancedScrollingViewModel, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", + "Metadata": [ + { + "ContractName": null, + "ContractType": null, + "TypeId": "System.Composition.ExportAttribute, System.Composition.AttributedModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + }, + { + "ContractName": "VisualComposition-86E8D1EF-1322-46B4-905C-115AAD63533D", + "ContractType": "System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "Role": null, + "Sequence": 12.0, + "TargetRegions": [ + "Main" + ], + "TypeId": "TomsToolbox.Wpf.Composition.AttributedModel.VisualCompositionExportAttribute, TomsToolbox.Wpf.Composition.AttributedModel, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2" + } + ], + "IsShared": true, + "SharingBoundary": null + }, { "Type": "SampleApp.Samples.ChartView, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", "Metadata": [ @@ -704,42 +740,6 @@ "IsShared": false, "SharingBoundary": null }, - { - "Type": "SampleApp.Samples.SmoothScrollingView, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", - "Metadata": [ - { - "ContractName": "{41cf1dfc-9c56-4e06-b177-703b4a24b0e1}", - "ContractType": "System.Windows.DependencyObject, WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", - "DataType": "SampleApp.Samples.SmoothScrollingViewModel, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", - "Role": null, - "TypeId": "TomsToolbox.Wpf.Composition.AttributedModel.DataTemplateAttribute, TomsToolbox.Wpf.Composition.AttributedModel, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2" - } - ], - "IsShared": false, - "SharingBoundary": null - }, - { - "Type": "SampleApp.Samples.SmoothScrollingViewModel, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", - "Metadata": [ - { - "ContractName": null, - "ContractType": null, - "TypeId": "System.Composition.ExportAttribute, System.Composition.AttributedModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - }, - { - "ContractName": "VisualComposition-86E8D1EF-1322-46B4-905C-115AAD63533D", - "ContractType": "System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "Role": null, - "Sequence": 12.0, - "TargetRegions": [ - "Main" - ], - "TypeId": "TomsToolbox.Wpf.Composition.AttributedModel.VisualCompositionExportAttribute, TomsToolbox.Wpf.Composition.AttributedModel, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2" - } - ], - "IsShared": true, - "SharingBoundary": null - }, { "Type": "SampleApp.Samples.Styx, SampleApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=60b39f873a8e3fc2", "Metadata": [ diff --git a/src/TomsToolbox.Composition.Tests/TomsToolbox.Composition.Tests.csproj b/src/TomsToolbox.Composition.Tests/TomsToolbox.Composition.Tests.csproj index cd7ac9ce..a6669c48 100644 --- a/src/TomsToolbox.Composition.Tests/TomsToolbox.Composition.Tests.csproj +++ b/src/TomsToolbox.Composition.Tests/TomsToolbox.Composition.Tests.csproj @@ -12,7 +12,7 @@ - +