Browse Source
Merge branch 'master' into feature/use-inter-font-for-fluent-theme
pull/4791/head
danwalmsley
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
6 additions and
14 deletions
-
samples/ControlCatalog/App.xaml.cs
-
samples/ControlCatalog/MainView.xaml
-
samples/ControlCatalog/MainView.xaml.cs
-
src/Avalonia.Base/AvaloniaObject.cs
|
|
|
@ -81,7 +81,7 @@ namespace ControlCatalog |
|
|
|
|
|
|
|
public override void Initialize() |
|
|
|
{ |
|
|
|
Styles.Insert(0, FluentDark); |
|
|
|
Styles.Insert(0, FluentLight); |
|
|
|
|
|
|
|
AvaloniaXamlLoader.Load(this); |
|
|
|
} |
|
|
|
|
|
|
|
@ -77,8 +77,8 @@ |
|
|
|
<ComboBoxItem>Full Decorations</ComboBoxItem> |
|
|
|
</ComboBox> |
|
|
|
<ComboBox x:Name="Themes" SelectedIndex="0"> |
|
|
|
<ComboBoxItem>Fluent - Dark</ComboBoxItem> |
|
|
|
<ComboBoxItem>Fluent - Light</ComboBoxItem> |
|
|
|
<ComboBoxItem>Fluent - Dark</ComboBoxItem> |
|
|
|
<ComboBoxItem>Simple - Light</ComboBoxItem> |
|
|
|
<ComboBoxItem>Simple - Dark</ComboBoxItem> |
|
|
|
</ComboBox> |
|
|
|
|
|
|
|
@ -38,10 +38,10 @@ namespace ControlCatalog |
|
|
|
switch (themes.SelectedIndex) |
|
|
|
{ |
|
|
|
case 0: |
|
|
|
Application.Current.Styles[0] = App.FluentDark; |
|
|
|
Application.Current.Styles[0] = App.FluentLight; |
|
|
|
break; |
|
|
|
case 1: |
|
|
|
Application.Current.Styles[0] = App.FluentLight; |
|
|
|
Application.Current.Styles[0] = App.FluentDark; |
|
|
|
break; |
|
|
|
case 2: |
|
|
|
Application.Current.Styles[0] = App.DefaultLight; |
|
|
|
|
|
|
|
@ -113,16 +113,8 @@ namespace Avalonia |
|
|
|
/// <param name="binding">The binding information.</param>
|
|
|
|
public IBinding this[IndexerDescriptor binding] |
|
|
|
{ |
|
|
|
get |
|
|
|
{ |
|
|
|
return new IndexerBinding(this, binding.Property, binding.Mode); |
|
|
|
} |
|
|
|
|
|
|
|
set |
|
|
|
{ |
|
|
|
var sourceBinding = value as IBinding; |
|
|
|
this.Bind(binding.Property, sourceBinding); |
|
|
|
} |
|
|
|
get { return new IndexerBinding(this, binding.Property, binding.Mode); } |
|
|
|
set { this.Bind(binding.Property, value); } |
|
|
|
} |
|
|
|
|
|
|
|
public bool CheckAccess() => Dispatcher.UIThread.CheckAccess(); |
|
|
|
|