Skip to content

Commit

Permalink
Updates for v25.1.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
billhenn committed Jan 16, 2025
1 parent f56e782 commit 694aa50
Show file tree
Hide file tree
Showing 43 changed files with 310 additions and 172 deletions.
2 changes: 1 addition & 1 deletion Build/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<RootNamespace>ActiproSoftware.Tools.Builds</RootNamespace>
<Company>Actipro Software LLC</Company>
<Authors>Actipro Software LLC</Authors>
<Copyright>Copyright (c) 2021-2024 Actipro Software LLC. All rights reserved.</Copyright>
<Copyright>Copyright (c) 2021-2025 Actipro Software LLC. All rights reserved.</Copyright>

<GeneratePackageOnBuild>false</GeneratePackageOnBuild>

Expand Down
2 changes: 1 addition & 1 deletion Documentation/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"_appTitle": "Actipro Avalonia Docs",
"_docsCompanyHref": "https://www.actiprosoftware.com/products/controls/avalonia",
"_docsCompanyName": "Actipro Software LLC",
"_docsCopyrightYears": "2021-2024",
"_docsCopyrightYears": "2021-2025",
"_docsProductHref": "https://www.actiprosoftware.com/products/controls/avalonia",
"_docsProductName": "Avalonia",
"_docsProductVersion": "25.1",
Expand Down
4 changes: 2 additions & 2 deletions Documentation/topics/bars/mvvm-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ The following table shows various bar control view model types defined in the MV
| [BarSplitToggleButtonViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.BarSplitToggleButtonViewModel) | Toggle [split button](controls/split-button.md) control. |
| [BarTextBoxViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.BarTextBoxViewModel) | [Textbox](controls/textbox.md) control. |
| [BarToggleButtonViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.BarToggleButtonViewModel) | Toggle [button](controls/button.md) control. |
| [RibbonApplicationButton](xref:@ActiproUIRoot.Controls.Bars.RibbonApplicationButton) | [Application button](ribbon-features/application-button.md) control. |
| [RibbonApplicationButtonViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonApplicationButtonViewModel) | [Application button](ribbon-features/application-button.md) control. |
| [RibbonBackstageHeaderButtonViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonBackstageHeaderButtonViewModel) | [Backstage](ribbon-features/backstage.md) header button control. |
| [RibbonBackstageHeaderSeparatorViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonBackstageHeaderSeparatorViewModel) | [Backstage](ribbon-features/backstage.md) header separator control. |
| [RibbonBackstageTabViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonBackstageTabViewModel) | [Backstage](ribbon-features/backstage.md) tab control. |
Expand Down Expand Up @@ -303,7 +303,7 @@ The following table shows various bar control view model types defined in the MV
| [BarTextBoxViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.BarTextBoxViewModel) | [Textbox](controls/textbox.md) control. |
| [BarToggleButtonViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.BarToggleButtonViewModel) | Toggle [button](controls/button.md) control. |
| [MiniToolBarViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.MiniToolBarViewModel) | [Mini-toolbar](toolbar-features/mini-toolbars.md) control. |
| [RibbonApplicationButton](xref:@ActiproUIRoot.Controls.Bars.RibbonApplicationButton) | [Application button](ribbon-features/application-button.md) control. |
| [RibbonApplicationButtonViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonApplicationButtonViewModel) | [Application button](ribbon-features/application-button.md) control. |
| [RibbonBackstageHeaderButtonViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonBackstageHeaderButtonViewModel) | [Backstage](ribbon-features/backstage.md) header button control. |
| [RibbonBackstageHeaderSeparatorViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonBackstageHeaderSeparatorViewModel) | [Backstage](ribbon-features/backstage.md) header separator control. |
| [RibbonBackstageTabViewModel](xref:@ActiproUIRoot.Controls.Bars.Mvvm.RibbonBackstageTabViewModel) | [Backstage](ribbon-features/backstage.md) tab control. |
Expand Down
4 changes: 4 additions & 0 deletions Documentation/topics/fundamentals/controls/avatar-group.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ Use the [ItemLength](xref:@ActiproUIRoot.Controls.AvatarGroup.ItemLength) proper

By default, each avatar will slightly overlap with the avatar that appears before it. Use the [OverlapPercentage](xref:@ActiproUIRoot.Controls.AvatarGroup.OverlapPercentage) property to define the extent of the overlap. The default value is `0.2` for a 20% overlap.

The [Orientation](xref:@ActiproUIRoot.Controls.AvatarGroup.Orientation) property determines if the non-overflowed avatars are arranged horizontally or vertically. The default is `Horizontal`.

## Overflow

Individual [Avatar](avatar.md) controls can optionally be overflowed when there is not enough room to display them all inline. When overflow is necessary, a button is added at the end of the group that, when clicked, will display the additional items in a popup.
Expand All @@ -27,6 +29,8 @@ By default, the group will display as many avatars as possible in the space avai

The overflow button indicates the number of overflowed items. Use the [OverflowStringFormat](xref:@ActiproUIRoot.Controls.AvatarGroup.OverflowStringFormat) property to customize how the count is formatted. The default is `"+{0}"`, where `{0}` is the placeholder for the current value of [OverflowedItemCount](xref:@ActiproUIRoot.Controls.AvatarGroup.OverflowedItemCount) (e.g., `"+9"`).

The [OverflowOrientation](xref:@ActiproUIRoot.Controls.AvatarGroup.OverflowOrientation) property determines if the overflowed avatars are arranged horizontally or vertically, and is configured separately from the [Orientation](xref:@ActiproUIRoot.Controls.AvatarGroup.Orientation) property. The default is `Horizontal`.

## Configuring Avatar Items

The [AvatarGroup](xref:@ActiproUIRoot.Controls.AvatarGroup) is an `ItemsControl` for [Avatar](avatar.md) controls.
Expand Down
1 change: 0 additions & 1 deletion Documentation/topics/supported-technologies.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ The assemblies have dependencies on the Avalonia framework as follows:

- Avalonia v11.1.0 or later
- Native themes compatible up to Avalonia v11.1.0
- *Minor updates to Avalonia are expected to be supported and will be verified as they are released*

</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion License.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 Actipro Software LLC.
Copyright (c) 2025 Actipro Software LLC.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions Samples/SampleBrowser/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Nullable>enable</Nullable>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

<Version>25.1.0.0</Version>
<InformationalVersion>25.1.0.0 - 20241106</InformationalVersion>
<Version>25.1.1.0</Version>
<InformationalVersion>25.1.1.0 - 20250116</InformationalVersion>

<Product>Actipro Avalonia Controls Sample Browser</Product>
<Title>$(Product)</Title>
Expand All @@ -17,7 +17,7 @@

<RootNamespace>ActiproSoftware</RootNamespace>
<Authors>Actipro Software LLC</Authors>
<Copyright>Copyright (c) 2022-2024 Actipro Software LLC. All rights reserved.</Copyright>
<Copyright>Copyright (c) 2022-2025 Actipro Software LLC. All rights reserved.</Copyright>

<DefineConstants>AVALONIA</DefineConstants>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>

<PropertyGroup>
<ActiproVersion>25.1.0</ActiproVersion>
<ActiproVersion>25.1.1</ActiproVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/SampleBrowser/References/Avalonia.References.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>

<PropertyGroup>
<AvaloniaVersion>11.2.0</AvaloniaVersion>
<AvaloniaVersion>11.2.3</AvaloniaVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<Border Margin="3" Background="{actipro:ThemeResource Container1BackgroundBrush}"
BorderThickness="1" BorderBrush="{actipro:ThemeResource Container3BorderBrush}">
<localCommon:NumberingPresenter LineBrush="{actipro:ThemeResource Container2BorderBrush}}" />
<localCommon:NumberingPresenter LineBrush="{actipro:ThemeResource Container2BorderBrush}" />
</Border>

</DataTemplate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="The Application Button (labeled &quot;File&quot; by default) is used to open a full screen backstage menu.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Application button" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/ribbon-features/application-button" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Basic usage"
Footer="Customize the Label and KeyTipText properties or optionally hide the button completely."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="A full screen Backstage is used in many modern applications to provide a richer experience for the user than is typically available from a traditional menu.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Backstage" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/ribbon-features/backstage" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Basic usage"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="The BarMenuGallery control can be configured to provide an advanced color picker similar to those in popular office applications.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Gallery control" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/controls/gallery" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Color picker showcase"
Footer="See the individual samples below for details on how to build the color pickers highlighted by this sample."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@
<sampleBrowser:ControlExampleItemsControl
Header="BarComboBox is a control that can be used to provide combobox-like functionality. Its popup content is presented as a menu where the traditional combobox items are managed by a BarMenuGallery. Other editors are also supported.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Combobox" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/controls/combobox" />
<sampleBrowser:ControlExampleLinkItem Title="Using custom controls" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/controls/using-custom-controls" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Basic combobox usage"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="Contextual tabs are only visible when the application is in a specific state. One or more tabs can be associated with a contextual tab group, and the associated tabs will only be visible when that tab group is active.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Contextual tabs" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/ribbon-features/contextual-tabs" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Basic usage"
Footer="The Picture Tools group contains one tab, and the Table Tools group contains two tabs."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
<sampleBrowser:ControlExampleItemsControl
Header="Use the MenuOpening event to examine built-in menus and optionally customize the menu items.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Context menus" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/menu-features/context-menus" />
<sampleBrowser:ControlExampleLinkItem Title="Menu customization" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/menu-features/menu-customization" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Customize built-in menus"
Footer="Built-in menus like the Ribbon Options and QAT Customize buttons demonstrate customizing a menu."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
<sampleBrowser:ControlExampleItemsControl
Header="Easily create and/or change a popup menu before the menu is displayed.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Context menus" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/menu-features/context-menus" />
<sampleBrowser:ControlExampleLinkItem Title="Menu customization" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/menu-features/menu-customization" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Dynamic popup menus"
Footer="The menus displayed in this sample are dynamically generated in the code-behind."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="A built-in footer is available for displaying additional content below the Ribbon.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Footer" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/ribbon-features/footer" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExampleItemsControl.RelatedSamples>
<sampleBrowser:ControlExampleLinkItem Title="Info bar" Url="/ProductSamples/FundamentalsSamples/Controls/InfoBarIntro/MainControl" />
</sampleBrowser:ControlExampleItemsControl.RelatedSamples>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="A ribbon gallery can support multiple rows of items and will adjust the number of visible columns based on the variant size and available width. When expanded, items are displayed using a menu gallery.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Gallery control" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/controls/gallery" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Basic usage"
Footer="In the Classic ribbon layout, medium and large variant sizes are available. The Simplified layout will always show a small variant size."
Expand Down Expand Up @@ -204,7 +208,7 @@
Command="{Binding SetColorCommand}"
ItemSpacing="{Binding Options.ItemSpacing}"
ItemsSource="{Binding ColorItems}"
ItemTemplate="{Binding Options.ItemTemplate}"
ItemTemplate="{Binding #sampleRootControl.Options.ItemTemplate}"
LargeIcon="/Images/Icons/ColorPicker32.png"
SmallIcon="/Images/Icons/ColorPicker16.png"
MaxColumnCount="{Binding Options.MaxRibbonColumnCount}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
<sampleBrowser:ControlExampleItemsControl
Header="Actipro Ribbon supports two different layout modes: Classic and Simplified. The user can switch between layouts at run-time without any changes in configuration.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Ribbon layout modes and density" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/ribbon-features/layout-and-density" />
<sampleBrowser:ControlExampleLinkItem Title="Theme user interface density" Url="https://www.actiprosoftware.com/docs/controls/avalonia/themes/user-interface-density" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Layout modes"
Footer="Both ribbons in this sample use the same configuration. Try resizing the window and watch as each ribbon adjusts the layout to accomodate the available space."
Expand Down Expand Up @@ -91,7 +96,7 @@
IsEnabled="{Binding !#minimalRibbon.AreTabsVisible}"
Value=" AreTabsVisible=&quot;False&quot;" />
<sampleBrowser:CodeExampleSubstitution Key="GroupLabelModeAttribute"
IsEnabled="{Binding #minimalRibbon.GroupLabelMode}, Converter={StaticResource NotEqualToComparisonConverter}, ConverterParameter='Default'}"
IsEnabled="{Binding #minimalRibbon.GroupLabelMode, Converter={StaticResource NotEqualToComparisonConverter}, ConverterParameter='Default'}"
Value="{Binding #minimalRibbon.GroupLabelMode, StringFormat=' GroupLabelMode=&quot;{0}&quot;'}" />
</sampleBrowser:CodeExample.Substitutions>
</sampleBrowser:CodeExample>
Expand All @@ -110,7 +115,7 @@ var ribbon = new RibbonViewModel() {$(AreTabsVisibleSetter)$(GroupLabelModeSette
IsEnabled="{Binding !#minimalRibbon.AreTabsVisible}"
Value="&#xD;&#x9;AreTabsVisible = false," />
<sampleBrowser:CodeExampleSubstitution Key="GroupLabelModeSetter"
IsEnabled="{Binding #minimalRibbon.GroupLabelMode}, Converter={StaticResource NotEqualToComparisonConverter}, ConverterParameter='Default'}"
IsEnabled="{Binding #minimalRibbon.GroupLabelMode, Converter={StaticResource NotEqualToComparisonConverter}, ConverterParameter='Default'}"
Value="{Binding #minimalRibbon.GroupLabelMode, StringFormat='&#xD;&#x9;GroupLabelMode = RibbonGroupLabelMode.{0},'}" />
</sampleBrowser:CodeExample.Substitutions>
</sampleBrowser:CodeExample>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="Popup and context menus can be defined using MVVM or XAML and are capable of supporting a complex layout of items.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Context menus" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/menu-features/context-menus" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Popup menu"
Footer="Click the Popup Menu button to see various menu controls configured based on the available options.">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="The quick access toolbar provides access to the most commonly used commands in an application.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Quick access toolbar" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/ribbon-features/quick-access-toolbar" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Basic usage"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:actipro="http://schemas.actiprosoftware.com/avaloniaui"
xmlns:sampleBrowser="using:ActiproSoftware.SampleBrowser"
xmlns:documents="using:ActiproSoftware.UI.Avalonia.DocumentManagement"
xmlns:local="using:ActiproSoftware.ProductSamples.BarsSamples.QuickStarts.RecentDocuments"
>
<UserControl.Resources>
Expand All @@ -16,6 +15,10 @@
<sampleBrowser:ControlExampleItemsControl
Header="The RecentDocumentControl can be used to display a managed list of recent documents with support for pinning and grouping.">

<sampleBrowser:ControlExampleItemsControl.Documentation>
<sampleBrowser:ControlExampleLinkItem Title="Recent documents" Url="https://www.actiprosoftware.com/docs/controls/avalonia/bars/ribbon-features/recent-documents" />
</sampleBrowser:ControlExampleItemsControl.Documentation>

<sampleBrowser:ControlExample
Header="Basic usage"
DataContext="{Binding #basicUsage}"
Expand Down
Loading

0 comments on commit 694aa50

Please sign in to comment.