diff --git a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Resource.xml b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Resource.xml index 00697ee2..87d89780 100644 --- a/Tutorial/GacUI_HelloWorlds/CppXml/UI/Resource.xml +++ b/Tutorial/GacUI_HelloWorlds/CppXml/UI/Resource.xml @@ -18,7 +18,7 @@ diff --git a/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml b/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml index 89b37fb3..d6985a0e 100644 --- a/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml +++ b/Tutorial/GacUI_HelloWorlds/MVVM/UI/MainWindow.xml @@ -22,12 +22,12 @@ - fontFamily:{Segoe UI} size:40 antialias:true + fontFamily:"Segoe UI" size:40 antialias:true - fontFamily:{Segoe UI} size:12 antialias:true + fontFamily:"Segoe UI" size:12 antialias:true @@ -37,12 +37,12 @@ - fontFamily:{Segoe UI} size:12 antialias:true + fontFamily:"Segoe UI" size:12 antialias:true - fontFamily:{Segoe UI} size:12 antialias:true + fontFamily:"Segoe UI" size:12 antialias:true @@ -52,7 +52,7 @@ - fontFamily:{Segoe UI} size:12 antialias:true + fontFamily:"Segoe UI" size:12 antialias:true diff --git a/Tutorial/GacUI_HelloWorlds/Xml/UI/Resource.xml b/Tutorial/GacUI_HelloWorlds/Xml/UI/Resource.xml index 4c187364..c9508f67 100644 --- a/Tutorial/GacUI_HelloWorlds/Xml/UI/Resource.xml +++ b/Tutorial/GacUI_HelloWorlds/Xml/UI/Resource.xml @@ -12,7 +12,7 @@ diff --git a/Tutorial/GacUI_Layout/Flow/UI/Resource.xml b/Tutorial/GacUI_Layout/Flow/UI/Resource.xml index c6ca04f7..fb1fa63a 100644 --- a/Tutorial/GacUI_Layout/Flow/UI/Resource.xml +++ b/Tutorial/GacUI_Layout/Flow/UI/Resource.xml @@ -22,7 +22,15 @@ var radioButton = cast (SelectableButton*) sender.RelatedControl; if (radioButton.Selected) { - var direction = cast (AxisDirection) radioButton.Text; + var direction : AxisDirection = + radioButton.Text == "LeftDown" ? LeftDown : + radioButton.Text == "LeftUp" ? LeftUp : + radioButton.Text == "RightDown" ? RightDown : + radioButton.Text == "RightUp" ? RightUp : + radioButton.Text == "UpRight" ? UpRight : + radioButton.Text == "UpLeft" ? UpLeft : + radioButton.Text == "DownLeft" ? DownLeft : + DownRight; var axis = new Axis^(direction); flowLayout.Axis = axis; } @@ -37,7 +45,10 @@ var radioButton = cast (SelectableButton*) sender.RelatedControl; if (radioButton.Selected) { - flowLayout.Alignment = cast (FlowAlignment) radioButton.Text; + flowLayout.Alignment = + radioButton.Text == "Left" ? Left : + radioButton.Text == "Center" ? Center : + Extend; } } ]]> @@ -49,11 +60,11 @@ { for (flowItem in flowLayout.FlowItems) { - flowItem.ExtraMargin = cast Margin ""; + flowItem.ExtraMargin = {}; } var selectedItem = cast (FlowItem*) sender.Parent; - selectedItem.ExtraMargin = cast Margin "left:10 top:10 right:10 bottom:10"; + selectedItem.ExtraMargin = {left:10 top:10 right:10 bottom:10}; flowLayout.MoveChild(selectedItem, flowLayout.FlowItems.Count - 1); } ]]> diff --git a/Tutorial/GacUI_Layout/Stack/UI/Resource.xml b/Tutorial/GacUI_Layout/Stack/UI/Resource.xml index 0cf17b9a..60dd6ae9 100644 --- a/Tutorial/GacUI_Layout/Stack/UI/Resource.xml +++ b/Tutorial/GacUI_Layout/Stack/UI/Resource.xml @@ -22,7 +22,11 @@ var radioButton = cast (SelectableButton*) sender.RelatedControl; if (radioButton.Selected) { - stackLayout.Direction = cast (Stack::Direction) radioButton.Text; + stackLayout.Direction = + radioButton.Text == "Horizontal" ? Horizontal : + radioButton.Text == "Vertical" ? Vertical : + radioButton.Text == "ReversedHorizontal" ? ReversedHorizontal : + ReversedVertical; } } ]]> @@ -34,11 +38,11 @@ { for (stackItem in stackLayout.StackItems) { - stackItem.ExtraMargin = cast Margin ""; + stackItem.ExtraMargin = {}; } var selectedItem = cast (StackItem*) sender.Parent; - selectedItem.ExtraMargin = cast Margin "left:10 top:10 right:10 bottom:10"; + selectedItem.ExtraMargin = {left:10 top:10 right:10 bottom:10}; stackLayout.MoveChild(selectedItem, stackLayout.StackItems.Count - 1); } ]]> diff --git a/Tutorial/GacUI_Layout/Table/UI/Resource.xml b/Tutorial/GacUI_Layout/Table/UI/Resource.xml index 49ae52fe..2ce00c12 100644 --- a/Tutorial/GacUI_Layout/Table/UI/Resource.xml +++ b/Tutorial/GacUI_Layout/Table/UI/Resource.xml @@ -33,7 +33,7 @@ - +