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.

Sign up for GitHub

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

Jump to bottom

Update ConverterFilterKind enum to be flags #1252

Closed
wants to merge 2 commits into from
Closed

Update ConverterFilterKind enum to be flags #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3064e
Update converter
Aug 30, 2019
9640422
Cleanups
Aug 31, 2019
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
52 changes: 30 additions & 22 deletions dev/Common/CornerRadiusFilterConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,30 @@
#include <common.h>
#include "CornerRadiusFilterConverter.h"

using FilterKind = winrt::CornerRadiusFilterKind;

winrt::CornerRadius CornerRadiusFilterConverter::Convert(winrt::CornerRadius const& radius, winrt::CornerRadiusFilterKind const& filterKind)
{
winrt::CornerRadius result = radius;
winrt::CornerRadius result { 0,0,0,0 };

switch (filterKind)
if ((filterKind & FilterKind::TopLeft) == FilterKind::TopLeft)
{
result.TopLeft = radius.TopLeft;
}

if ((filterKind & FilterKind::TopRight) == FilterKind::TopRight)
{
result.TopRight = radius.TopRight;
}

if ((filterKind & FilterKind::BottomLeft) == FilterKind::BottomLeft)
{
result.BottomLeft = radius.BottomLeft;
}

if ((filterKind & FilterKind::BottomRight) == FilterKind::BottomRight)
{
case winrt::CornerRadiusFilterKind::Top:
result.BottomLeft = 0;
result.BottomRight = 0;
break;
case winrt::CornerRadiusFilterKind::Right:
result.TopLeft = 0;
result.BottomLeft = 0;
break;
case winrt::CornerRadiusFilterKind::Bottom:
result.TopLeft = 0;
result.TopRight = 0;
break;
case winrt::CornerRadiusFilterKind::Left:
result.TopRight = 0;
result.BottomRight = 0;
break;
result.BottomRight = radius.BottomRight;
}

return result;
Expand All @@ -36,9 +38,16 @@ double CornerRadiusFilterConverter::GetDoubleValue(winrt::CornerRadius const& ra
{
switch (filterKind)
{
case winrt::CornerRadiusFilterKind::TopLeftValue:
case FilterKind::TopLeft:
return radius.TopLeft;
case winrt::CornerRadiusFilterKind::BottomRightValue:

case FilterKind::TopRight:
return radius.TopRight;

case FilterKind::BottomLeft:
return radius.BottomLeft;

case FilterKind::BottomRight:
return radius.BottomRight;
}
return 0;
Expand All @@ -52,8 +61,7 @@ winrt::IInspectable CornerRadiusFilterConverter::Convert(
{
auto cornerRadius = unbox_value<winrt::CornerRadius>(value);
auto filterType = Filter();
if (filterType == winrt::CornerRadiusFilterKind::TopLeftValue ||
filterType == winrt::CornerRadiusFilterKind::BottomRightValue)
if ((filterType & FilterKind::ValueOnly) == FilterKind::ValueOnly)
{
return box_value(GetDoubleValue(cornerRadius, Filter()));
}
Expand Down
18 changes: 11 additions & 7 deletions dev/Common/CornerRadiusFilterConverters.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,19 @@ runtimeclass CornerRadiusFilterConverter : Windows.UI.Xaml.DependencyObject, Win

[WUXC_VERSION_MUXONLY]
[webhosthidden]
[flags]
enum CornerRadiusFilterKind
{
None,
Top,
Right,
Bottom,
Left,
TopLeftValue,
BottomRightValue
None = 0x0000,
TopLeft = 0x0001,
TopRight = 0x0002,
BottomLeft = 0x0004,
BottomRight = 0x0008,
Top = TopLeft | TopRight,
Left = TopLeft | BottomLeft,
Bottom = BottomLeft | BottomRight,
Right = TopRight | BottomRight,
ValueOnly = 0x0010,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of ValueOnly?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to work around the CX binding bug we saw in the email thread. See #1239.

};

}
4 changes: 2 additions & 2 deletions dev/CommonStyles/CornerRadius_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<primitives:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right"/>
<primitives:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom"/>
<primitives:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left"/>
<primitives:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue"/>
<primitives:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue"/>
<primitives:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeft, ValueOnly"/>
<primitives:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRight, ValueOnly" />

</ResourceDictionary>