fix merge issue
This commit is contained in:
Родитель
ce61476e22
Коммит
1ecf6f97e7
|
@ -969,10 +969,9 @@
|
|||
</Page>
|
||||
<Content Include="SamplePages\TabbedCommandBar\TabbedCommandBar.bind">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</Content>
|
||||
<Content Include="SamplePages\MetadataControl\MetadataControlCode.bind">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Content>
|
||||
<Page Include="SamplePages\MetadataControl\MetadataControlPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using Microsoft.Toolkit.Uwp.SampleApp.Common;
|
||||
using Microsoft.Toolkit.Uwp.UI;
|
||||
using Microsoft.Toolkit.Uwp.UI.Controls;
|
||||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using Microsoft.Toolkit.Uwp.SampleApp.Common;
|
||||
using Microsoft.Toolkit.Uwp.UI.Controls;
|
||||
using Microsoft.Toolkit.Uwp.UI.Extensions;
|
||||
using Windows.UI.Xaml;
|
||||
using Windows.UI.Xaml.Controls;
|
||||
|
||||
|
@ -35,7 +35,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
|
|||
|
||||
public void OnXamlRendered(FrameworkElement control)
|
||||
{
|
||||
_metadataControl = control.FindChildByName("metadataControl") as MetadataControl;
|
||||
_metadataControl = control.FindChild("metadataControl") as MetadataControl;
|
||||
if (_metadataControl != null)
|
||||
{
|
||||
_metadataControl.Items = _units;
|
||||
|
|
Загрузка…
Ссылка в новой задаче