This commit is contained in:
James Clancey 2021-04-16 13:31:45 -08:00
Родитель b6977295c7
Коммит 943d06cf56
3 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -1,5 +1,5 @@
<Project> <Project>
<Import Project="External\Maui\eng\Version.props" /> <Import Project="External\Maui\eng\Versions.props" />
<PropertyGroup> <PropertyGroup>
<BuildForWinUI Condition="'$(SolutionFileName)' == 'Comet.WinUI.sln'">true</BuildForWinUI> <BuildForWinUI Condition="'$(SolutionFileName)' == 'Comet.WinUI.sln'">true</BuildForWinUI>
<BuildForNet6 Condition="'$(SolutionFileName)' == 'Comet-net6.sln' or '$(BuildForWinUI)' == 'true'">true</BuildForNet6> <BuildForNet6 Condition="'$(SolutionFileName)' == 'Comet-net6.sln' or '$(BuildForWinUI)' == 'true'">true</BuildForNet6>

2
External/Maui поставляемый

@ -1 +1 @@
Subproject commit e1f816ce4d0a30ab0a066c2b641989f0f22ce663 Subproject commit 2a2362f324a3739d2fc3036635f12144780718b4

Просмотреть файл

@ -11,7 +11,7 @@ namespace Comet
{ {
[nameof(Color)] = nameof(ISwitch.TrackColor), [nameof(Color)] = nameof(ISwitch.TrackColor),
[nameof(EnvironmentKeys.Slider.ThumbColor)] = nameof(ISwitch.ThumbColor), [nameof(EnvironmentKeys.Slider.ThumbColor)] = nameof(ISwitch.ThumbColor),
[nameof(IsOn)] = nameof(ISwitch.IsToggled), [nameof(IsOn)] = nameof(ISwitch.IsOn),
}; };
public Toggle( public Toggle(
@ -30,7 +30,7 @@ namespace Comet
} }
public Action<bool> IsOnChanged { get; private set; } public Action<bool> IsOnChanged { get; private set; }
bool ISwitch.IsToggled { get => IsOn; set => IsOnChanged.Invoke(value); } bool ISwitch.IsOn { get => IsOn; set => IsOnChanged.Invoke(value); }
Color ISwitch.TrackColor => this.GetColor(); Color ISwitch.TrackColor => this.GetColor();