Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move NavigationView to Repeater #1683

Merged
merged 33 commits into from
Jan 13, 2020
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2b95dc9
replaced listview with repeater
ojhad Nov 27, 2019
f08db1a
removed NavigationViewList from DisableAnimationsStyles
ojhad Nov 27, 2019
196b57d
fixed release build error
ojhad Nov 27, 2019
780b31c
addressed some comments
ojhad Dec 5, 2019
57ae99f
addressed some more comments
ojhad Dec 6, 2019
5d797bc
items repeater update
ojhad Dec 6, 2019
76d81da
addressed more comments
ojhad Dec 10, 2019
0ff390f
removed state machine
ojhad Dec 10, 2019
72efcd2
Merge branch 'master' into user/ojhad/navviewmovetorepeater
ojhad Dec 10, 2019
305d0db
addressed more comments
ojhad Dec 11, 2019
7db846b
fixed settings
ojhad Dec 11, 2019
56c14ac
Merge branch 'master' into user/ojhad/navviewmovetorepeater
ojhad Dec 11, 2019
4e036b3
fixed SelectionChanged raised due to initialization order
ojhad Dec 12, 2019
f3c088b
Merge branch 'master' into user/ojhad/navviewmovetorepeater
ojhad Dec 12, 2019
5dd1a90
fixed merge
ojhad Dec 12, 2019
be6ea93
added datacontext use case page and test
ojhad Dec 12, 2019
44d8b48
addressed comments
ojhad Dec 13, 2019
3ac290b
addressed more comments
ojhad Dec 17, 2019
7a4da56
Merge branch 'master' into user/ojhad/navviewmovetorepeater
ojhad Dec 17, 2019
f1d18a1
re-added downlevel testpages
ojhad Dec 18, 2019
dec9b86
updated focus navigation behavior
ojhad Dec 19, 2019
6d6f712
fixed pane content width bug
ojhad Dec 19, 2019
328a294
Merge branch 'master' into user/ojhad/navviewmovetorepeater
ojhad Dec 19, 2019
0bc06fe
updated/fixed tests
ojhad Dec 19, 2019
b9d33f5
updated masters
ojhad Dec 19, 2019
f03a2c6
fixed/updated tests
ojhad Dec 20, 2019
48538de
addressed comments
ojhad Dec 21, 2019
e9a0014
reverted downlevel flag behavior
ojhad Jan 6, 2020
2d8e06c
added repeater API test, fixed pre-rs5 header visibility test
ojhad Jan 6, 2020
59a7183
updated masters
ojhad Jan 7, 2020
c1fb5b2
moved preview API call, reset masters
ojhad Jan 8, 2020
fe64a75
address comment
ojhad Jan 10, 2020
7cda0e0
updated visual verification test
ojhad Jan 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions dev/Generated/NavigationViewAutomationPeer.properties.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See LICENSE in the project root for license information.

// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen
#include "pch.h"
#include "common.h"
#include "NavigationViewAutomationPeer.h"

namespace winrt::Microsoft::UI::Xaml::Automation::Peers
{
CppWinRTActivatableClassWithBasicFactory(NavigationViewAutomationPeer)
}

#include "NavigationViewAutomationPeer.g.cpp"


31 changes: 31 additions & 0 deletions dev/Generated/StackLayout.properties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls

#include "StackLayout.g.cpp"

GlobalDependencyProperty StackLayoutProperties::s_DisableVirtualizationProperty{ nullptr };
GlobalDependencyProperty StackLayoutProperties::s_OrientationProperty{ nullptr };
GlobalDependencyProperty StackLayoutProperties::s_SpacingProperty{ nullptr };

Expand All @@ -23,6 +24,17 @@ StackLayoutProperties::StackLayoutProperties()

void StackLayoutProperties::EnsureProperties()
{
if (!s_DisableVirtualizationProperty)
{
s_DisableVirtualizationProperty =
InitializeDependencyProperty(
L"DisableVirtualization",
winrt::name_of<bool>(),
winrt::name_of<winrt::StackLayout>(),
false /* isAttached */,
ValueHelper<bool>::BoxedDefaultValue(),
winrt::PropertyChangedCallback(&OnDisableVirtualizationPropertyChanged));
}
if (!s_OrientationProperty)
{
s_OrientationProperty =
Expand All @@ -49,10 +61,19 @@ void StackLayoutProperties::EnsureProperties()

void StackLayoutProperties::ClearProperties()
{
s_DisableVirtualizationProperty = nullptr;
s_OrientationProperty = nullptr;
s_SpacingProperty = nullptr;
}

void StackLayoutProperties::OnDisableVirtualizationPropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args)
{
auto owner = sender.as<winrt::StackLayout>();
winrt::get_self<StackLayout>(owner)->OnPropertyChanged(args);
}

void StackLayoutProperties::OnOrientationPropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args)
Expand All @@ -69,6 +90,16 @@ void StackLayoutProperties::OnSpacingPropertyChanged(
winrt::get_self<StackLayout>(owner)->OnPropertyChanged(args);
}

void StackLayoutProperties::DisableVirtualization(bool value)
{
static_cast<StackLayout*>(this)->SetValue(s_DisableVirtualizationProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
}

bool StackLayoutProperties::DisableVirtualization()
{
return ValueHelper<bool>::CastOrUnbox(static_cast<StackLayout*>(this)->GetValue(s_DisableVirtualizationProperty));
}

void StackLayoutProperties::Orientation(winrt::Orientation const& value)
{
static_cast<StackLayout*>(this)->SetValue(s_OrientationProperty, ValueHelper<winrt::Orientation>::BoxValueIfNecessary(value));
Expand Down
9 changes: 9 additions & 0 deletions dev/Generated/StackLayout.properties.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,30 @@ class StackLayoutProperties
public:
StackLayoutProperties();

void DisableVirtualization(bool value);
bool DisableVirtualization();

void Orientation(winrt::Orientation const& value);
winrt::Orientation Orientation();

void Spacing(double value);
double Spacing();

static winrt::DependencyProperty DisableVirtualizationProperty() { return s_DisableVirtualizationProperty; }
static winrt::DependencyProperty OrientationProperty() { return s_OrientationProperty; }
static winrt::DependencyProperty SpacingProperty() { return s_SpacingProperty; }

static GlobalDependencyProperty s_DisableVirtualizationProperty;
static GlobalDependencyProperty s_OrientationProperty;
static GlobalDependencyProperty s_SpacingProperty;

static void EnsureProperties();
static void ClearProperties();

static void OnDisableVirtualizationPropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args);

static void OnOrientationPropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args);
Expand Down
Loading