diff --git a/change/react-native-windows-2019-12-17-13-09-03-textborder.json b/change/react-native-windows-2019-12-17-13-09-03-textborder.json
new file mode 100644
index 00000000000..ff3bdaabcef
--- /dev/null
+++ b/change/react-native-windows-2019-12-17-13-09-03-textborder.json
@@ -0,0 +1,8 @@
+{
+ "type": "prerelease",
+ "comment": "Fix cornerRadius issue for TextInput and some updates to TreeDump",
+ "packageName": "react-native-windows",
+ "email": "dida@ntdev.microsoft.com",
+ "commit": "d2ab5205ec27f1784a54a82236c54b9c13531412",
+ "date": "2019-12-17T21:09:02.950Z"
+}
\ No newline at end of file
diff --git a/packages/E2ETest/.gitignore b/packages/E2ETest/.gitignore
index b9083bb8d72..8c596417d78 100644
--- a/packages/E2ETest/.gitignore
+++ b/packages/E2ETest/.gitignore
@@ -3,4 +3,5 @@
/build
/reports
/dist
-/windows/ReactUWPTestApp/Bundle/
\ No newline at end of file
+/windows/ReactUWPTestApp/Bundle/
+msbuild.binlog
\ No newline at end of file
diff --git a/packages/E2ETest/app/Consts.ts b/packages/E2ETest/app/Consts.ts
index d8f29264284..1a5e46cc5ab 100644
--- a/packages/E2ETest/app/Consts.ts
+++ b/packages/E2ETest/app/Consts.ts
@@ -38,3 +38,7 @@ export const IMAGE_TESTPAGE = 'ImageTestPage';
export const IMAGE_CHANGE_BORDER = 'ChangeBorder';
export const SHOW_IMAGE_BORDER = 'BorderButton';
export const IMAGE_CONTAINER = 'ImageContainer';
+
+// Control Style Test Page
+export const CONTROL_STYLE_TESTPAGE = 'ControlStyleTestPage';
+export const SHOWBORDER_ON_CONTROLSTYLE = 'ShowBorder';
diff --git a/packages/E2ETest/app/ControlStyleTestPage.tsx b/packages/E2ETest/app/ControlStyleTestPage.tsx
new file mode 100644
index 00000000000..62686dcf729
--- /dev/null
+++ b/packages/E2ETest/app/ControlStyleTestPage.tsx
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { Switch, CheckBox, TextInput, View, StyleSheet, Button } from 'react-native';
+import { DatePicker, Picker } from 'react-native-windows';
+import React, { useState } from 'react';
+import { SHOWBORDER_ON_CONTROLSTYLE, TREE_DUMP_RESULT } from './Consts';
+import { TreeDumpControl } from './TreeDumpControl'
+
+const styles = StyleSheet.create({
+ container: {
+ padding: 20
+ },
+ regularBorder: {
+ height: 50,
+ backgroundColor: 'rgba(225,225,225,0.2)',
+ borderWidth:1,
+ borderColor: '#ff00ff55',
+ marginBottom: 10,
+ padding: 10,
+ color: '#fff'
+ },
+ roundBorder: {
+ height: 50,
+ backgroundColor: 'rgba(0,0,0,0.2)',
+ marginBottom: 10,
+ padding: 10,
+ color: '#000',
+ borderRadius: 10.0,
+ borderWidth:10,
+ borderColor: '#00ff0055',
+ },
+ buttonText: {
+ color: '#fff',
+ textAlign: 'center',
+ fontWeight: '700',
+ borderRadius: 10.0,
+ },
+ treeDumpControl: {
+ height: 150,
+ width: 500,
+ margin: 10,
+ },
+});
+
+export function ControlStyleTestPage() {
+ const [showRoundBorder, setShowRoundBorder] = useState(false);
+
+ const onPressShowRoundBorder = () => {
+ var previousState = showRoundBorder;
+ setShowRoundBorder(!previousState);
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/packages/E2ETest/app/ImageTestPage.tsx b/packages/E2ETest/app/ImageTestPage.tsx
index 3ca2d302647..000614a23b1 100644
--- a/packages/E2ETest/app/ImageTestPage.tsx
+++ b/packages/E2ETest/app/ImageTestPage.tsx
@@ -3,10 +3,10 @@
* Licensed under the MIT License.
*/
-import {StyleSheet, View, Image, Button, requireNativeComponent} from 'react-native'
+import { StyleSheet, View, Image, Button } from 'react-native'
import React, { useState } from 'react';
-import { TREE_DUMP_RESULT, SHOW_IMAGE_BORDER, IMAGE_CONTAINER } from './Consts';
-const TreeDumpControl = requireNativeComponent('TreeDumpControl');
+import { SHOW_IMAGE_BORDER, IMAGE_CONTAINER, TREE_DUMP_RESULT } from './Consts';
+import { TreeDumpControl } from './TreeDumpControl'
const styles = StyleSheet.create({
container: {
diff --git a/packages/E2ETest/app/TestPages.ts b/packages/E2ETest/app/TestPages.ts
index 5973e8af428..7529713071a 100644
--- a/packages/E2ETest/app/TestPages.ts
+++ b/packages/E2ETest/app/TestPages.ts
@@ -14,11 +14,13 @@ import {
ACCESSBILITY_TESTPAGE,
DIRECT_MANIPULATION_TESTPAGE,
IMAGE_TESTPAGE,
+ CONTROL_STYLE_TESTPAGE,
} from './Consts';
import { LoginTestPage } from './LoginTestPage';
import { AccessibilityTestPage } from './AccessibilityTestPage';
import { DirectManipulationTestPage } from './DirectManipulationPage';
import { ImageTestPage } from './ImageTestPage';
+import { ControlStyleTestPage } from './ControlStyleTestPage';
export interface ITestPage {
testId: string;
@@ -52,6 +54,11 @@ const TestPages: ITestPage[] = [
description: 'Image Test Page',
content: ImageTestPage,
},
+ {
+ testId: CONTROL_STYLE_TESTPAGE,
+ description: 'Control Style Test Page',
+ content: ControlStyleTestPage,
+ },
{
testId: UNKNOWN_TESTPAGE,
description: 'Unknown Page',
diff --git a/packages/E2ETest/app/TreeDumpControl.ts b/packages/E2ETest/app/TreeDumpControl.ts
new file mode 100644
index 00000000000..9de23d1c93f
--- /dev/null
+++ b/packages/E2ETest/app/TreeDumpControl.ts
@@ -0,0 +1,8 @@
+/**
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { requireNativeComponent } from 'react-native';
+export const TreeDumpControl = requireNativeComponent('TreeDumpControl');
diff --git a/packages/E2ETest/wdio/pages/ControlStylePage.ts b/packages/E2ETest/wdio/pages/ControlStylePage.ts
new file mode 100644
index 00000000000..c29807b2a43
--- /dev/null
+++ b/packages/E2ETest/wdio/pages/ControlStylePage.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { BasePage, By } from './BasePage';
+import { SHOWBORDER_ON_CONTROLSTYLE } from '../../app/Consts';
+
+class ControlStyleTestPage extends BasePage {
+ backToHomePage() {
+ this.homeButton.click();
+ this.waitForPageLoaded();
+ }
+
+ isPageLoaded() {
+ return super.isPageLoaded();
+ }
+
+ toggleControlBorder() {
+ this._controlBorder.click();
+ }
+
+ private get _controlBorder() {
+ return By(SHOWBORDER_ON_CONTROLSTYLE);
+ }
+}
+
+export default new ControlStyleTestPage();
diff --git a/packages/E2ETest/wdio/pages/HomePage.ts b/packages/E2ETest/wdio/pages/HomePage.ts
index ae7026e3ef3..8e6586ce9a3 100644
--- a/packages/E2ETest/wdio/pages/HomePage.ts
+++ b/packages/E2ETest/wdio/pages/HomePage.ts
@@ -10,10 +10,12 @@ import {
LOGIN_TESTPAGE,
DIRECT_MANIPULATION_TESTPAGE,
IMAGE_TESTPAGE,
+ CONTROL_STYLE_TESTPAGE,
} from '../../app/Consts';
import LoginPage from './LoginPage';
import DirectManipulationPage from './DirectManipulationPage';
import ImageTestPage from './ImageTestPage';
+import ControlStyleTestPage from './ControlStylePage';
class HomePage extends BasePage {
backToHomePage() {
@@ -45,6 +47,11 @@ class HomePage extends BasePage {
ImageTestPage.waitForPageLoaded();
}
+ clickAndGotoControlStylePage() {
+ this.ControlStylePageButton.click();
+ ControlStyleTestPage.waitForPageLoaded();
+ }
+
private get testInputTestPageButton() {
return By(TEXTINPUT_TESTPAGE);
}
@@ -60,6 +67,10 @@ class HomePage extends BasePage {
private get ImagePageButton() {
return By(IMAGE_TESTPAGE);
}
+
+ private get ControlStylePageButton() {
+ return By(CONTROL_STYLE_TESTPAGE);
+ }
}
export default new HomePage();
diff --git a/packages/E2ETest/wdio/test/Image.spec.ts b/packages/E2ETest/wdio/test/Image.spec.ts
index 46844600373..0a96234e08d 100644
--- a/packages/E2ETest/wdio/test/Image.spec.ts
+++ b/packages/E2ETest/wdio/test/Image.spec.ts
@@ -26,7 +26,7 @@ describe('ImageWithoutBorderTest', () => {
assert(result, '#2. Dump comparison for image with border!');
});
-/* Test case #3: Click button one more, remove border from view and image but tree sturcture is different from #1*/
+ /* Test case #3: Click button one more, remove border from view and image but tree sturcture is different from #1*/
it('ImageWithoutBorderTest', () => {
ImageTestPage.toggleImageBorder();
const result = ImageTestPage.getTreeDumpResult();
diff --git a/packages/E2ETest/wdio/test/controlStyle.spec.ts b/packages/E2ETest/wdio/test/controlStyle.spec.ts
new file mode 100644
index 00000000000..255e277f9e9
--- /dev/null
+++ b/packages/E2ETest/wdio/test/controlStyle.spec.ts
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import HomePage from '../pages/HomePage';
+import ControlStyleTestPage from '../pages/ControlStylePage';
+import assert from 'assert';
+
+beforeAll(() => {
+ HomePage.backToHomePage();
+ HomePage.clickAndGotoControlStylePage();
+});
+
+describe('ControlStyleTest', () => {
+ /* Test case #1: Controls style with regular border */
+ it('ControlStyleTestWithRegularBorder', () => {
+ const result = ControlStyleTestPage.getTreeDumpResult();
+ assert(
+ result,
+ '#1. Dump comparison for Control style with regular border!'
+ );
+ });
+
+ /* Test case #2: Click button once, update controls style and round border*/
+ it('ControlStyleTestWithRoundBorder', () => {
+ ControlStyleTestPage.toggleControlBorder();
+ const result = ControlStyleTestPage.getTreeDumpResult();
+ assert(result, '#2. Dump comparison for Control style with round border!');
+ });
+
+ /* Test case #3: Click button one more, return to #1*/
+ it('ControlStyleTestWithRegularBorder #2', () => {
+ ControlStyleTestPage.toggleControlBorder();
+ const result = ControlStyleTestPage.getTreeDumpResult();
+ assert(
+ result,
+ '#3. Second dump comparison for Control style with regular border!'
+ );
+ });
+});
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt
new file mode 100644
index 00000000000..8a4cb330eca
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt
@@ -0,0 +1,851 @@
+[react.uwp.ViewPanel]
+ Background=[NULL]
+ BorderBrush=#00000000
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Height=360
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=800,360
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.ToggleSwitch]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=51,50
+ VerticalAlignment=Center
+ Visibility=Visible
+ Width=51
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=51,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=154,32
+ VerticalAlignment=Top
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,5,0,5
+ Padding=0,0,0,0
+ RenderSize=52,22
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ Height=20
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=40,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=40
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ Height=20
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=40,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=40
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Height=20
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=20
+ [Windows.UI.Xaml.Shapes.Ellipse]
+ Clip=[NULL]
+ Height=10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=10,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=10
+ [Windows.UI.Xaml.Shapes.Ellipse]
+ Clip=[NULL]
+ Height=10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=10,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=10
+ [Windows.UI.Xaml.Controls.Primitives.Thumb]
+ Background=#33000000
+ BorderBrush=#00FFFFFF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=52,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=52,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.CheckBox]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=8,5,0,0
+ RenderSize=120,50
+ VerticalAlignment=Center
+ Visibility=Visible
+ Width=32
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=120,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Height=32
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,32
+ VerticalAlignment=Top
+ Visibility=Visible
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ Height=20
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=20,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=20
+ [Windows.UI.Xaml.Controls.FontIcon]
+ Clip=[NULL]
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=20,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00000000
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,16
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=8,5,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Top
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBox]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ Height=50
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=10,10,10,10
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollViewer]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=1,1,1,1
+ Padding=10,10,10,10
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=[NULL]
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=Windows.UI.Xaml.Media.RectangleGeometry
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=0,0,0,0
+ RenderSize=778,28
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.FrameworkElement]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=778,28
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Right
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#FFE6E6E6
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#B3E1E1E1
+ HorizontalAlignment=Stretch
+ Margin=1,1,1,1
+ Padding=10,10,10,10
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Button]
+ Background=#33000000
+ BorderBrush=#00FFFFFF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,-2,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.PasswordBox]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ Height=50
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=10,10,10,10
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollViewer]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=1,1,1,1
+ Padding=10,10,10,10
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=[NULL]
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=Windows.UI.Xaml.Media.RectangleGeometry
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=0,0,0,0
+ RenderSize=778,28
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.FrameworkElement]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=778,28
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Right
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#FFE6E6E6
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=1,1,1,1
+ Padding=10,10,10,10
+ RenderSize=798,48
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.ToggleButton]
+ Background=#33000000
+ BorderBrush=#00FFFFFF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,-2,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.CalendarDatePicker]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,50
+ VerticalAlignment=Center
+ Visibility=Visible
+ Width=150
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#99000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=12,0,0,2
+ RenderSize=90,21
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.FontIcon]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Center
+ Margin=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00000000
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ComboBox]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=12,5,0,7
+ RenderSize=800,50
+ VerticalAlignment=Top
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33E1E1E1
+ BorderBrush=#55FF00FF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#FF0078D7
+ BorderBrush=#66000000
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=12,5,0,7
+ Padding=0,0,0,0
+ RenderSize=756,19
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=756,19
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBox]
+ Background=#66FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=11,5,32,6
+ RenderSize=0,0
+ VerticalAlignment=Center
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Right
+ Margin=0,1,1,1
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ Width=30
+ [Windows.UI.Xaml.Controls.FontIcon]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Right
+ Margin=0,0,10,0
+ RenderSize=12,32
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00000000
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.Popup]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=768,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt
new file mode 100644
index 00000000000..77fc06c2322
--- /dev/null
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt
@@ -0,0 +1,851 @@
+[react.uwp.ViewPanel]
+ Background=[NULL]
+ BorderBrush=#00000000
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Height=360
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=800,360
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.ToggleSwitch]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ Foreground=#FF000000
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=51,50
+ VerticalAlignment=Center
+ Visibility=Visible
+ Width=51
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=51,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=154,32
+ VerticalAlignment=Top
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,5,0,5
+ Padding=0,0,0,0
+ RenderSize=52,22
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ Height=20
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=40,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=40
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ Height=20
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=40,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=40
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Height=20
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=20
+ [Windows.UI.Xaml.Shapes.Ellipse]
+ Clip=[NULL]
+ Height=10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=10,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=10
+ [Windows.UI.Xaml.Shapes.Ellipse]
+ Clip=[NULL]
+ Height=10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=10,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=10
+ [Windows.UI.Xaml.Controls.Primitives.Thumb]
+ Background=#33000000
+ BorderBrush=#00FFFFFF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=52,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=52,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.CheckBox]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ Foreground=#FF000000
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=8,5,0,0
+ RenderSize=120,50
+ VerticalAlignment=Center
+ Visibility=Visible
+ Width=40
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=120,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Height=32
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,32
+ VerticalAlignment=Top
+ Visibility=Visible
+ [Windows.UI.Xaml.Shapes.Rectangle]
+ Clip=[NULL]
+ Height=20
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=20,20
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=20
+ [Windows.UI.Xaml.Controls.FontIcon]
+ Clip=[NULL]
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=20,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00000000
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#FFFFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=20,16
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=8,5,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Top
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBox]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ Foreground=#FF000000
+ Height=50
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=10,10,10,10
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollViewer]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=10,10,10,10
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=[NULL]
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=Windows.UI.Xaml.Media.RectangleGeometry
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=0,0,0,0
+ RenderSize=760,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.FrameworkElement]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=760,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Right
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#FFE6E6E6
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#B3E1E1E1
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=10,10,10,10
+ RenderSize=780,39
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Button]
+ Background=#33000000
+ BorderBrush=#00FFFFFF
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=0,10,10,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,-2,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.PasswordBox]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ Foreground=#FF000000
+ Height=50
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=10,10,10,10
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollViewer]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=10,10,10,10
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=[NULL]
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ScrollContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=Windows.UI.Xaml.Media.RectangleGeometry
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=0,0,0,0
+ RenderSize=760,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.FrameworkElement]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=760,10
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=780,30
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Right
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Primitives.ScrollBar]
+ Background=#00FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=2,2,2,2
+ Foreground=#00FFFFFF
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#FFE6E6E6
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=10,10,10,10
+ Padding=10,10,10,10
+ RenderSize=780,39
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.ToggleButton]
+ Background=#33000000
+ BorderBrush=#00FFFFFF
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=0,10,10,0
+ Foreground=#FF000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,-2,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.CalendarDatePicker]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ Foreground=#FF000000
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,50
+ VerticalAlignment=Center
+ Visibility=Visible
+ Width=150
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#99000000
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=12,0,0,2
+ RenderSize=90,21
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.FontIcon]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Center
+ Margin=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00000000
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=150,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ComboBox]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ Foreground=#FF000000
+ Height=50
+ HorizontalAlignment=Left
+ Margin=0,0,0,0
+ Padding=12,5,0,7
+ RenderSize=800,50
+ VerticalAlignment=Top
+ Visibility=Visible
+ Width=800
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#33000000
+ BorderBrush=#5500FF00
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#FF0078D7
+ BorderBrush=#66000000
+ BorderThickness=10,10,10,10
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,50
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=12,5,0,7
+ Padding=0,0,0,0
+ RenderSize=756,19
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=756,19
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBox]
+ Background=#66FFFFFF
+ BorderBrush=#00FFFFFF
+ BorderThickness=1,1,1,1
+ Clip=[NULL]
+ CornerRadius=10,10,10,10
+ Foreground=#FF000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=11,5,32,6
+ RenderSize=0,0
+ VerticalAlignment=Center
+ Visibility=Collapsed
+ [Windows.UI.Xaml.Controls.Border]
+ Background=#00FFFFFF
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Right
+ Margin=0,1,1,1
+ Padding=0,0,0,0
+ RenderSize=0,0
+ VerticalAlignment=Stretch
+ Visibility=Collapsed
+ Width=30
+ [Windows.UI.Xaml.Controls.FontIcon]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Right
+ Margin=0,0,10,0
+ RenderSize=12,32
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Grid]
+ Background=#00000000
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,32
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.TextBlock]
+ Clip=[NULL]
+ Foreground=#CC000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=12,12
+ VerticalAlignment=Center
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.ContentPresenter]
+ Background=[NULL]
+ BorderBrush=[NULL]
+ BorderThickness=0,0,0,0
+ Clip=[NULL]
+ CornerRadius=0,0,0,0
+ Foreground=#99000000
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ Padding=0,0,0,0
+ RenderSize=800,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
+ [Windows.UI.Xaml.Controls.Primitives.Popup]
+ Clip=[NULL]
+ HorizontalAlignment=Stretch
+ Margin=0,0,0,0
+ RenderSize=768,0
+ VerticalAlignment=Stretch
+ Visibility=Visible
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Properties/Default.rd.xml b/packages/E2ETest/windows/ReactUWPTestApp/Properties/Default.rd.xml
index c6cf5c5ce9f..5d743232bd8 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/Properties/Default.rd.xml
+++ b/packages/E2ETest/windows/ReactUWPTestApp/Properties/Default.rd.xml
@@ -22,8 +22,9 @@
the application package. The asterisks are not wildcards.
-->
-
-
+
+
+
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
index b88ff66c011..edfece6ded9 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
+++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
@@ -108,9 +108,7 @@
-
-
-
+
diff --git a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs
index 5b4d7eb78ef..ba70d05c932 100644
--- a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs
+++ b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpControlViewManager.cs
@@ -36,14 +36,23 @@ public FrameworkElement CreateView()
}
else
{
- await MatchTreeDumpFromLayoutUpdateAsync();
+ // delay dumping tree by 100ms for layout to stablize
+ if (m_timer != null)
+ {
+ m_timer.Stop();
+ m_timer.Start();
+ }
}
};
m_textBlock.PointerPressed += (soruce, e) =>
{
- if (!m_matchDump)
+ if (!m_dumpMatchExpected)
{
+ if (m_timer != null)
+ {
+ m_timer.Stop();
+ }
m_errStringShowing = true;
m_textBlock.Text = m_errString;
m_textBlock.IsTextSelectionEnabled = true;
@@ -83,14 +92,18 @@ IReadOnlyDictionary IViewManagerWithNativePrope
public void SetDumpID(TextBlock view, string value)
{
m_dumpID = value;
- m_matchDump = false;
+ m_dumpMatchExpected = false;
m_dumpExpectedText = null;
m_errString = "";
m_errStringShowing = false;
if (m_textBlock != null)
{
m_textBlock.IsTextSelectionEnabled = false;
+ UpdateTextBlockText("");
}
+ m_timer = new DispatcherTimer();
+ m_timer.Tick += dispatcherTimer_Tick;
+ m_timer.Interval = new TimeSpan(0, 0, 0, 0, 200);
}
public void SetUIAID(TextBlock view, string value)
@@ -98,6 +111,14 @@ public void SetUIAID(TextBlock view, string value)
m_uiaID = value;
}
+ private async void dispatcherTimer_Tick(object sender, object e)
+ {
+ m_timer.Stop();
+ if (VisualTreeHelper.GetParent(m_textBlock) != null)
+ {
+ await MatchTreeDumpFromLayoutUpdateAsync();
+ }
+ }
private DependencyObject FindChildWithMatchingUIAID(DependencyObject element)
{
string automationId = (string)element.GetValue(Windows.UI.Xaml.Automation.AutomationProperties.AutomationIdProperty);
@@ -212,7 +233,7 @@ private async void UpdateResult(bool matchDump, string helpText)
}
}
- m_matchDump = matchDump;
+ m_dumpMatchExpected = matchDump;
}
private void UpdateTextBlockText(string text)
@@ -225,10 +246,12 @@ private void UpdateTextBlockText(string text)
private TextBlock m_textBlock = null;
private string m_dumpID = "UnknownTest";
private string m_dumpExpectedText;
- private bool m_matchDump = false;
+ private bool m_dumpMatchExpected = false;
private bool m_errStringShowing = false;
private string m_errString = "";
private string m_uiaID = null;
+ private DispatcherTimer m_timer = null;
+
}
}
diff --git a/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp b/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp
index 410388d3ee3..825e0fc43b3 100644
--- a/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp
+++ b/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp
@@ -39,6 +39,21 @@ void UpdateTextControlBackgroundResourceBrushes(const winrt::FrameworkElement &e
UpdateResourceBrush(element, c_textControlButtonForegroundPressed, brush);
}
+void UpdateCheckBoxBackgroundResourceBrushes(const winrt::FrameworkElement &element, const winrt::Brush brush) {
+ UpdateResourceBrush(element, c_checkBoxBackgroundUnchecked, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundUncheckedPointerOver, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundUncheckedPressed, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundUncheckedDisabled, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundChecked, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundCheckedPointerOver, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundCheckedPressed, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundCheckedDisabled, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundIndeterminate, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundIndeterminatePointerOver, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundIndeterminatePressed, brush);
+ UpdateResourceBrush(element, c_checkBoxBackgroundIndeterminateDisabled, brush);
+}
+
void UpdateTextControlForegroundResourceBrushes(const winrt::FrameworkElement element, const winrt::Brush brush) {
UpdateResourceBrush(element, c_textControlForeground, brush);
UpdateResourceBrush(element, c_textControlForegroundPointerOver, brush);
@@ -68,6 +83,21 @@ void UpdateToggleSwitchBorderResourceBrushes(const winrt::ToggleSwitch &toggleSw
UpdateResourceBrush(toggleSwitch, c_toggleSwitchStrokeOnDisabled, brush);
}
+void UpdateCheckBoxBorderResourceBrushes(const winrt::CheckBox &checkBox, const winrt::Brush brush) {
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushUnchecked, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushUncheckedPointerOver, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushUncheckedPressed, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushUncheckedDisabled, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushChecked, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushCheckedPointerOver, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushCheckedPressed, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushCheckedDisabled, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushIndeterminate, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushIndeterminatePointerOver, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushIndeterminatePressed, brush);
+ UpdateResourceBrush(checkBox, c_checkBoxBorderBrushIndeterminateDisabled, brush);
+}
+
void UpdateToggleSwitchThumbResourceBrushes(const winrt::ToggleSwitch &toggleSwitch, const winrt::Brush thumbBrush) {
UpdateResourceBrush(toggleSwitch, c_toggleSwitchKnobFillOff, thumbBrush);
UpdateResourceBrush(toggleSwitch, c_toggleSwitchKnobFillOffPointerOver, thumbBrush);
@@ -104,6 +134,8 @@ void UpdateControlBackgroundResourceBrushes(
const winrt::Media::Brush brush) {
if (IsObjectATextControl(element)) {
UpdateTextControlBackgroundResourceBrushes(element, brush);
+ } else if (const auto checkBox = element.try_as()) {
+ UpdateCheckBoxBackgroundResourceBrushes(checkBox, brush);
}
}
@@ -123,6 +155,8 @@ void UpdateControlBorderResourceBrushes(
UpdateTextControlBorderResourceBrushes(element, brush);
} else if (const auto toggleSwitch = element.try_as()) {
UpdateToggleSwitchBorderResourceBrushes(toggleSwitch, brush);
+ } else if (const auto checkBox = element.try_as()) {
+ UpdateCheckBoxBorderResourceBrushes(checkBox, brush);
}
}
diff --git a/vnext/ReactUWP/Views/ControlViewManager.cpp b/vnext/ReactUWP/Views/ControlViewManager.cpp
index 6f06e30a30c..579a1cbe515 100644
--- a/vnext/ReactUWP/Views/ControlViewManager.cpp
+++ b/vnext/ReactUWP/Views/ControlViewManager.cpp
@@ -31,6 +31,11 @@ void ControlViewManager::TransferProperties(XamlView oldView, XamlView newView)
TransferProperty(oldView, newView, winrt::Control::PaddingProperty());
TransferProperty(oldView, newView, winrt::Control::ForegroundProperty());
TransferProperty(oldView, newView, winrt::Control::TabIndexProperty());
+ // Control.CornerRadius is only supported on >= RS5
+ if (oldView.try_as() &&
+ newView.try_as()) {
+ TransferProperty(oldView, newView, winrt::Control::CornerRadiusProperty());
+ }
Super::TransferProperties(oldView, newView);
}
@@ -38,6 +43,7 @@ void ControlViewManager::UpdateProperties(ShadowNodeBase *nodeToUpdate, const fo
auto control(nodeToUpdate->GetView().as());
bool implementsPadding = nodeToUpdate->ImplementsPadding();
+ bool finalizeBorderRadius{false};
if (control != nullptr) {
for (const auto &pair : reactDiffMap.items()) {
@@ -50,6 +56,9 @@ void ControlViewManager::UpdateProperties(ShadowNodeBase *nodeToUpdate, const fo
continue;
} else if (TryUpdateForeground(control, propertyName, propertyValue)) {
continue;
+ } else if (TryUpdateCornerRadiusOnNode(nodeToUpdate, control, propertyName, propertyValue)) {
+ finalizeBorderRadius = true;
+ continue;
} else if (implementsPadding && TryUpdatePadding(nodeToUpdate, control, propertyName, propertyValue)) {
continue;
} else if (propertyName == "tabIndex") {
@@ -65,6 +74,19 @@ void ControlViewManager::UpdateProperties(ShadowNodeBase *nodeToUpdate, const fo
}
Super::UpdateProperties(nodeToUpdate, reactDiffMap);
+
+ if (finalizeBorderRadius && control.try_as()) {
+ // Control.CornerRadius is only supported on >= RS5, setting borderRadius on Controls have no effect < RS5
+ UpdateCornerRadiusOnElement(nodeToUpdate, control);
+ }
+}
+
+void ControlViewManager::OnViewCreated(XamlView view) {
+ // Set the default cornerRadius to 0 for Control: WinUI usually default cornerRadius to 2
+ // Only works on >= RS5 becuase Control.CornerRadius is only supported >= RS5
+ if (auto control = view.try_as()) {
+ control.CornerRadius({0});
+ }
}
} // namespace uwp
diff --git a/vnext/ReactUWP/Views/ViewManagerBase.cpp b/vnext/ReactUWP/Views/ViewManagerBase.cpp
index 6ac1212eef8..ce7e04b3cda 100644
--- a/vnext/ReactUWP/Views/ViewManagerBase.cpp
+++ b/vnext/ReactUWP/Views/ViewManagerBase.cpp
@@ -175,6 +175,7 @@ dynamic ViewManagerBase::GetExportedCustomDirectEventTypeConstants() const {
XamlView ViewManagerBase::CreateView(int64_t tag) {
XamlView view = CreateViewCore(tag);
+ OnViewCreated(view);
// Set the tag if the element type supports it
SetTag(view, tag);
diff --git a/vnext/include/ReactUWP/Views/ControlViewManager.h b/vnext/include/ReactUWP/Views/ControlViewManager.h
index 89269dff49c..72f6c14eba0 100644
--- a/vnext/include/ReactUWP/Views/ControlViewManager.h
+++ b/vnext/include/ReactUWP/Views/ControlViewManager.h
@@ -19,6 +19,9 @@ class REACTWINDOWS_EXPORT ControlViewManager : public FrameworkElementViewManage
folly::dynamic GetNativeProps() const override;
void UpdateProperties(ShadowNodeBase *nodeToUpdate, const folly::dynamic &reactDiffMap) override;
void TransferProperties(XamlView oldView, XamlView newView) override;
+
+ protected:
+ void OnViewCreated(XamlView view) override;
};
} // namespace uwp
diff --git a/vnext/include/ReactUWP/Views/ViewManagerBase.h b/vnext/include/ReactUWP/Views/ViewManagerBase.h
index d4837f5f281..bb1fc6b06a0 100644
--- a/vnext/include/ReactUWP/Views/ViewManagerBase.h
+++ b/vnext/include/ReactUWP/Views/ViewManagerBase.h
@@ -79,6 +79,7 @@ class REACTWINDOWS_EXPORT ViewManagerBase : public facebook::react::IViewManager
protected:
virtual XamlView CreateViewCore(int64_t tag) = 0;
+ virtual void OnViewCreated(XamlView view){};
protected:
std::weak_ptr m_wkReactInstance;
diff --git a/yarn.lock b/yarn.lock
index 222def14e8d..a3549b7051f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10054,9 +10054,10 @@ react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
-"react-native@https://github.com/microsoft/react-native/archive/v0.60.0-microsoft.28.tar.gz":
- version "0.60.0-microsoft.28"
- resolved "https://github.com/microsoft/react-native/archive/v0.60.0-microsoft.28.tar.gz#fad0f343cf2ee7c277f89b86f770efa71872839e"
+"react-native@https://github.com/microsoft/react-native/archive/v0.60.0-microsoft.31.tar.gz":
+ version "0.60.0-microsoft.31"
+ uid "26b4041e78b54517e3494beb6478bc7ee0a3a726"
+ resolved "https://github.com/microsoft/react-native/archive/v0.60.0-microsoft.31.tar.gz#26b4041e78b54517e3494beb6478bc7ee0a3a726"
dependencies:
"@babel/core" "^7.4.0"
"@babel/generator" "^7.4.0"