Skip to content

Commit d56bd9b

Browse files
stefansjfwstefansjfw
committed
Test TreeView
1 parent 1a11233 commit d56bd9b

6 files changed

Lines changed: 23 additions & 14 deletions

File tree

‎Samples/Native/MyApp/MainUserControl.cpp‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "pch.h"
22
#include "MainUserControl.h"
3+
#include <TreeViewNodeViewModel.h>
34

45
using namespace winrt;
56
using namespace Windows::UI::Xaml;
@@ -10,15 +11,21 @@ namespace winrt::MyApp::implementation
1011
{
1112

1213
InitializeComponent();
14+
for (int i = 0; i < 800; i++) {
15+
auto child = winrt::make<MyApp::implementation::TreeViewNodeViewModel>(L"Label", winrt::Windows::Foundation::Uri{ nullptr }, L"");
16+
17+
treeView().Nodes().Append(child);
18+
}
1319
}
1420

1521
winrt::hstring MainUserControl::MyProperty()
1622
{
17-
return userControl().MyProperty();
23+
return hstring{};
24+
// return userControl().MyProperty();
1825
}
1926

2027
void MainUserControl::MyProperty(winrt::hstring value)
2128
{
22-
userControl().MyProperty(value);
29+
// userControl().MyProperty(value);
2330
}
2431
}

‎Samples/Native/MyApp/MainUserControl.xaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
XYFocusKeyboardNavigation="Enabled"
1111
mc:Ignorable="d">
1212

13-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" XYFocusKeyboardNavigation="Enabled">
14-
<my:MyUserControl MyProperty="Hello from Xaml!" XYFocusKeyboardNavigation="Enabled" x:Name="userControl"/>
15-
<muxc:ColorPicker XYFocusKeyboardNavigation="Enabled" />
16-
<muxc:NavigationView PaneTitle="Welcome">
17-
<TextBlock Text="Win UI Navigation" VerticalAlignment="Center" HorizontalAlignment="Center" Style="{StaticResource TitleTextBlockStyle}"/>
18-
</muxc:NavigationView>
13+
<StackPanel>
14+
<Grid>
15+
<local:TreeViewHostUserControl x:Name="treeView"></local:TreeViewHostUserControl>
16+
</Grid>
1917
</StackPanel>
2018
</UserControl>

‎Samples/Native/MyApp/MyApp.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,21 +343,21 @@
343343
</ItemGroup>
344344
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
345345
<ImportGroup Label="ExtensionTargets">
346-
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.3.191125001-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.3.191125001-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
347346
<Import Project="..\..\..\packages\SceneLoaderComponent.1.0.0.1\build\native\SceneLoaderComponent.targets" Condition="'$(Platform)'=='x64' and Exists('..\..\..\packages\SceneLoaderComponent.1.0.0.1\build\native\SceneLoaderComponent.targets')" />
348347
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
349348
<Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.191111.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.191111.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
349+
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210816001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210816001\build\native\Microsoft.UI.Xaml.targets')" />
350350
</ImportGroup>
351351
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
352352
<PropertyGroup>
353353
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
354354
</PropertyGroup>
355-
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.3.191125001-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.3.191125001-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
356355
<Error Condition="!Exists('..\..\..\packages\SceneLoaderComponent.1.0.0.1\build\native\SceneLoaderComponent.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SceneLoaderComponent.1.0.0.1\build\native\SceneLoaderComponent.props'))" />
357356
<Error Condition="!Exists('..\..\..\packages\SceneLoaderComponent.1.0.0.1\build\native\SceneLoaderComponent.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SceneLoaderComponent.1.0.0.1\build\native\SceneLoaderComponent.targets'))" />
358357
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props'))" />
359358
<Error Condition="!Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.2\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
360359
<Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.191111.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.191111.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
361360
<Error Condition="!Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.191111.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.191111.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
361+
<Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210816001\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210816001\build\native\Microsoft.UI.Xaml.targets'))" />
362362
</Target>
363-
</Project>
363+
</Project>

‎Samples/Native/MyApp/MyApp.vcxproj.filters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@
5858
<Midl Include="TreeViewNodeViewModel.idl" />
5959
<Midl Include="FilePathToBitmapImageConverter.idl" />
6060
</ItemGroup>
61-
</Project>
61+
</Project>

‎Samples/Native/MyApp/TreeViewHostUserControl.xaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
<ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
1212
</UserControl.Resources>
1313
<Grid>
14-
<muxc:TreeView ItemInvoked="TreeView_ItemInvoked" ItemsSource="{x:Bind Nodes}" ScrollViewer.HorizontalScrollMode="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto">
14+
<Grid.ColumnDefinitions>
15+
<ColumnDefinition Width="30" />
16+
<ColumnDefinition Width="*" />
17+
</Grid.ColumnDefinitions>
18+
<muxc:TreeView Grid.Column="1" SelectionMode="Multiple" ItemInvoked="TreeView_ItemInvoked" ItemsSource="{x:Bind Nodes}" ScrollViewer.HorizontalScrollMode="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto">
1519
<muxc:TreeView.ItemTemplate>
1620
<DataTemplate x:DataType="local:TreeViewNodeViewModel">
1721
<muxc:TreeViewItem ItemsSource="{x:Bind Children}">

‎Samples/Native/MyApp/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.2" targetFramework="native" />
4-
<package id="Microsoft.UI.Xaml" version="2.3.191125001-prerelease" targetFramework="native" />
4+
<package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210816001" targetFramework="native" />
55
<package id="Microsoft.Windows.CppWinRT" version="2.0.191111.2" targetFramework="native" />
66
<package id="SceneLoaderComponent" version="1.0.0.1" targetFramework="native" />
77
</packages>

0 commit comments

Comments
 (0)