Skip to content

Commit

Permalink
Fix demo affected by breaking changes
Browse files Browse the repository at this point in the history
  • Loading branch information
vczh committed Jul 8, 2023
1 parent 31855a2 commit 56eaa70
Show file tree
Hide file tree
Showing 16 changed files with 149 additions and 158 deletions.
6 changes: 2 additions & 4 deletions Tutorial/GacUI_Controls/AddressBook/UI/Resource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,8 @@
<Cell Site="row:0 column:0">
<GroupBox Text="Categories">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
<att.ContainerComposition-set InternalMargin="left:3 top:3 right:3 bottom:3"/>

<Table CellPadding="5" BorderVisible="false" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<Table CellPadding="5" BorderVisible="false" AlignmentToParent="left:3 top:3 right:3 bottom:3">
<att.Rows>
<CellOption>composeType:MinSize</CellOption>
<CellOption>composeType:Percentage percentage:1.0</CellOption>
Expand Down Expand Up @@ -244,9 +243,8 @@
<Cell Site="row:0 column:1">
<GroupBox Text="Contacts">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
<att.ContainerComposition-set InternalMargin="left:3 top:3 right:3 bottom:3"/>

<Table CellPadding="5" BorderVisible="false" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<Table CellPadding="5" BorderVisible="false" AlignmentToParent="left:3 top:3 right:3 bottom:3">
<att.Rows>
<CellOption>composeType:MinSize</CellOption>
<CellOption>composeType:Percentage percentage:1.0</CellOption>
Expand Down
200 changes: 95 additions & 105 deletions Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.cpp

Large diffs are not rendered by default.

28 changes: 13 additions & 15 deletions Tutorial/GacUI_Controls/AddressBook/UI/Source/DemoPartialClasses.h
Original file line number Diff line number Diff line change
Expand Up @@ -213,33 +213,31 @@ namespace demo
::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_10;
::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_11;
::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_12;
::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_13;
::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_14;
::vl::presentation::controls::GuiControl* __vwsn_precompile_15;
::vl::presentation::compositions::GuiTableComposition* __vwsn_precompile_16;
::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_17;
::vl::presentation::controls::GuiToolstripToolBar* __vwsn_precompile_18;
::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_13;
::vl::presentation::controls::GuiControl* __vwsn_precompile_14;
::vl::presentation::compositions::GuiTableComposition* __vwsn_precompile_15;
::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_16;
::vl::presentation::controls::GuiToolstripToolBar* __vwsn_precompile_17;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_18;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_19;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_20;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_21;
::vl::presentation::controls::GuiControl* __vwsn_precompile_22;
::vl::presentation::controls::GuiControl* __vwsn_precompile_21;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_22;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_23;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_24;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_25;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_26;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_27;
::vl::presentation::controls::GuiToolstripButton* __vwsn_precompile_28;
::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_29;
::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_30;
::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_28;
::vl::presentation::compositions::GuiCellComposition* __vwsn_precompile_29;
::vl::Ptr<::vl::presentation::controls::list::ListViewColumn> __vwsn_precompile_30;
::vl::Ptr<::vl::presentation::controls::list::ListViewColumn> __vwsn_precompile_31;
::vl::Ptr<::vl::presentation::controls::list::ListViewColumn> __vwsn_precompile_32;
::vl::Ptr<::vl::presentation::controls::list::ListViewColumn> __vwsn_precompile_33;
::vl::Ptr<::vl::presentation::controls::list::ListViewColumn> __vwsn_precompile_34;
::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_34;
::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_35;
::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_36;
::vl::Ptr<::demo::IViewModel> __vwsn_precompile_36;
::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_37;
::vl::Ptr<::demo::IViewModel> __vwsn_precompile_38;
::vl::presentation::compositions::GuiGraphicsComposition* __vwsn_precompile_39;
void __vwsn_demo_MainWindow_Initialize(::demo::MainWindow* __vwsn_this_);
public:
MainWindowConstructor();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ namespace vl
CLASS_MEMBER_FIELD(__vwsn_precompile_35)
CLASS_MEMBER_FIELD(__vwsn_precompile_36)
CLASS_MEMBER_FIELD(__vwsn_precompile_37)
CLASS_MEMBER_FIELD(__vwsn_precompile_38)
CLASS_MEMBER_FIELD(__vwsn_precompile_39)
CLASS_MEMBER_FIELD(__vwsn_precompile_4)
CLASS_MEMBER_FIELD(__vwsn_precompile_5)
CLASS_MEMBER_FIELD(__vwsn_precompile_6)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<ScrollContainer HorizontalAlwaysVisible="false" VerticalAlwaysVisible="false">
<att.BoundsComposition-set AlignmentToParent="left:5 top:5 right:5 bottom:5"/>

<Table CellPadding="10">
<Table CellPadding="10" MinSizeLimitation="LimitToElementAndChildren">
<att.Rows>
<CellOption>composeType:MinSize</CellOption>
<CellOption>composeType:MinSize</CellOption>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,9 @@ namespace demo
::vl::__vwsn::This(this->__vwsn_precompile_74)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
}
(this->__vwsn_precompile_46 = new ::vl::presentation::compositions::GuiTableComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_46)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_46)->SetCellPadding(static_cast<::vl::vint>(10));
}
Expand Down
8 changes: 4 additions & 4 deletions Tutorial/GacUI_Controls/Dialogs/UI/Resource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
]]></ref.Ctor>
<TabPage ref.Name="self" Text="MessageDialog">
<MessageDialog ref.Name="dialog"/>
<Table CellPadding="5" BorderVisible="true" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<Table CellPadding="5" BorderVisible="true" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
<att.Rows>
<_>composeType:MinSize</_>
<_>composeType:MinSize</_>
Expand Down Expand Up @@ -196,7 +196,7 @@
<Instance ref.CodeBehind="false" ref.Class="demo::LocalizedColorDialogTabPage">
<TabPage ref.Name="self" Text="ColorDialog">
<ColorDialog ref.Name="dialog" EnabledCustomColor="true"/>
<Table CellPadding="5" BorderVisible="true" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<Table CellPadding="5" BorderVisible="true" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
<att.Rows>
<_>composeType:Absolute absolute:30</_>
<_>composeType:MinSize</_>
Expand Down Expand Up @@ -232,7 +232,7 @@
<Instance ref.CodeBehind="false" ref.Class="demo::LocalizedFontDialogTabPage">
<TabPage ref.Name="self" Text="FontDialog">
<FontDialog ref.Name="dialog" ForceFontExist="true"/>
<Table CellPadding="5" BorderVisible="true" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<Table CellPadding="5" BorderVisible="true" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
<att.Rows>
<_>composeType:MinSize</_>
<_>composeType:MinSize</_>
Expand Down Expand Up @@ -302,7 +302,7 @@
<SaveFileDialog ref.Name="dialogSave"/>
<Stack Direction="Vertical" Padding="5" AlignmentToParent="left:5 top:5 right:5 bottom:5" MinSizeLimitation="LimitToElementAndChildren">
<StackItem>
<Table CellPadding="5" BorderVisible="false" AlignmentToParent="left:0 top:0 right:0 bottom:0">
<Table CellPadding="5" BorderVisible="false" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
<att.Rows>
<_>composeType:MinSize</_>
<_>composeType:MinSize</_>
Expand Down
28 changes: 20 additions & 8 deletions Tutorial/GacUI_Controls/Dialogs/UI/Source/DemoPartialClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ namespace demo
::vl::__vwsn::This(this->self)->AddComponent(static_cast<::vl::presentation::controls::GuiComponent*>(this->dialog));
}
(this->__vwsn_precompile_0 = new ::vl::presentation::compositions::GuiTableComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetBorderVisible(true);
}
Expand Down Expand Up @@ -311,20 +314,23 @@ Class (::demo::LocalizedFileDialogTabPageConstructor)
::vl::__vwsn::This(this->self)->AddComponent(static_cast<::vl::presentation::controls::GuiComponent*>(this->dialogSave));
}
(this->__vwsn_precompile_0 = new ::vl::presentation::compositions::GuiStackComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetPadding(static_cast<::vl::vint>(5));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetDirection(::vl::presentation::compositions::GuiStackComposition::Direction::Vertical);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
}
(this->__vwsn_precompile_1 = new ::vl::presentation::compositions::GuiStackItemComposition());
(this->__vwsn_precompile_2 = new ::vl::presentation::compositions::GuiTableComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_2)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_2)->SetBorderVisible(false);
}
Expand Down Expand Up @@ -570,10 +576,10 @@ Class (::demo::LocalizedFileDialogTabPageConstructor)
}
(this->__vwsn_precompile_28 = new ::vl::presentation::compositions::GuiStackComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_28)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
::vl::__vwsn::This(this->__vwsn_precompile_28)->SetDirection(::vl::presentation::compositions::GuiStackComposition::Direction::Vertical);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_28)->SetDirection(::vl::presentation::compositions::GuiStackComposition::Direction::Vertical);
::vl::__vwsn::This(this->__vwsn_precompile_28)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_28)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
Expand Down Expand Up @@ -745,15 +751,15 @@ Class (::demo::LocalizedFileDialogTabPageConstructor)
}
(this->__vwsn_precompile_42 = new ::vl::presentation::compositions::GuiStackItemComposition());
(this->__vwsn_precompile_43 = new ::vl::presentation::compositions::GuiStackComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_43)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_43)->SetPadding(static_cast<::vl::vint>(5));
}
{
::vl::__vwsn::This(this->__vwsn_precompile_43)->SetDirection(::vl::presentation::compositions::GuiStackComposition::Direction::Horizontal);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_43)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_43)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
}
Expand Down Expand Up @@ -960,6 +966,9 @@ Class (::demo::LocalizedFontDialogTabPageConstructor)
::vl::__vwsn::This(this->self)->AddComponent(static_cast<::vl::presentation::controls::GuiComponent*>(this->dialog));
}
(this->__vwsn_precompile_0 = new ::vl::presentation::compositions::GuiTableComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetBorderVisible(true);
}
Expand Down Expand Up @@ -1087,6 +1096,9 @@ Class (::demo::LocalizedMessageDialogTabPageConstructor)
::vl::__vwsn::This(this->self)->AddComponent(static_cast<::vl::presentation::controls::GuiComponent*>(this->dialog));
}
(this->__vwsn_precompile_0 = new ::vl::presentation::compositions::GuiTableComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
}
{
::vl::__vwsn::This(this->__vwsn_precompile_0)->SetBorderVisible(true);
}
Expand Down
6 changes: 3 additions & 3 deletions Tutorial/GacUI_Layout/Alignment/UI/Resource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<Instance name="MainWindowResource">
<Instance ref.CodeBehind="false" ref.Class="demo::MainWindow">
<Window Text="Alignment" ClientSize="x:480 y:320">
<att.ContainerComposition-set PreferredMinSize="x:480 y:320" InternalMargin="left:5 top:5 right:5 bottom:5"/>
<att.ContainerComposition-set PreferredMinSize="x:480 y:320"/>
<Button Text="Button">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:-1 bottom:-1" PreferredMinSize="x:100 y:30"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:5 right:-1 bottom:-1" PreferredMinSize="x:100 y:30"/>
</Button>
<Button Text="Button">
<att.BoundsComposition-set AlignmentToParent="left:-1 top:0 right:0 bottom:-1" PreferredMinSize="x:100 y:30"/>
<att.BoundsComposition-set AlignmentToParent="left:-1 top:5 right:0 bottom:-1" PreferredMinSize="x:100 y:30"/>
</Button>
<Button Text="Button">
<att.BoundsComposition-set AlignmentToParent="left:0 top:-1 right:0 bottom:0" PreferredMinSize="x:100 y:30"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ namespace demo
{
(this->__vwsn_precompile_0 = __vwsn_this_);
(this->__vwsn_precompile_7 = ::vl::__vwsn::This(this->__vwsn_precompile_0)->GetContainerComposition());
{
::vl::__vwsn::This(this->__vwsn_precompile_7)->SetInternalMargin([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
}
{
::vl::__vwsn::This(this->__vwsn_precompile_7)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(480); __vwsn_temp__.y = static_cast<::vl::vint>(320); return __vwsn_temp__; }());
}
Expand All @@ -81,7 +78,7 @@ namespace demo
::vl::__vwsn::This(this->__vwsn_precompile_2)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(100); __vwsn_temp__.y = static_cast<::vl::vint>(30); return __vwsn_temp__; }());
}
{
::vl::__vwsn::This(this->__vwsn_precompile_2)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = (- static_cast<::vl::vint>(1)); __vwsn_temp__.bottom = (- static_cast<::vl::vint>(1)); return __vwsn_temp__; }());
::vl::__vwsn::This(this->__vwsn_precompile_2)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = (- static_cast<::vl::vint>(1)); __vwsn_temp__.bottom = (- static_cast<::vl::vint>(1)); return __vwsn_temp__; }());
}
{
::vl::__vwsn::This(this->__vwsn_precompile_1)->SetText(::vl::WString::Unmanaged(L"Button"));
Expand All @@ -97,7 +94,7 @@ namespace demo
::vl::__vwsn::This(this->__vwsn_precompile_4)->SetPreferredMinSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(100); __vwsn_temp__.y = static_cast<::vl::vint>(30); return __vwsn_temp__; }());
}
{
::vl::__vwsn::This(this->__vwsn_precompile_4)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = (- static_cast<::vl::vint>(1)); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = (- static_cast<::vl::vint>(1)); return __vwsn_temp__; }());
::vl::__vwsn::This(this->__vwsn_precompile_4)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = (- static_cast<::vl::vint>(1)); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = (- static_cast<::vl::vint>(1)); return __vwsn_temp__; }());
}
{
::vl::__vwsn::This(this->__vwsn_precompile_3)->SetText(::vl::WString::Unmanaged(L"Button"));
Expand Down
2 changes: 1 addition & 1 deletion Tutorial/GacUI_Layout/Responsive2/UI/Resource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<Instance ref.CodeBehind="false" ref.Class="demo::VideoItemTemplate">
<ref.Parameter Name="ViewModel" Class="demo::VideoViewModel"/>
<ControlTemplate ref.Name="self" MinSizeLimitation="LimitToElementAndChildren">
<Table AlignmentToParent="left:0 top:0 right:0 bottom:0" CellPadding="5">
<Table AlignmentToParent="left:0 top:0 right:0 bottom:0" CellPadding="5" MinSizeLimitation="LimitToElementAndChildren">
<att.Rows>
<CellOption>composeType:MinSize</CellOption>
<CellOption>composeType:MinSize</CellOption>
Expand Down
Loading

0 comments on commit 56eaa70

Please sign in to comment.