Browse Source
Merge branch 'master' into MorePopupFocusFixes
pull/4809/head
amwx
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
16 deletions
-
src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
-
src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml
|
|
|
@ -848,21 +848,6 @@ namespace Avalonia.Controls.Primitives |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Sets an item container's 'selected' class or <see cref="ISelectable.IsSelected"/>.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="index">The index of the item.</param>
|
|
|
|
/// <param name="selected">Whether the item should be selected or deselected.</param>
|
|
|
|
private void MarkItemSelected(int index, bool selected) |
|
|
|
{ |
|
|
|
var container = ItemContainerGenerator?.ContainerFromIndex(index); |
|
|
|
|
|
|
|
if (container != null) |
|
|
|
{ |
|
|
|
MarkContainerSelected(container, selected); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void UpdateContainerSelection() |
|
|
|
{ |
|
|
|
if (Presenter?.Panel is IPanel panel) |
|
|
|
|
|
|
|
@ -439,7 +439,7 @@ |
|
|
|
<StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" /> |
|
|
|
|
|
|
|
<!--Resources for NotificationCard.xaml --> |
|
|
|
<SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" Opacity="0.75"/> |
|
|
|
<SolidColorBrush x:Key="NotificationCardBackgroundBrush" Color="#444444" /> |
|
|
|
<SolidColorBrush x:Key="NotificationCardProgressBackgroundBrush" Color="#9A9A9A" /> |
|
|
|
<SolidColorBrush x:Key="NotificationCardInformationBackgroundBrush" Color="#007ACC" Opacity="0.75"/> |
|
|
|
<SolidColorBrush x:Key="NotificationCardSuccessBackgroundBrush" Color="#1F9E45" Opacity="0.75"/> |
|
|
|
|
