Skip to content

Commit

Permalink
Fixed many things
Browse files Browse the repository at this point in the history
  • Loading branch information
@teaP
teaP committed Aug 12, 2019
1 parent 4017872 commit 7545b1c
Show file tree
Hide file tree
Showing 19 changed files with 390 additions and 285 deletions.
43 changes: 2 additions & 41 deletions dev/Generated/TabView.properties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ CppWinRTActivatableClassWithDPFactory(TabView)

GlobalDependencyProperty TabViewProperties::s_AddButtonCommandProperty{ nullptr };
GlobalDependencyProperty TabViewProperties::s_AddButtonCommandParameterProperty{ nullptr };
GlobalDependencyProperty TabViewProperties::s_CanCloseTabsProperty{ nullptr };
GlobalDependencyProperty TabViewProperties::s_CanDragDropTabsProperty{ nullptr };
GlobalDependencyProperty TabViewProperties::s_IsAddButtonVisibleProperty{ nullptr };
GlobalDependencyProperty TabViewProperties::s_ItemsProperty{ nullptr };
Expand Down Expand Up @@ -62,17 +61,6 @@ void TabViewProperties::EnsureProperties()
ValueHelper<winrt::IInspectable>::BoxedDefaultValue(),
nullptr);
}
if (!s_CanCloseTabsProperty)
{
s_CanCloseTabsProperty =
InitializeDependencyProperty(
L"CanCloseTabs",
winrt::name_of<bool>(),
winrt::name_of<winrt::TabView>(),
false /* isAttached */,
ValueHelper<bool>::BoxValueIfNecessary(true),
nullptr);
}
if (!s_CanDragDropTabsProperty)
{
s_CanDragDropTabsProperty =
Expand Down Expand Up @@ -104,7 +92,7 @@ void TabViewProperties::EnsureProperties()
winrt::name_of<winrt::TabView>(),
false /* isAttached */,
ValueHelper<winrt::IVector<winrt::IInspectable>>::BoxedDefaultValue(),
winrt::PropertyChangedCallback(&OnItemsPropertyChanged));
nullptr);
}
if (!s_ItemsSourceProperty)
{
Expand All @@ -115,7 +103,7 @@ void TabViewProperties::EnsureProperties()
winrt::name_of<winrt::TabView>(),
false /* isAttached */,
ValueHelper<winrt::IInspectable>::BoxedDefaultValue(),
winrt::PropertyChangedCallback(&OnItemsSourcePropertyChanged));
nullptr);
}
if (!s_ItemTemplateProperty)
{
Expand Down Expand Up @@ -222,7 +210,6 @@ void TabViewProperties::ClearProperties()
{
s_AddButtonCommandProperty = nullptr;
s_AddButtonCommandParameterProperty = nullptr;
s_CanCloseTabsProperty = nullptr;
s_CanDragDropTabsProperty = nullptr;
s_IsAddButtonVisibleProperty = nullptr;
s_ItemsProperty = nullptr;
Expand All @@ -238,22 +225,6 @@ void TabViewProperties::ClearProperties()
s_TabWidthModeProperty = nullptr;
}

void TabViewProperties::OnItemsPropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args)
{
auto owner = sender.as<winrt::TabView>();
winrt::get_self<TabView>(owner)->OnItemsPropertyChanged(args);
}

void TabViewProperties::OnItemsSourcePropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args)
{
auto owner = sender.as<winrt::TabView>();
winrt::get_self<TabView>(owner)->OnItemsSourcePropertyChanged(args);
}

void TabViewProperties::OnSelectedIndexPropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args)
Expand Down Expand Up @@ -298,16 +269,6 @@ winrt::IInspectable TabViewProperties::AddButtonCommandParameter()
return ValueHelper<winrt::IInspectable>::CastOrUnbox(static_cast<TabView*>(this)->GetValue(s_AddButtonCommandParameterProperty));
}

void TabViewProperties::CanCloseTabs(bool value)
{
static_cast<TabView*>(this)->SetValue(s_CanCloseTabsProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
}

bool TabViewProperties::CanCloseTabs()
{
return ValueHelper<bool>::CastOrUnbox(static_cast<TabView*>(this)->GetValue(s_CanCloseTabsProperty));
}

void TabViewProperties::CanDragDropTabs(bool value)
{
static_cast<TabView*>(this)->SetValue(s_CanDragDropTabsProperty, ValueHelper<bool>::BoxValueIfNecessary(value));
Expand Down
13 changes: 0 additions & 13 deletions dev/Generated/TabView.properties.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ class TabViewProperties
void AddButtonCommandParameter(winrt::IInspectable const& value);
winrt::IInspectable AddButtonCommandParameter();

void CanCloseTabs(bool value);
bool CanCloseTabs();

void CanDragDropTabs(bool value);
bool CanDragDropTabs();

Expand Down Expand Up @@ -59,7 +56,6 @@ class TabViewProperties

static winrt::DependencyProperty AddButtonCommandProperty() { return s_AddButtonCommandProperty; }
static winrt::DependencyProperty AddButtonCommandParameterProperty() { return s_AddButtonCommandParameterProperty; }
static winrt::DependencyProperty CanCloseTabsProperty() { return s_CanCloseTabsProperty; }
static winrt::DependencyProperty CanDragDropTabsProperty() { return s_CanDragDropTabsProperty; }
static winrt::DependencyProperty IsAddButtonVisibleProperty() { return s_IsAddButtonVisibleProperty; }
static winrt::DependencyProperty ItemsProperty() { return s_ItemsProperty; }
Expand All @@ -76,7 +72,6 @@ class TabViewProperties

static GlobalDependencyProperty s_AddButtonCommandProperty;
static GlobalDependencyProperty s_AddButtonCommandParameterProperty;
static GlobalDependencyProperty s_CanCloseTabsProperty;
static GlobalDependencyProperty s_CanDragDropTabsProperty;
static GlobalDependencyProperty s_IsAddButtonVisibleProperty;
static GlobalDependencyProperty s_ItemsProperty;
Expand Down Expand Up @@ -120,14 +115,6 @@ class TabViewProperties
static void EnsureProperties();
static void ClearProperties();

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

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

static void OnSelectedIndexPropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args);
Expand Down
55 changes: 43 additions & 12 deletions dev/Generated/TabViewItem.properties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ CppWinRTActivatableClassWithDPFactory(TabViewItem)

GlobalDependencyProperty TabViewItemProperties::s_HeaderProperty{ nullptr };
GlobalDependencyProperty TabViewItemProperties::s_HeaderTemplateProperty{ nullptr };
GlobalDependencyProperty TabViewItemProperties::s_IconProperty{ nullptr };
GlobalDependencyProperty TabViewItemProperties::s_IconSourceProperty{ nullptr };
GlobalDependencyProperty TabViewItemProperties::s_IsCloseableProperty{ nullptr };
GlobalDependencyProperty TabViewItemProperties::s_TabViewTemplateSettingsProperty{ nullptr };

TabViewItemProperties::TabViewItemProperties()
: m_tabClosingEventSource{static_cast<TabViewItem*>(this)}
Expand Down Expand Up @@ -43,16 +44,16 @@ void TabViewItemProperties::EnsureProperties()
ValueHelper<winrt::DataTemplate>::BoxedDefaultValue(),
nullptr);
}
if (!s_IconProperty)
if (!s_IconSourceProperty)
{
s_IconProperty =
s_IconSourceProperty =
InitializeDependencyProperty(
L"Icon",
winrt::name_of<winrt::IconElement>(),
L"IconSource",
winrt::name_of<winrt::IconSource>(),
winrt::name_of<winrt::TabViewItem>(),
false /* isAttached */,
ValueHelper<winrt::IconElement>::BoxedDefaultValue(),
nullptr);
ValueHelper<winrt::IconSource>::BoxedDefaultValue(),
winrt::PropertyChangedCallback(&OnIconSourcePropertyChanged));
}
if (!s_IsCloseableProperty)
{
Expand All @@ -65,14 +66,26 @@ void TabViewItemProperties::EnsureProperties()
ValueHelper<bool>::BoxValueIfNecessary(true),
winrt::PropertyChangedCallback(&OnIsCloseablePropertyChanged));
}
if (!s_TabViewTemplateSettingsProperty)
{
s_TabViewTemplateSettingsProperty =
InitializeDependencyProperty(
L"TabViewTemplateSettings",
winrt::name_of<winrt::TabViewItemTemplateSettings>(),
winrt::name_of<winrt::TabViewItem>(),
false /* isAttached */,
ValueHelper<winrt::TabViewItemTemplateSettings>::BoxedDefaultValue(),
nullptr);
}
}

void TabViewItemProperties::ClearProperties()
{
s_HeaderProperty = nullptr;
s_HeaderTemplateProperty = nullptr;
s_IconProperty = nullptr;
s_IconSourceProperty = nullptr;
s_IsCloseableProperty = nullptr;
s_TabViewTemplateSettingsProperty = nullptr;
}

void TabViewItemProperties::OnHeaderPropertyChanged(
Expand All @@ -83,6 +96,14 @@ void TabViewItemProperties::OnHeaderPropertyChanged(
winrt::get_self<TabViewItem>(owner)->OnHeaderPropertyChanged(args);
}

void TabViewItemProperties::OnIconSourcePropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args)
{
auto owner = sender.as<winrt::TabViewItem>();
winrt::get_self<TabViewItem>(owner)->OnIconSourcePropertyChanged(args);
}

void TabViewItemProperties::OnIsCloseablePropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args)
Expand Down Expand Up @@ -111,14 +132,14 @@ winrt::DataTemplate TabViewItemProperties::HeaderTemplate()
return ValueHelper<winrt::DataTemplate>::CastOrUnbox(static_cast<TabViewItem*>(this)->GetValue(s_HeaderTemplateProperty));
}

void TabViewItemProperties::Icon(winrt::IconElement const& value)
void TabViewItemProperties::IconSource(winrt::IconSource const& value)
{
static_cast<TabViewItem*>(this)->SetValue(s_IconProperty, ValueHelper<winrt::IconElement>::BoxValueIfNecessary(value));
static_cast<TabViewItem*>(this)->SetValue(s_IconSourceProperty, ValueHelper<winrt::IconSource>::BoxValueIfNecessary(value));
}

winrt::IconElement TabViewItemProperties::Icon()
winrt::IconSource TabViewItemProperties::IconSource()
{
return ValueHelper<winrt::IconElement>::CastOrUnbox(static_cast<TabViewItem*>(this)->GetValue(s_IconProperty));
return ValueHelper<winrt::IconSource>::CastOrUnbox(static_cast<TabViewItem*>(this)->GetValue(s_IconSourceProperty));
}

void TabViewItemProperties::IsCloseable(bool value)
Expand All @@ -131,6 +152,16 @@ bool TabViewItemProperties::IsCloseable()
return ValueHelper<bool>::CastOrUnbox(static_cast<TabViewItem*>(this)->GetValue(s_IsCloseableProperty));
}

void TabViewItemProperties::TabViewTemplateSettings(winrt::TabViewItemTemplateSettings const& value)
{
static_cast<TabViewItem*>(this)->SetValue(s_TabViewTemplateSettingsProperty, ValueHelper<winrt::TabViewItemTemplateSettings>::BoxValueIfNecessary(value));
}

winrt::TabViewItemTemplateSettings TabViewItemProperties::TabViewTemplateSettings()
{
return ValueHelper<winrt::TabViewItemTemplateSettings>::CastOrUnbox(static_cast<TabViewItem*>(this)->GetValue(s_TabViewTemplateSettingsProperty));
}

winrt::event_token TabViewItemProperties::TabClosing(winrt::TypedEventHandler<winrt::TabViewItem, winrt::TabViewTabClosingEventArgs> const& value)
{
return m_tabClosingEventSource.add(value);
Expand Down
17 changes: 13 additions & 4 deletions dev/Generated/TabViewItem.properties.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,26 @@ class TabViewItemProperties
void HeaderTemplate(winrt::DataTemplate const& value);
winrt::DataTemplate HeaderTemplate();

void Icon(winrt::IconElement const& value);
winrt::IconElement Icon();
void IconSource(winrt::IconSource const& value);
winrt::IconSource IconSource();

void IsCloseable(bool value);
bool IsCloseable();

void TabViewTemplateSettings(winrt::TabViewItemTemplateSettings const& value);
winrt::TabViewItemTemplateSettings TabViewTemplateSettings();

static winrt::DependencyProperty HeaderProperty() { return s_HeaderProperty; }
static winrt::DependencyProperty HeaderTemplateProperty() { return s_HeaderTemplateProperty; }
static winrt::DependencyProperty IconProperty() { return s_IconProperty; }
static winrt::DependencyProperty IconSourceProperty() { return s_IconSourceProperty; }
static winrt::DependencyProperty IsCloseableProperty() { return s_IsCloseableProperty; }
static winrt::DependencyProperty TabViewTemplateSettingsProperty() { return s_TabViewTemplateSettingsProperty; }

static GlobalDependencyProperty s_HeaderProperty;
static GlobalDependencyProperty s_HeaderTemplateProperty;
static GlobalDependencyProperty s_IconProperty;
static GlobalDependencyProperty s_IconSourceProperty;
static GlobalDependencyProperty s_IsCloseableProperty;
static GlobalDependencyProperty s_TabViewTemplateSettingsProperty;

winrt::event_token TabClosing(winrt::TypedEventHandler<winrt::TabViewItem, winrt::TabViewTabClosingEventArgs> const& value);
void TabClosing(winrt::event_token const& token);
Expand All @@ -43,6 +48,10 @@ class TabViewItemProperties
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args);

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

static void OnIsCloseablePropertyChanged(
winrt::DependencyObject const& sender,
winrt::DependencyPropertyChangedEventArgs const& args);
Expand Down
46 changes: 46 additions & 0 deletions dev/Generated/TabViewItemTemplateSettings.properties.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// 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 "TabViewItemTemplateSettings.h"

CppWinRTActivatableClassWithDPFactory(TabViewItemTemplateSettings)

GlobalDependencyProperty TabViewItemTemplateSettingsProperties::s_IconElementProperty{ nullptr };

TabViewItemTemplateSettingsProperties::TabViewItemTemplateSettingsProperties()
{
EnsureProperties();
}

void TabViewItemTemplateSettingsProperties::EnsureProperties()
{
if (!s_IconElementProperty)
{
s_IconElementProperty =
InitializeDependencyProperty(
L"IconElement",
winrt::name_of<winrt::IconElement>(),
winrt::name_of<winrt::TabViewItemTemplateSettings>(),
false /* isAttached */,
ValueHelper<winrt::IconElement>::BoxedDefaultValue(),
nullptr);
}
}

void TabViewItemTemplateSettingsProperties::ClearProperties()
{
s_IconElementProperty = nullptr;
}

void TabViewItemTemplateSettingsProperties::IconElement(winrt::IconElement const& value)
{
static_cast<TabViewItemTemplateSettings*>(this)->SetValue(s_IconElementProperty, ValueHelper<winrt::IconElement>::BoxValueIfNecessary(value));
}

winrt::IconElement TabViewItemTemplateSettingsProperties::IconElement()
{
return ValueHelper<winrt::IconElement>::CastOrUnbox(static_cast<TabViewItemTemplateSettings*>(this)->GetValue(s_IconElementProperty));
}
21 changes: 21 additions & 0 deletions dev/Generated/TabViewItemTemplateSettings.properties.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// 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
#pragma once

class TabViewItemTemplateSettingsProperties
{
public:
TabViewItemTemplateSettingsProperties();

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

static winrt::DependencyProperty IconElementProperty() { return s_IconElementProperty; }

static GlobalDependencyProperty s_IconElementProperty;

static void EnsureProperties();
static void ClearProperties();
};
Loading

0 comments on commit 7545b1c

Please sign in to comment.