Skip to content

Commit 25f9603

Browse files
committed
[Sizers] Added key names to Sizer controls to make it possible to override the styles
1 parent 90a8f20 commit 25f9603

File tree

7 files changed

+42
-9
lines changed

7 files changed

+42
-9
lines changed

XamlToolkit.WinUI.Controls/Sizers/ContentSizer/ContentSizer.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
namespace winrt::XamlToolkit::WinUI::Controls::implementation
99
{
10+
ContentSizer::ContentSizer() : _currentSize(0.0)
11+
{
12+
DefaultStyleKey(winrt::box_value(winrt::xaml_typename<class_type>()));
13+
}
14+
1015
void ContentSizer::OnLoaded([[maybe_unused]] RoutedEventArgs const& e)
1116
{
1217
if (TargetControl() == nullptr)

XamlToolkit.WinUI.Controls/Sizers/ContentSizer/ContentSizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace winrt::XamlToolkit::WinUI::Controls::implementation
1111
{
1212
double _currentSize;
1313

14-
ContentSizer() : _currentSize(0.0) {}
14+
ContentSizer();
1515

1616
bool IsDragInverted() { return winrt::unbox_value<bool>(GetValue(IsDragInvertedProperty)); }
1717
void IsDragInverted(bool value) { SetValue(IsDragInvertedProperty, winrt::box_value(value)); }

XamlToolkit.WinUI.Controls/Sizers/GridSplitter/GridSplitter.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66

77
namespace winrt::XamlToolkit::WinUI::Controls::implementation
88
{
9+
GridSplitter::GridSplitter()
10+
: _currentSize(0)
11+
, _siblingSize(0)
12+
, _resizeDirection(GridResizeDirection::Auto)
13+
, _resizeBehavior(GridResizeBehavior::BasedOnAlignment)
14+
{
15+
DefaultStyleKey(winrt::box_value(winrt::xaml_typename<class_type>()));
16+
}
17+
918
void GridSplitter::OnResizeDirectionPropertyChanged(DependencyObject const& d, DependencyPropertyChangedEventArgs const& e)
1019
{
1120
if (auto splitter = d.try_as<Controls::GridSplitter>()) {

XamlToolkit.WinUI.Controls/Sizers/GridSplitter/GridSplitter.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ namespace winrt::XamlToolkit::WinUI::Controls::implementation
1919
GridResizeDirection _resizeDirection;
2020
GridResizeBehavior _resizeBehavior;
2121

22-
GridSplitter()
23-
: _currentSize(0)
24-
, _siblingSize(0)
25-
, _resizeDirection(GridResizeDirection::Auto)
26-
, _resizeBehavior(GridResizeBehavior::BasedOnAlignment) {
27-
}
22+
GridSplitter();
2823

2924
static void OnResizeDirectionPropertyChanged(DependencyObject const& d, DependencyPropertyChangedEventArgs const& e);
3025

XamlToolkit.WinUI.Controls/Sizers/PropertySizer/PropertySizer.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
namespace winrt::XamlToolkit::WinUI::Controls::implementation
88
{
9+
PropertySizer::PropertySizer() : _currentSize(0.0)
10+
{
11+
DefaultStyleKey(winrt::box_value(winrt::xaml_typename<class_type>()));
12+
}
13+
914
void PropertySizer::OnDragStarting()
1015
{
1116
// We grab the current size of the bound value when we start a drag

XamlToolkit.WinUI.Controls/Sizers/PropertySizer/PropertySizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace winrt::XamlToolkit::WinUI::Controls::implementation
1717
{
1818
double _currentSize;
1919

20-
PropertySizer() : _currentSize(0.0) {}
20+
PropertySizer();
2121

2222
bool IsDragInverted() { return winrt::unbox_value<double>(GetValue(IsDragInvertedProperty)); }
2323
void IsDragInverted(bool value) { SetValue(IsDragInvertedProperty, winrt::box_value(value)); }

XamlToolkit.WinUI.Controls/Sizers/SizerBase.xaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,14 @@
3333
<x:Double x:Key="SizerBaseThumbRadius">2</x:Double>
3434
<Thickness x:Key="SizerBasePadding">4</Thickness>
3535

36-
<Style BasedOn="{StaticResource DefaultSizerBaseStyle}" TargetType="controls:SizerBase" />
36+
<Style BasedOn="{StaticResource DefaultSizerBaseStyle}"
37+
TargetType="controls:SizerBase" />
38+
<Style BasedOn="{StaticResource DefaultContentSizerStyle}"
39+
TargetType="controls:ContentSizer" />
40+
<Style BasedOn="{StaticResource DefaultGridSplitterStyle}"
41+
TargetType="controls:GridSplitter" />
42+
<Style BasedOn="{StaticResource DefaultPropertySizerStyle}"
43+
TargetType="controls:PropertySizer" />
3744

3845
<Style x:Key="DefaultSizerBaseStyle" TargetType="controls:SizerBase">
3946
<Setter Property="IsTabStop" Value="True" />
@@ -115,4 +122,16 @@
115122
</Setter>
116123
</Style>
117124

125+
<Style x:Key="DefaultContentSizerStyle"
126+
BasedOn="{StaticResource DefaultSizerBaseStyle}"
127+
TargetType="controls:ContentSizer" />
128+
129+
<Style x:Key="DefaultGridSplitterStyle"
130+
BasedOn="{StaticResource DefaultSizerBaseStyle}"
131+
TargetType="controls:GridSplitter" />
132+
133+
<Style x:Key="DefaultPropertySizerStyle"
134+
BasedOn="{StaticResource DefaultSizerBaseStyle}"
135+
TargetType="controls:PropertySizer" />
136+
118137
</ResourceDictionary>

0 commit comments

Comments
 (0)