Update release

Import/GacUICompiler.cpp

@@ -8431,6 +8431,10 @@ GuiCompositionInstanceLoader
 						info->acceptableTypes.Add(TypeInfoRetriver<GuiControl*>::CreateTypeInfo());
 						info->acceptableTypes.Add(TypeInfoRetriver<GuiGraphicsComposition*>::CreateTypeInfo());
 						info->acceptableTypes.Add(TypeInfoRetriver<Ptr<IGuiGraphicsElement>>::CreateTypeInfo());
+						if (propertyInfo.typeInfo.typeInfo->GetTypeDescriptor()->CanConvertTo(description::GetTypeDescriptor<GuiInstanceRootObject>()))
+						{
+							info->acceptableTypes.Add(TypeInfoRetriver<GuiComponent*>::CreateTypeInfo());
+						}
 						return info;
 					}
 					return IGuiInstanceLoader::GetPropertyType(propertyInfo);
@@ -8449,7 +8453,22 @@ GuiCompositionInstanceLoader
 							auto td = values[0].typeInfo->GetTypeDescriptor();
 
 							Ptr<WfExpression> expr;
-							if (td->CanConvertTo(description::GetTypeDescriptor<IGuiGraphicsElement>()))
+							if (td->CanConvertTo(description::GetTypeDescriptor<GuiComponent>()))
+							{
+								auto refControl = MakePtr<WfReferenceExpression>();
+								refControl->name.value = variableName.ToString();
+
+								auto refAddComponent = MakePtr<WfMemberExpression>();
+								refAddComponent->parent = refControl;
+								refAddComponent->name.value = L"AddComponent";
+
+								auto call = MakePtr<WfCallExpression>();
+								call->function = refAddComponent;
+								call->arguments.Add(value);
+
+								expr = call;
+							}
+							else if (td->CanConvertTo(description::GetTypeDescriptor<IGuiGraphicsElement>()))
 							{
 								auto refComposition = MakePtr<WfReferenceExpression>();
 								refComposition->name.value = variableName.ToString();
@@ -9937,18 +9956,24 @@ namespace vl
 		{
 
 /***********************************************************************
-GuiTemplateInstanceLoader
+GuiCommonDatePickerLookLoader
 ***********************************************************************/
 
-			class GuiTemplateInstanceLoader : public Object, public IGuiInstanceLoader
+			class GuiCommonDatePickerLookLoader : public Object, public IGuiInstanceLoader
 			{
 			protected:
 				GlobalStringKey					typeName;
+				GlobalStringKey					_BackgroundColor;
+				GlobalStringKey					_PrimaryTextColor;
+				GlobalStringKey					_SecondaryTextColor;
 
 			public:
-				GuiTemplateInstanceLoader()
+				GuiCommonDatePickerLookLoader()
 				{
-					typeName = GlobalStringKey::Get(description::TypeInfo<GuiTemplate>::content.typeName);
+					typeName = GlobalStringKey::Get(description::TypeInfo<GuiCommonDatePickerLook>::content.typeName);
+					_BackgroundColor = GlobalStringKey::Get(L"BackgroundColor");
+					_PrimaryTextColor = GlobalStringKey::Get(L"PrimaryTextColor");
+					_SecondaryTextColor = GlobalStringKey::Get(L"SecondaryTextColor");
 				}
 
 				GlobalStringKey GetTypeName()override
@@ -9958,35 +9983,145 @@ GuiTemplateInstanceLoader
 
 				void GetRequiredPropertyNames(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
 				{
-					List<ITypeDescriptor*> tds;
+					if (CanCreate(typeInfo))
-					tds.Add(typeInfo.typeInfo->GetTypeDescriptor());
-
-					for (vint i = 0; i < tds.Count(); i++)
 					{
-						auto td = tds[i];
+						propertyNames.Add(_BackgroundColor);
-						if (td != description::GetTypeDescriptor<GuiWindowTemplate>())
+						propertyNames.Add(_PrimaryTextColor);
-						{
+						propertyNames.Add(_SecondaryTextColor);
-							vint propCount = td->GetPropertyCount();
+					}
-							for (vint i = 0; i < propCount; i++)
+				}
-							{
-								auto prop = td->GetProperty(i);
-								if (prop->IsWritable() && INVLOC.EndsWith(prop->GetName(), L"Template", Locale::None))
-								{
-									propertyNames.Add(GlobalStringKey::Get(prop->GetName()));
-								}
-							}
 
-							vint baseCount = td->GetBaseTypeDescriptorCount();
+				void GetPropertyNames(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
-							for (vint i = 0; i < baseCount; i++)
+				{
-							{
+					GetRequiredPropertyNames(typeInfo, propertyNames);
-								auto baseTd = td->GetBaseTypeDescriptor(i);
+				}
-								if (!tds.Contains(baseTd))
+
-								{
+				Ptr<GuiInstancePropertyInfo> GetPropertyType(const PropertyInfo& propertyInfo)override
-									tds.Add(baseTd);
+				{
-								}
+					if (propertyInfo.propertyName == _BackgroundColor || propertyInfo.propertyName == _PrimaryTextColor || propertyInfo.propertyName == _SecondaryTextColor)
-							}
+					{
+						auto info = GuiInstancePropertyInfo::Assign(TypeInfoRetriver<Color>::CreateTypeInfo());
+						info->usage = GuiInstancePropertyInfo::ConstructorArgument;
+						return info;
+					}
+					return IGuiInstanceLoader::GetPropertyType(propertyInfo);
+				}
+
+				bool CanCreate(const TypeInfo& typeInfo)
+				{
+					return typeInfo.typeName == typeName;
+				}
+
+				Ptr<workflow::WfStatement> CreateInstance(GuiResourcePrecompileContext& precompileContext, types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, GuiResourceTextPos tagPosition, GuiResourceError::List& errors)
+				{
+					if (CanCreate(typeInfo))
+					{
+						vint indexBackgroundColor = arguments.Keys().IndexOf(_BackgroundColor);
+						vint indexPrimaryTextColor = arguments.Keys().IndexOf(_PrimaryTextColor);
+						vint indexSecondaryTextColor = arguments.Keys().IndexOf(_SecondaryTextColor);
+						if (indexBackgroundColor != -1 && indexPrimaryTextColor != -1 && indexSecondaryTextColor != -1)
+						{
+							auto type = TypeInfoRetriver<GuiCommonDatePickerLook*>::CreateTypeInfo();
+							auto createExpr = MakePtr<WfNewClassExpression>();
+							createExpr->type = GetTypeFromTypeInfo(type.Obj());
+							createExpr->arguments.Add(arguments.GetByIndex(indexBackgroundColor)[0].expression);
+							createExpr->arguments.Add(arguments.GetByIndex(indexPrimaryTextColor)[0].expression);
+							createExpr->arguments.Add(arguments.GetByIndex(indexSecondaryTextColor)[0].expression);
+
+							auto refVariable = MakePtr<WfReferenceExpression>();
+							refVariable->name.value = variableName.ToString();
+
+							auto assignExpr = MakePtr<WfBinaryExpression>();
+							assignExpr->op = WfBinaryOperator::Assign;
+							assignExpr->first = refVariable;
+							assignExpr->second = createExpr;
+
+							auto assignStat = MakePtr<WfExpressionStatement>();
+							assignStat->expression = assignExpr;
+							return assignStat;
 						}
 					}
+					return nullptr;
+				}
+			};
+
+/***********************************************************************
+GuiCommonScrollViewLookLoader
+***********************************************************************/
+
+			class GuiCommonScrollViewLookLoader : public Object, public IGuiInstanceLoader
+			{
+			protected:
+				GlobalStringKey					typeName;
+				GlobalStringKey					_DefaultScrollSize;
+
+			public:
+				GuiCommonScrollViewLookLoader()
+				{
+					typeName = GlobalStringKey::Get(description::TypeInfo<GuiCommonScrollViewLook>::content.typeName);
+					_DefaultScrollSize = GlobalStringKey::Get(L"DefaultScrollSize");
+				}
+
+				GlobalStringKey GetTypeName()override
+				{
+					return typeName;
+				}
+
+				void GetRequiredPropertyNames(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
+				{
+					if (CanCreate(typeInfo))
+					{
+						propertyNames.Add(_DefaultScrollSize);
+					}
+				}
+
+				void GetPropertyNames(const TypeInfo& typeInfo, collections::List<GlobalStringKey>& propertyNames)override
+				{
+					GetRequiredPropertyNames(typeInfo, propertyNames);
+				}
+
+				Ptr<GuiInstancePropertyInfo> GetPropertyType(const PropertyInfo& propertyInfo)override
+				{
+					if (propertyInfo.propertyName == _DefaultScrollSize)
+					{
+						auto info = GuiInstancePropertyInfo::Assign(TypeInfoRetriver<vint>::CreateTypeInfo());
+						info->usage = GuiInstancePropertyInfo::ConstructorArgument;
+						return info;
+					}
+					return IGuiInstanceLoader::GetPropertyType(propertyInfo);
+				}
+
+				bool CanCreate(const TypeInfo& typeInfo)
+				{
+					return typeInfo.typeName == typeName;
+				}
+
+				Ptr<workflow::WfStatement> CreateInstance(GuiResourcePrecompileContext& precompileContext, types::ResolvingResult& resolvingResult, const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, GuiResourceTextPos tagPosition, GuiResourceError::List& errors)
+				{
+					if (CanCreate(typeInfo))
+					{
+						vint indexDefaultScrollSize = arguments.Keys().IndexOf(_DefaultScrollSize);
+						if (indexDefaultScrollSize != -1)
+						{
+							auto type = TypeInfoRetriver<GuiCommonScrollViewLook*>::CreateTypeInfo();
+							auto createExpr = MakePtr<WfNewClassExpression>();
+							createExpr->type = GetTypeFromTypeInfo(type.Obj());
+							createExpr->arguments.Add(arguments.GetByIndex(indexDefaultScrollSize)[0].expression);
+
+							auto refVariable = MakePtr<WfReferenceExpression>();
+							refVariable->name.value = variableName.ToString();
+
+							auto assignExpr = MakePtr<WfBinaryExpression>();
+							assignExpr->op = WfBinaryOperator::Assign;
+							assignExpr->first = refVariable;
+							assignExpr->second = createExpr;
+
+							auto assignStat = MakePtr<WfExpressionStatement>();
+							assignStat->expression = assignExpr;
+							return assignStat;
+						}
+					}
+					return nullptr;
 				}
 			};
 
@@ -9996,7 +10131,8 @@ Initialization
 
 			void LoadTemplates(IGuiInstanceLoaderManager* manager)
 			{
-				manager->SetLoader(new GuiTemplateInstanceLoader);
+				manager->SetLoader(new GuiCommonDatePickerLookLoader);
+				manager->SetLoader(new GuiCommonScrollViewLookLoader);
 			}
 		}
 	}

Import/GacUIReflection.cpp

@@ -897,6 +897,7 @@ Type Declaration
 				CLASS_MEMBER_PROPERTY_FAST(Visible)
 				CLASS_MEMBER_PROPERTY_FAST(MinSizeLimitation)
 				CLASS_MEMBER_PROPERTY_READONLY_FAST(GlobalBounds)
+				CLASS_MEMBER_PROPERTY_FAST(TransparentToMouse)
 				CLASS_MEMBER_PROPERTY_READONLY_FAST(AssociatedControl)
 				CLASS_MEMBER_PROPERTY_FAST(AssociatedCursor)
 				CLASS_MEMBER_PROPERTY_FAST(AssociatedHitTestResult)
@@ -919,7 +920,7 @@ Type Declaration
 				CLASS_MEMBER_METHOD(RemoveChild, {L"child"})
 				CLASS_MEMBER_METHOD(MoveChild, {L"child" _ L"newIndex"})
 				CLASS_MEMBER_METHOD(Render, {L"size"})
-				CLASS_MEMBER_METHOD(FindComposition, {L"location"})
+				CLASS_MEMBER_METHOD(FindComposition, {L"location" _ L"forMouseEvent"})
 				CLASS_MEMBER_METHOD(ForceCalculateSizeImmediately, NO_PARAMETER)
 				CLASS_MEMBER_METHOD(IsSizeAffectParent, NO_PARAMETER)
 			END_CLASS_MEMBER(GuiGraphicsComposition)
@@ -1695,6 +1696,7 @@ Type Declaration
 				CLASS_MEMBER_METHOD(DetachListControl, NO_PARAMETER)
 				CLASS_MEMBER_METHOD(GetVisibleStyle, {L"itemIndex"})
 				CLASS_MEMBER_METHOD(GetVisibleIndex, {L"style"})
+				CLASS_MEMBER_METHOD(ReloadVisibleStyles, NO_PARAMETER)
 				CLASS_MEMBER_METHOD(OnViewChanged, {L"bounds"})
 				CLASS_MEMBER_METHOD(FindItem, {L"itemIndex" _ L"key"})
 				CLASS_MEMBER_METHOD(EnsureItemVisible, {L"itemIndex"})
@@ -3132,11 +3134,6 @@ Type Declaration
 				CLASS_MEMBER_METHOD(NotifyDateSelected, NO_PARAMETER)
 			END_INTERFACE_MEMBER(IDatePickerCommandExecutor)
 
-			BEGIN_INTERFACE_MEMBER_NOPROXY(IScrollViewCommandExecutor)
-				CLASS_MEMBER_BASE(IDescriptable)
-				CLASS_MEMBER_METHOD(CalculateView, NO_PARAMETER)
-			END_INTERFACE_MEMBER(IScrollViewCommandExecutor)
-
 			BEGIN_CLASS_MEMBER(GuiComponent)
 			END_CLASS_MEMBER(GuiComponent)
 
@@ -3167,7 +3164,6 @@ Type Declaration
 				CLASS_MEMBER_BASE(BASE)\
 				CLASS_MEMBER_CONSTRUCTOR(NAME*(), NO_PARAMETER)\
 				NAME ## _PROPERTIES(GUI_TEMPLATE_PROPERTY_REFLECTION)\
-				CLASS_MEMBER_METHOD(Initialize, NO_PARAMETER)\
 			END_CLASS_MEMBER(NAME)\
 
 			GUI_CONTROL_TEMPLATE(GuiControlTemplate, GuiTemplate)
@@ -3184,35 +3180,13 @@ Type Declaration
 			GUI_CONTROL_TEMPLATE(GuiListViewColumnHeaderTemplate, GuiToolstripButtonTemplate)
 			GUI_CONTROL_TEMPLATE(GuiComboBoxTemplate, GuiToolstripButtonTemplate)
 			GUI_CONTROL_TEMPLATE(GuiScrollTemplate, GuiControlTemplate)
-
+			GUI_CONTROL_TEMPLATE(GuiScrollViewTemplate, GuiControlTemplate)
-			BEGIN_CLASS_MEMBER(GuiScrollViewTemplate)
-				CLASS_MEMBER_BASE(GuiControlTemplate)
-				CLASS_MEMBER_CONSTRUCTOR(GuiScrollViewTemplate*(), NO_PARAMETER)
-
-				GuiScrollViewTemplate_PROPERTIES(GUI_TEMPLATE_PROPERTY_REFLECTION)
-
-				CLASS_MEMBER_METHOD(AdjustView, {L"fullSize"})
-				CLASS_MEMBER_PROPERTY_READONLY_FAST(HorizontalScroll)
-				CLASS_MEMBER_PROPERTY_READONLY_FAST(VerticalScroll)
-				CLASS_MEMBER_PROPERTY_FAST(HorizontalAlwaysVisible)
-				CLASS_MEMBER_PROPERTY_FAST(VerticalAlwaysVisible)
-			END_CLASS_MEMBER(GuiScrollViewTemplate)
-
 			GUI_CONTROL_TEMPLATE(GuiListControlTemplate, GuiScrollViewTemplate)
 			GUI_CONTROL_TEMPLATE(GuiTextListTemplate, GuiListControlTemplate)
 			GUI_CONTROL_TEMPLATE(GuiListViewTemplate, GuiListControlTemplate)
 			GUI_CONTROL_TEMPLATE(GuiTreeViewTemplate, GuiListControlTemplate)
 			GUI_CONTROL_TEMPLATE(GuiTabTemplate, GuiControlTemplate)
-
+			GUI_CONTROL_TEMPLATE(GuiDatePickerTemplate, GuiControlTemplate)
-			BEGIN_CLASS_MEMBER(GuiDatePickerTemplate)
-				CLASS_MEMBER_BASE(GuiControlTemplate)
-				CLASS_MEMBER_CONSTRUCTOR(GuiDatePickerTemplate*(), NO_PARAMETER)
-
-				GuiDatePickerTemplate_PROPERTIES(GUI_TEMPLATE_PROPERTY_REFLECTION)
-				CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(DateLocale)
-				CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(Date)
-			END_CLASS_MEMBER(GuiDatePickerTemplate)
-
 			GUI_CONTROL_TEMPLATE(GuiDateComboBoxTemplate, GuiComboBoxTemplate)
 			GUI_CONTROL_TEMPLATE(GuiListItemTemplate, GuiTemplate)
 			GUI_CONTROL_TEMPLATE(GuiTextListItemTemplate, GuiListItemTemplate)
@@ -3221,6 +3195,45 @@ Type Declaration
 			GUI_CONTROL_TEMPLATE(GuiGridVisualizerTemplate, GuiGridCellTemplate)
 			GUI_CONTROL_TEMPLATE(GuiGridEditorTemplate, GuiGridCellTemplate)
 
+			BEGIN_CLASS_MEMBER(GuiCommonDatePickerLook)
+				CLASS_MEMBER_BASE(GuiTemplate)
+				CLASS_MEMBER_CONSTRUCTOR(GuiCommonDatePickerLook*(Color, Color, Color), { L"backgroundColor" _ L"primaryTextColor" _ L"secondaryTextColor" })
+
+				CLASS_MEMBER_PROPERTY_FAST(Commands)
+				CLASS_MEMBER_PROPERTY_FAST(DateButtonTemplate)
+				CLASS_MEMBER_PROPERTY_FAST(DateTextListTemplate)
+				CLASS_MEMBER_PROPERTY_FAST(DateComboBoxTemplate)
+				CLASS_MEMBER_PROPERTY_FAST(DateLocale)
+				CLASS_MEMBER_PROPERTY_GUIEVENT_FAST(Date)
+				CLASS_MEMBER_PROPERTY_FAST(Font)
+			END_CLASS_MEMBER(GuiCommonDatePickerLook)
+
+			BEGIN_CLASS_MEMBER(GuiCommonScrollViewLook)
+				CLASS_MEMBER_BASE(GuiTemplate)
+				CLASS_MEMBER_CONSTRUCTOR(GuiCommonScrollViewLook*(vint), { L"defaultScrollSize" })
+				
+				CLASS_MEMBER_PROPERTY_FAST(HScrollTemplate)
+				CLASS_MEMBER_PROPERTY_FAST(VScrollTemplate)
+				CLASS_MEMBER_PROPERTY_READONLY_FAST(HScroll)
+				CLASS_MEMBER_PROPERTY_READONLY_FAST(VScroll)
+				CLASS_MEMBER_PROPERTY_READONLY_FAST(ContainerComposition)
+			END_CLASS_MEMBER(GuiCommonScrollViewLook)
+
+			BEGIN_CLASS_MEMBER(GuiCommonScrollBehavior)
+				CLASS_MEMBER_BASE(GuiComponent)
+				CLASS_MEMBER_CONSTRUCTOR(GuiCommonScrollBehavior*(), NO_PARAMETER)
+				
+				CLASS_MEMBER_METHOD(AttachScrollTemplate, { L"value" })
+				CLASS_MEMBER_METHOD(AttachDecreaseButton, { L"button" })
+				CLASS_MEMBER_METHOD(AttachIncreaseButton, { L"button" })
+				CLASS_MEMBER_METHOD(AttachHorizontalPartialView, { L"partialView" })
+				CLASS_MEMBER_METHOD(AttachVerticalPartialView, { L"partialView" })
+				CLASS_MEMBER_METHOD(AttachHorizontalTrackerHandle, { L"handle" })
+				CLASS_MEMBER_METHOD(AttachVerticalTrackerHandle, { L"handle" })
+				CLASS_MEMBER_METHOD(GetHorizontalTrackerHandlerPosition, { L"handle" _ L"totalSize" _ L"pageSize" _ L"position" })
+				CLASS_MEMBER_METHOD(GetVerticalTrackerHandlerPosition, { L"handle" _ L"totalSize" _ L"pageSize" _ L"position" })
+			END_CLASS_MEMBER(GuiCommonScrollBehavior)
+
 #undef GUI_CONTROL_TEMPLATE
 #undef GUI_TEMPLATE_PROPERTY_REFLECTION
 #undef _

Import/GacUIReflection.h

@@ -262,7 +262,6 @@ Type List (Templates)
 			F(presentation::controls::IScrollCommandExecutor)\
 			F(presentation::controls::ITabCommandExecutor)\
 			F(presentation::controls::IDatePickerCommandExecutor)\
-			F(presentation::controls::IScrollViewCommandExecutor)\
 			F(presentation::controls::GuiComponent)\
 			F(presentation::controls::GuiInstanceRootObject)\
 			F(presentation::templates::GuiTemplate)\
@@ -294,6 +293,9 @@ Type List (Templates)
 			F(presentation::templates::GuiGridCellTemplate)\
 			F(presentation::templates::GuiGridVisualizerTemplate)\
 			F(presentation::templates::GuiGridEditorTemplate)\
+			F(presentation::templates::GuiCommonDatePickerLook)\
+			F(presentation::templates::GuiCommonScrollViewLook)\
+			F(presentation::templates::GuiCommonScrollBehavior)\
 
 /***********************************************************************
 Type List (Controls)
@@ -784,6 +786,11 @@ Interface Proxy (Controls)
 					INVOKEGET_INTERFACE_PROXY(GetVisibleIndex, style);
 				}
 
+				void ReloadVisibleStyles()override
+				{
+					INVOKE_INTERFACE_PROXY_NOPARAMS(ReloadVisibleStyles);
+				}
+
 				void OnViewChanged(presentation::Rect bounds)override
 				{
 					INVOKE_INTERFACE_PROXY(OnViewChanged, bounds);

Import/Skins/DarkSkin/DarkSkinReflection.cpp

@@ -39,7 +39,6 @@ namespace vl
 		namespace description
 		{
 #ifndef VCZH_DEBUG_NO_REFLECTION
-			IMPL_CPP_TYPE_INFO(ScrollTemplateScript)
 			IMPL_CPP_TYPE_INFO(darkskin::BottomScrollButtonTemplate)
 			IMPL_CPP_TYPE_INFO(darkskin::BottomScrollButtonTemplateConstructor)
 			IMPL_CPP_TYPE_INFO(darkskin::ButtonTemplate)
@@ -140,11 +139,6 @@ namespace vl
 			IMPL_CPP_TYPE_INFO(darkskin::WindowTemplateConstructor)
 
 #define _ ,
-			BEGIN_CLASS_MEMBER(::ScrollTemplateScript)
-				CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::ScrollTemplateScript>(), NO_PARAMETER)
-				CLASS_MEMBER_STATIC_METHOD(SetScroll, { L"totalPixels" _ L"newOffset" _ L"scrollTemplate" })
-			END_CLASS_MEMBER(::ScrollTemplateScript)
-
 			BEGIN_CLASS_MEMBER(::darkskin::BottomScrollButtonTemplate)
 				CLASS_MEMBER_CONSTRUCTOR(::darkskin::BottomScrollButtonTemplate*(), NO_PARAMETER)
 			END_CLASS_MEMBER(::darkskin::BottomScrollButtonTemplate)
@@ -243,6 +237,7 @@ namespace vl
 			BEGIN_CLASS_MEMBER(::darkskin::DatePickerTemplateConstructor)
 				CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::darkskin::DatePickerTemplateConstructor>(), NO_PARAMETER)
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
+				CLASS_MEMBER_FIELD(look)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::DatePickerTemplateConstructor)
 
@@ -278,7 +273,8 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
-				CLASS_MEMBER_FIELD(container)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
+				CLASS_MEMBER_FIELD(look)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::DocumentViewerTemplateConstructor)
 
@@ -330,8 +326,7 @@ namespace vl
 
 			BEGIN_CLASS_MEMBER(::darkskin::HScrollTemplate)
 				CLASS_MEMBER_CONSTRUCTOR(::darkskin::HScrollTemplate*(), NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingHandle)
+				CLASS_MEMBER_METHOD(__vwsn_instance_ctor_, NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingStartLocation)
 			END_CLASS_MEMBER(::darkskin::HScrollTemplate)
 
 			BEGIN_CLASS_MEMBER(::darkskin::HScrollTemplateConstructor)
@@ -339,25 +334,22 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_10)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_3)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_4)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_5)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_6)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_7)
+				CLASS_MEMBER_FIELD(behavior)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_8)
+				CLASS_MEMBER_FIELD(buttonDecrease)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_9)
+				CLASS_MEMBER_FIELD(buttonIncrease)
 				CLASS_MEMBER_FIELD(handle)
 				CLASS_MEMBER_FIELD(handleContainer)
-				CLASS_MEMBER_FIELD(invalidContainer)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::HScrollTemplateConstructor)
 
 			BEGIN_CLASS_MEMBER(::darkskin::HTrackerTemplate)
 				CLASS_MEMBER_CONSTRUCTOR(::darkskin::HTrackerTemplate*(), NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingHandle)
+				CLASS_MEMBER_METHOD(__vwsn_instance_ctor_, NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingStartLocation)
 			END_CLASS_MEMBER(::darkskin::HTrackerTemplate)
 
 			BEGIN_CLASS_MEMBER(::darkskin::HTrackerTemplateConstructor)
@@ -371,8 +363,8 @@ namespace vl
 				CLASS_MEMBER_FIELD(__vwsn_precompile_5)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_6)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_7)
+				CLASS_MEMBER_FIELD(behavior)
 				CLASS_MEMBER_FIELD(handle)
-				CLASS_MEMBER_FIELD(invalidContainer)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::HTrackerTemplateConstructor)
 
@@ -421,6 +413,11 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_10)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_11)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_12)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_13)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_14)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_3)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_4)
@@ -430,6 +427,7 @@ namespace vl
 				CLASS_MEMBER_FIELD(__vwsn_precompile_8)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_9)
 				CLASS_MEMBER_FIELD(buttonArrow)
+				CLASS_MEMBER_FIELD(container)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::ListViewColumnHeaderTemplateConstructor)
 
@@ -442,7 +440,8 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
-				CLASS_MEMBER_FIELD(container)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
+				CLASS_MEMBER_FIELD(look)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::ListViewTemplateConstructor)
 
@@ -503,7 +502,8 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
-				CLASS_MEMBER_FIELD(container)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
+				CLASS_MEMBER_FIELD(look)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::MultilineTextBoxTemplateConstructor)
 
@@ -567,6 +567,7 @@ namespace vl
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
+				CLASS_MEMBER_FIELD(look)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::ScrollViewTemplateConstructor)
 
@@ -661,7 +662,8 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
-				CLASS_MEMBER_FIELD(container)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
+				CLASS_MEMBER_FIELD(look)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::TextListTemplateConstructor)
 
@@ -819,7 +821,8 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
-				CLASS_MEMBER_FIELD(container)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
+				CLASS_MEMBER_FIELD(look)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::TreeViewTemplateConstructor)
 
@@ -837,8 +840,7 @@ namespace vl
 
 			BEGIN_CLASS_MEMBER(::darkskin::VScrollTemplate)
 				CLASS_MEMBER_CONSTRUCTOR(::darkskin::VScrollTemplate*(), NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingHandle)
+				CLASS_MEMBER_METHOD(__vwsn_instance_ctor_, NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingStartLocation)
 			END_CLASS_MEMBER(::darkskin::VScrollTemplate)
 
 			BEGIN_CLASS_MEMBER(::darkskin::VScrollTemplateConstructor)
@@ -846,25 +848,22 @@ namespace vl
 				CLASS_MEMBER_METHOD(__vwsn_initialize_instance_, { L"__vwsn_this_" })
 				CLASS_MEMBER_FIELD(__vwsn_precompile_0)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_1)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_10)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_2)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_3)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_4)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_5)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_6)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_7)
+				CLASS_MEMBER_FIELD(behavior)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_8)
+				CLASS_MEMBER_FIELD(buttonDecrease)
-				CLASS_MEMBER_FIELD(__vwsn_precompile_9)
+				CLASS_MEMBER_FIELD(buttonIncrease)
 				CLASS_MEMBER_FIELD(handle)
 				CLASS_MEMBER_FIELD(handleContainer)
-				CLASS_MEMBER_FIELD(invalidContainer)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::VScrollTemplateConstructor)
 
 			BEGIN_CLASS_MEMBER(::darkskin::VTrackerTemplate)
 				CLASS_MEMBER_CONSTRUCTOR(::darkskin::VTrackerTemplate*(), NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingHandle)
+				CLASS_MEMBER_METHOD(__vwsn_instance_ctor_, NO_PARAMETER)
-				CLASS_MEMBER_FIELD(draggingStartLocation)
 			END_CLASS_MEMBER(::darkskin::VTrackerTemplate)
 
 			BEGIN_CLASS_MEMBER(::darkskin::VTrackerTemplateConstructor)
@@ -878,8 +877,8 @@ namespace vl
 				CLASS_MEMBER_FIELD(__vwsn_precompile_5)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_6)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_7)
+				CLASS_MEMBER_FIELD(behavior)
 				CLASS_MEMBER_FIELD(handle)
-				CLASS_MEMBER_FIELD(invalidContainer)
 				CLASS_MEMBER_FIELD(self)
 			END_CLASS_MEMBER(::darkskin::VTrackerTemplateConstructor)
 
@@ -925,7 +924,6 @@ namespace vl
 			public:
 				void Load(ITypeManager* manager)
 				{
-					ADD_TYPE_INFO(::ScrollTemplateScript)
 					ADD_TYPE_INFO(::darkskin::BottomScrollButtonTemplate)
 					ADD_TYPE_INFO(::darkskin::BottomScrollButtonTemplateConstructor)
 					ADD_TYPE_INFO(::darkskin::ButtonTemplate)

Import/Skins/DarkSkin/DarkSkinReflection.h

@@ -47,7 +47,6 @@ namespace vl
 		namespace description
 		{
 #ifndef VCZH_DEBUG_NO_REFLECTION
-			DECL_TYPE_INFO(::ScrollTemplateScript)
 			DECL_TYPE_INFO(::darkskin::BottomScrollButtonTemplate)
 			DECL_TYPE_INFO(::darkskin::BottomScrollButtonTemplateConstructor)
 			DECL_TYPE_INFO(::darkskin::ButtonTemplate)

Import/Vlpp.cpp

@@ -11714,6 +11714,7 @@ TypedValueSerializerProvider
 			bool TypedValueSerializerProvider<float>::Serialize(const float& input, WString& output)
 			{
 				output = ftow(input);
+				if (output == L"-0") output = L"0";
 				return true;
 			}
 
@@ -11737,6 +11738,7 @@ TypedValueSerializerProvider
 			bool TypedValueSerializerProvider<double>::Serialize(const double& input, WString& output)
 			{
 				output = ftow(input);
+				if (output == L"-0") output = L"0";
 				return true;
 			}
 

Import/Vlpp.h

@@ -5023,7 +5023,7 @@ namespace vl
 		{
 			for(vint i = 0; i < handlers.Count(); i++)
 			{
-				handlers[i]->function(ForwardValue<TArgs>(args)...);
+				handlers[i]->function(args...);
 			}
 		}
 	};

Tools/GacGen.ps1

@@ -1,8 +1,12 @@
 param (
     [String]$FileName
 )
+
+. $PSScriptRoot\StartProcess.ps1
+
 Write-Host "Compiling GacUI Resource: $FileName ..."
-Start-Process-And-Wait (("$PSScriptRoot\GacGen32.exe", "/P $FileName"), ("$PSScriptRoot\GacGen64.exe", "/P $FileName"))
+Start-Process-And-Wait (,("$PSScriptRoot\GacGen32.exe", "/P $FileName"))
+Start-Process-And-Wait (,("$PSScriptRoot\GacGen64.exe", "/P $FileName"))
 
 if (Test-Path -Path "$($FileName).log\x32\Error.txt") {
     throw "Failed to compile GacUI Resource (x86): $FileName"
@@ -25,5 +29,5 @@ Get-ChildItem -Path $x32_folder -ErrorAction SilentlyContinue | %{
 $deploy = "$($FileName).log\x32\Deploy.bat"
 if (Test-Path -Path $deploy) {
     Write-Host "    Deploying ..."
-    Start-Process-And-Wait (,($env:ComSpec, "/c `"$deploy`""))
+    Start-Process-And-Wait (,($env:ComSpec, "/c `"$deploy`"")) $true
 }

Tools/StartProcess.ps1

@@ -0,0 +1,36 @@
+function Start-Process-And-Wait([String[][]] $Pairs, [Boolean]$Inline = $false, [String]$workingDirectory = "") {
+    $processes = New-Object System.Diagnostics.Process[] $Pairs.Length
+    for ($i = 0; $i -lt $Pairs.Length; $i++) {
+        Write-Host "    Running: $($Pairs[$i][0]) $($Pairs[$i][1])" -ForegroundColor DarkGray
+
+        $arguments = @{};
+        if ($Pairs[$i][1] -ne "") {
+            $arguments.Add("ArgumentList", $Pairs[$i][1])
+        }
+        $arguments.Add("PassThru", $true)
+        $arguments.Add("NoNewWindow", $Inline)
+        if ($workingDirectory -ne "") {
+            $arguments.Add("WorkingDirectory", $workingDirectory)
+        }
+
+        $processes[$i] = Start-Process $Pairs[$i][0] @arguments
+    }
+
+    $failed = $false
+    for ($i = 0; $i -lt $Pairs.Length; $i++) {
+        $process = $processes[$i]
+        $process_handle = $process.Handle
+        $process.WaitForExit()
+        if ($process.ExitCode -ne 0) {
+            Write-Host "    Crashes($($process.ExitCode)): $($Pairs[$i][0]) $($Pairs[$i][1])" -ForegroundColor Red
+            $failed = $true
+        }
+        $process.Close()
+    }
+
+    [Console]::ResetColor()
+
+    if ($failed) {
+        throw "One or more processes crash"
+    }
+}

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/RepeatTabPage.xml

@@ -74,10 +74,13 @@
     <Table AlignmentToParent="left:0 top:0 right:0 bottom:0" CellPadding="5">
       <att.Rows>
         <_>composeType:Percentage percentage:1.0</_>
+        <_>composeType:Absolute absolute:20</_>
+        <_>composeType:Absolute absolute:20</_>
       </att.Rows>
       <att.Columns>
         <_>composeType:Percentage percentage:0.5</_>
         <_>composeType:MinSize</_>
+        <_>composeType:Absolute absolute:20</_>
       </att.Columns>
 
       <Cell Site="row:0 column:0">
@@ -181,6 +184,24 @@
           </StackItem>
         </Stack>
       </Cell>
+
+      <Cell Site="row:1 column:0 columnSpan:2">
+        <HTracker ref.Name="hTracker" TotalSize="10">
+          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+        </HTracker>
+      </Cell>
+
+      <Cell Site="row:2 column:0 columnSpan:2">
+        <ProgressBar TotalSize="10" Position-bind="hTracker.Position">
+          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+        </ProgressBar>
+      </Cell>
+
+      <Cell Site="row:0 column:2">
+        <VTracker TotalSize="5">
+          <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
+        </VTracker>
+      </Cell>
     </Table>
   </TabPage>
 </Instance>

Tutorial/GacUI_ControlTemplate/BlackSkin/UI/FullControlTest/Source/DemoReflection.cpp

@@ -593,13 +593,22 @@ namespace vl
 				CLASS_MEMBER_FIELD(__vwsn_precompile_21)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_22)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_23)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_24)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_25)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_26)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_27)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_28)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_29)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_3)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_30)
+				CLASS_MEMBER_FIELD(__vwsn_precompile_31)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_4)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_5)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_6)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_7)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_8)
 				CLASS_MEMBER_FIELD(__vwsn_precompile_9)
+				CLASS_MEMBER_FIELD(hTracker)
 				CLASS_MEMBER_FIELD(repeatFlow)
 				CLASS_MEMBER_FIELD(repeatStack)
 				CLASS_MEMBER_FIELD(self)