Skip to content

Commit 91ec90d

Browse files
HO-COOHHO-COOH
committed
Move WrapPanel, Triggers, DependentValue
1 parent 53e4064 commit 91ec90d

52 files changed

Lines changed: 398 additions & 1569 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

WinUI3Package/ControlSizeTrigger.cpp renamed to SharedComponent/ControlSizeTrigger.cpp

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,61 @@
44
#include "ControlSizeTrigger.g.cpp"
55
#endif
66

7-
namespace winrt::WinUI3Package::implementation
7+
namespace winrt::PackageRoot::implementation
88
{
99
void ControlSizeTrigger::EnsureDependencyProperties()
1010
{
1111
if (m_canTriggerProperty) return;
12-
m_canTriggerProperty = winrt::Microsoft::UI::Xaml::DependencyProperty::Register(
12+
m_canTriggerProperty = winrt::WinUINamespace::UI::Xaml::DependencyProperty::Register(
1313
L"CanTrigger",
1414
winrt::xaml_typename<bool>(),
15-
winrt::xaml_typename<WinUI3Package::ControlSizeTrigger>(),
16-
winrt::Microsoft::UI::Xaml::PropertyMetadata{
15+
winrt::xaml_typename<PackageRoot::ControlSizeTrigger>(),
16+
winrt::WinUINamespace::UI::Xaml::PropertyMetadata{
1717
winrt::box_value(true),
1818
&ControlSizeTrigger::valueChangeCallback
1919
}
2020
);
21-
m_maxWidthProperty = winrt::Microsoft::UI::Xaml::DependencyProperty::Register(
21+
m_maxWidthProperty = winrt::WinUINamespace::UI::Xaml::DependencyProperty::Register(
2222
L"MaxWidth",
2323
winrt::xaml_typename<double>(),
24-
winrt::xaml_typename<WinUI3Package::ControlSizeTrigger>(),
25-
winrt::Microsoft::UI::Xaml::PropertyMetadata{
24+
winrt::xaml_typename<PackageRoot::ControlSizeTrigger>(),
25+
winrt::WinUINamespace::UI::Xaml::PropertyMetadata{
2626
winrt::box_value(DBL_MAX),
2727
&ControlSizeTrigger::valueChangeCallback
2828
}
2929
);
30-
m_minWidthProperty = winrt::Microsoft::UI::Xaml::DependencyProperty::Register(
30+
m_minWidthProperty = winrt::WinUINamespace::UI::Xaml::DependencyProperty::Register(
3131
L"MinWidth",
3232
winrt::xaml_typename<double>(),
33-
winrt::xaml_typename<WinUI3Package::ControlSizeTrigger>(),
34-
winrt::Microsoft::UI::Xaml::PropertyMetadata{
33+
winrt::xaml_typename<PackageRoot::ControlSizeTrigger>(),
34+
winrt::WinUINamespace::UI::Xaml::PropertyMetadata{
3535
winrt::box_value(0.0),
3636
&ControlSizeTrigger::valueChangeCallback
3737
}
3838
);
39-
m_maxHeightProperty = winrt::Microsoft::UI::Xaml::DependencyProperty::Register(
39+
m_maxHeightProperty = winrt::WinUINamespace::UI::Xaml::DependencyProperty::Register(
4040
L"MaxHeight",
4141
winrt::xaml_typename<double>(),
42-
winrt::xaml_typename<WinUI3Package::ControlSizeTrigger>(),
43-
winrt::Microsoft::UI::Xaml::PropertyMetadata{
42+
winrt::xaml_typename<PackageRoot::ControlSizeTrigger>(),
43+
winrt::WinUINamespace::UI::Xaml::PropertyMetadata{
4444
winrt::box_value(DBL_MAX),
4545
&ControlSizeTrigger::valueChangeCallback
4646
}
4747
);
48-
m_minHeightProperty = winrt::Microsoft::UI::Xaml::DependencyProperty::Register(
48+
m_minHeightProperty = winrt::WinUINamespace::UI::Xaml::DependencyProperty::Register(
4949
L"MinHeight",
5050
winrt::xaml_typename<double>(),
51-
winrt::xaml_typename<WinUI3Package::ControlSizeTrigger>(),
52-
winrt::Microsoft::UI::Xaml::PropertyMetadata{
51+
winrt::xaml_typename<PackageRoot::ControlSizeTrigger>(),
52+
winrt::WinUINamespace::UI::Xaml::PropertyMetadata{
5353
winrt::box_value(0.0),
5454
&ControlSizeTrigger::valueChangeCallback
5555
}
5656
);
57-
m_targetElementProperty = winrt::Microsoft::UI::Xaml::DependencyProperty::Register(
57+
m_targetElementProperty = winrt::WinUINamespace::UI::Xaml::DependencyProperty::Register(
5858
L"TargetElement",
59-
winrt::xaml_typename<winrt::Microsoft::UI::Xaml::FrameworkElement>(),
60-
winrt::xaml_typename<WinUI3Package::ControlSizeTrigger>(),
61-
winrt::Microsoft::UI::Xaml::PropertyMetadata{
59+
winrt::xaml_typename<winrt::WinUINamespace::UI::Xaml::FrameworkElement>(),
60+
winrt::xaml_typename<PackageRoot::ControlSizeTrigger>(),
61+
winrt::WinUINamespace::UI::Xaml::PropertyMetadata{
6262
nullptr,
6363
&ControlSizeTrigger::onTargetElementPropertyChanged
6464
}
@@ -75,7 +75,7 @@ namespace winrt::WinUI3Package::implementation
7575
SetValue(m_canTriggerProperty, winrt::box_value(value));
7676
}
7777

78-
winrt::Microsoft::UI::Xaml::DependencyProperty ControlSizeTrigger::CanTriggerProperty()
78+
winrt::WinUINamespace::UI::Xaml::DependencyProperty ControlSizeTrigger::CanTriggerProperty()
7979
{
8080
return m_canTriggerProperty;
8181
}
@@ -90,7 +90,7 @@ namespace winrt::WinUI3Package::implementation
9090
SetValue(m_maxWidthProperty, winrt::box_value(value));
9191
}
9292

93-
winrt::Microsoft::UI::Xaml::DependencyProperty ControlSizeTrigger::MaxWidthProperty()
93+
winrt::WinUINamespace::UI::Xaml::DependencyProperty ControlSizeTrigger::MaxWidthProperty()
9494
{
9595
return m_maxWidthProperty;
9696
}
@@ -105,7 +105,7 @@ namespace winrt::WinUI3Package::implementation
105105
SetValue(m_minWidthProperty, winrt::box_value(value));
106106
}
107107

108-
winrt::Microsoft::UI::Xaml::DependencyProperty ControlSizeTrigger::MinWidthProperty()
108+
winrt::WinUINamespace::UI::Xaml::DependencyProperty ControlSizeTrigger::MinWidthProperty()
109109
{
110110
return m_minWidthProperty;
111111
}
@@ -120,7 +120,7 @@ namespace winrt::WinUI3Package::implementation
120120
SetValue(m_maxHeightProperty, winrt::box_value(value));
121121
}
122122

123-
winrt::Microsoft::UI::Xaml::DependencyProperty ControlSizeTrigger::MaxHeightProperty()
123+
winrt::WinUINamespace::UI::Xaml::DependencyProperty ControlSizeTrigger::MaxHeightProperty()
124124
{
125125
return m_maxHeightProperty;
126126
}
@@ -135,22 +135,22 @@ namespace winrt::WinUI3Package::implementation
135135
SetValue(m_minHeightProperty, winrt::box_value(value));
136136
}
137137

138-
winrt::Microsoft::UI::Xaml::DependencyProperty ControlSizeTrigger::MinHeightProperty()
138+
winrt::WinUINamespace::UI::Xaml::DependencyProperty ControlSizeTrigger::MinHeightProperty()
139139
{
140140
return m_minHeightProperty;
141141
}
142142

143-
winrt::Microsoft::UI::Xaml::FrameworkElement ControlSizeTrigger::TargetElement()
143+
winrt::WinUINamespace::UI::Xaml::FrameworkElement ControlSizeTrigger::TargetElement()
144144
{
145-
return GetValue(m_targetElementProperty).as<winrt::Microsoft::UI::Xaml::FrameworkElement>();
145+
return GetValue(m_targetElementProperty).as<winrt::WinUINamespace::UI::Xaml::FrameworkElement>();
146146
}
147147

148-
void ControlSizeTrigger::TargetElement(winrt::Microsoft::UI::Xaml::FrameworkElement value)
148+
void ControlSizeTrigger::TargetElement(winrt::WinUINamespace::UI::Xaml::FrameworkElement value)
149149
{
150150
SetValue(m_targetElementProperty, value);
151151
}
152152

153-
winrt::Microsoft::UI::Xaml::DependencyProperty ControlSizeTrigger::TargetElementProperty()
153+
winrt::WinUINamespace::UI::Xaml::DependencyProperty ControlSizeTrigger::TargetElementProperty()
154154
{
155155
return m_targetElementProperty;
156156
}
@@ -178,24 +178,24 @@ namespace winrt::WinUI3Package::implementation
178178
SetActive(active);
179179
}
180180
void ControlSizeTrigger::valueChangeCallback(
181-
winrt::Microsoft::UI::Xaml::DependencyObject d,
182-
winrt::Microsoft::UI::Xaml::DependencyPropertyChangedEventArgs const& e)
181+
winrt::WinUINamespace::UI::Xaml::DependencyObject d,
182+
winrt::WinUINamespace::UI::Xaml::DependencyPropertyChangedEventArgs const& e)
183183
{
184-
winrt::get_self<ControlSizeTrigger>(d.as<WinUI3Package::ControlSizeTrigger>())->updateTrigger();
184+
winrt::get_self<ControlSizeTrigger>(d.as<PackageRoot::ControlSizeTrigger>())->updateTrigger();
185185
}
186186

187187
void ControlSizeTrigger::onTargetElementPropertyChanged(
188-
winrt::Microsoft::UI::Xaml::DependencyObject d,
189-
winrt::Microsoft::UI::Xaml::DependencyPropertyChangedEventArgs e)
188+
winrt::WinUINamespace::UI::Xaml::DependencyObject d,
189+
winrt::WinUINamespace::UI::Xaml::DependencyPropertyChangedEventArgs e)
190190
{
191-
winrt::get_self<ControlSizeTrigger>(d.as<WinUI3Package::ControlSizeTrigger>())->updateTargetElement(
192-
e.OldValue().as<winrt::Microsoft::UI::Xaml::FrameworkElement>(),
193-
e.NewValue().as<winrt::Microsoft::UI::Xaml::FrameworkElement>()
191+
winrt::get_self<ControlSizeTrigger>(d.as<PackageRoot::ControlSizeTrigger>())->updateTargetElement(
192+
e.OldValue().as<winrt::WinUINamespace::UI::Xaml::FrameworkElement>(),
193+
e.NewValue().as<winrt::WinUINamespace::UI::Xaml::FrameworkElement>()
194194
);
195195
}
196196
void ControlSizeTrigger::updateTargetElement(
197-
winrt::Microsoft::UI::Xaml::FrameworkElement oldValue,
198-
winrt::Microsoft::UI::Xaml::FrameworkElement newValue)
197+
winrt::WinUINamespace::UI::Xaml::FrameworkElement oldValue,
198+
winrt::WinUINamespace::UI::Xaml::FrameworkElement newValue)
199199
{
200200
if (oldValue)
201201
oldValue.SizeChanged(m_onTargetElementSizeChanged);

‎SharedComponent/ControlSizeTrigger.h‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#pragma once
2+
3+
#include "ControlSizeTrigger.g.h"
4+
#include "include/EnsureDependencyProperty.hpp"
5+
6+
namespace winrt::PackageRoot::implementation
7+
{
8+
struct ControlSizeTrigger : ControlSizeTriggerT<ControlSizeTrigger>, EnsureDependencyProperty<ControlSizeTrigger>
9+
{
10+
static void EnsureDependencyProperties();
11+
ControlSizeTrigger() = default;
12+
13+
#pragma region Properties
14+
bool CanTrigger();
15+
void CanTrigger(bool value);
16+
static winrt::WinUINamespace::UI::Xaml::DependencyProperty CanTriggerProperty();
17+
18+
double MaxWidth();
19+
void MaxWidth(double value);
20+
static winrt::WinUINamespace::UI::Xaml::DependencyProperty MaxWidthProperty();
21+
22+
double MinWidth();
23+
void MinWidth(double value);
24+
static winrt::WinUINamespace::UI::Xaml::DependencyProperty MinWidthProperty();
25+
26+
double MaxHeight();
27+
void MaxHeight(double value);
28+
static winrt::WinUINamespace::UI::Xaml::DependencyProperty MaxHeightProperty();
29+
30+
double MinHeight();
31+
void MinHeight(double value);
32+
static winrt::WinUINamespace::UI::Xaml::DependencyProperty MinHeightProperty();
33+
34+
winrt::WinUINamespace::UI::Xaml::FrameworkElement TargetElement();
35+
void TargetElement(winrt::WinUINamespace::UI::Xaml::FrameworkElement value);
36+
static winrt::WinUINamespace::UI::Xaml::DependencyProperty TargetElementProperty();
37+
#pragma endregion
38+
39+
bool IsActive();
40+
private:
41+
static inline winrt::WinUINamespace::UI::Xaml::DependencyProperty m_canTriggerProperty = nullptr;
42+
static inline winrt::WinUINamespace::UI::Xaml::DependencyProperty m_maxWidthProperty = nullptr;
43+
static inline winrt::WinUINamespace::UI::Xaml::DependencyProperty m_minWidthProperty = nullptr;
44+
static inline winrt::WinUINamespace::UI::Xaml::DependencyProperty m_maxHeightProperty = nullptr;
45+
static inline winrt::WinUINamespace::UI::Xaml::DependencyProperty m_minHeightProperty = nullptr;
46+
static inline winrt::WinUINamespace::UI::Xaml::DependencyProperty m_targetElementProperty = nullptr;
47+
bool m_isActive{};
48+
void updateTrigger();
49+
winrt::event_token m_onTargetElementSizeChanged;
50+
static void valueChangeCallback(winrt::WinUINamespace::UI::Xaml::DependencyObject d,
51+
winrt::WinUINamespace::UI::Xaml::DependencyPropertyChangedEventArgs const& e);
52+
static void onTargetElementPropertyChanged(
53+
winrt::WinUINamespace::UI::Xaml::DependencyObject d,
54+
winrt::WinUINamespace::UI::Xaml::DependencyPropertyChangedEventArgs e
55+
);
56+
void updateTargetElement(
57+
winrt::WinUINamespace::UI::Xaml::FrameworkElement oldValue,
58+
winrt::WinUINamespace::UI::Xaml::FrameworkElement newValue
59+
);
60+
};
61+
}
62+
63+
namespace winrt::PackageRoot::factory_implementation
64+
{
65+
struct ControlSizeTrigger : ControlSizeTriggerT<ControlSizeTrigger, implementation::ControlSizeTrigger>
66+
{
67+
};
68+
}

‎SharedComponent/ControlSizeTrigger.idl‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
namespace PackageRoot
2+
{
3+
[bindable]
4+
[default_interface]
5+
runtimeclass ControlSizeTrigger : WinUINamespace.UI.Xaml.StateTriggerBase
6+
{
7+
ControlSizeTrigger();
8+
9+
Boolean CanTrigger;
10+
static WinUINamespace.UI.Xaml.DependencyProperty CanTriggerProperty{ get; };
11+
12+
Double MaxWidth;
13+
static WinUINamespace.UI.Xaml.DependencyProperty MaxWidthProperty{ get; };
14+
15+
Double MinWidth;
16+
static WinUINamespace.UI.Xaml.DependencyProperty MinWidthProperty{ get; };
17+
18+
Double MaxHeight;
19+
static WinUINamespace.UI.Xaml.DependencyProperty MaxHeightProperty{ get; };
20+
21+
Double MinHeight;
22+
static WinUINamespace.UI.Xaml.DependencyProperty MinHeightProperty{ get; };
23+
24+
WinUINamespace.UI.Xaml.FrameworkElement TargetElement;
25+
static WinUINamespace.UI.Xaml.DependencyProperty TargetElementProperty{ get; };
26+
27+
Boolean IsActive{ get; };
28+
}
29+
}

WinUI3Package/include/DependentValue.cpp renamed to SharedComponent/DependentValue.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
#include "DependentValue.g.cpp"
55
#endif
66

7-
namespace winrt::WinUI3Package::implementation
7+
namespace winrt::PackageRoot::implementation
88
{
99
void DependentValue::EnsureDependencyProperties()
1010
{
1111
if (m_valueProperty) return;
12-
m_valueProperty = winrt::Microsoft::UI::Xaml::DependencyProperty::Register(
12+
m_valueProperty = winrt::WinUINamespace::UI::Xaml::DependencyProperty::Register(
1313
L"Value",
1414
winrt::xaml_typename<double>(),
15-
winrt::xaml_typename<winrt::WinUI3Package::DependentValue>(),
16-
winrt::Microsoft::UI::Xaml::PropertyMetadata{
15+
winrt::xaml_typename<winrt::PackageRoot::DependentValue>(),
16+
winrt::WinUINamespace::UI::Xaml::PropertyMetadata{
1717
winrt::box_value(0.0),
18-
[](winrt::Microsoft::UI::Xaml::DependencyObject obj, winrt::Microsoft::UI::Xaml::DependencyPropertyChangedEventArgs args)
18+
[](winrt::WinUINamespace::UI::Xaml::DependencyObject obj, winrt::WinUINamespace::UI::Xaml::DependencyPropertyChangedEventArgs args)
1919
{
20-
obj.as<winrt::WinUI3Package::DependentValue>().Value(winrt::unbox_value<double>(args.NewValue()));
20+
obj.as<winrt::PackageRoot::DependentValue>().Value(winrt::unbox_value<double>(args.NewValue()));
2121
}
2222
}
2323
);
2424
}
2525

26-
winrt::Microsoft::UI::Xaml::DependencyProperty DependentValue::ValueProperty()
26+
winrt::WinUINamespace::UI::Xaml::DependencyProperty DependentValue::ValueProperty()
2727
{
2828
return m_valueProperty;
2929
}

WinUI3Package/include/DependentValue.h renamed to SharedComponent/DependentValue.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
#include "DependentValue.g.h"
44
#include "../include/EnsureDependencyProperty.hpp"
55

6-
namespace winrt::WinUI3Package::implementation
6+
namespace winrt::PackageRoot::implementation
77
{
88
struct DependentValue : DependentValueT<DependentValue>, EnsureDependencyProperty<DependentValue>
99
{
1010
static void EnsureDependencyProperties();
1111
DependentValue() = default;
1212

13-
static winrt::Microsoft::UI::Xaml::DependencyProperty ValueProperty();
13+
static winrt::WinUINamespace::UI::Xaml::DependencyProperty ValueProperty();
1414

1515
double Value();
1616
void Value(double value);
@@ -19,11 +19,11 @@ namespace winrt::WinUI3Package::implementation
1919
void ValueChanged(winrt::event_token const& token);
2020
private:
2121
winrt::event<winrt::Windows::Foundation::EventHandler<double>> m_valueChanged;
22-
static inline winrt::Microsoft::UI::Xaml::DependencyProperty m_valueProperty = nullptr;
22+
static inline winrt::WinUINamespace::UI::Xaml::DependencyProperty m_valueProperty = nullptr;
2323
};
2424
}
2525

26-
namespace winrt::WinUI3Package::factory_implementation
26+
namespace winrt::PackageRoot::factory_implementation
2727
{
2828
struct DependentValue : DependentValueT<DependentValue, implementation::DependentValue>
2929
{

‎SharedComponent/DependentValue.idl‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace PackageRoot
2+
{
3+
[bindable]
4+
[default_interface]
5+
runtimeclass DependentValue : WinUINamespace.UI.Xaml.DependencyObject
6+
{
7+
DependentValue();
8+
9+
Double Value;
10+
static WinUINamespace.UI.Xaml.DependencyProperty ValueProperty{ get; };
11+
12+
event Windows.Foundation.EventHandler<Double> ValueChanged;
13+
}
14+
}

0 commit comments

Comments
 (0)