Update release (BlackSkin broken)

This commit is contained in:
vczh
2016-06-13 03:01:45 -07:00
parent bf0f97f1d4
commit fcb61bd585
40 changed files with 486 additions and 127 deletions
+306 -87
View File
File diff suppressed because it is too large Load Diff
+95 -13
View File
@@ -3900,6 +3900,35 @@ namespace vl
Rich Content Document (style)
***********************************************************************/
struct DocumentFontSize
{
double size = 0;
bool relative = false;
DocumentFontSize()
{
}
DocumentFontSize(double _size, bool _relative)
:size(_size)
, relative(_relative)
{
}
static DocumentFontSize Parse(const WString& value);
WString ToString()const;
bool operator==(const DocumentFontSize& value)const
{
return size == value.size && relative == value.relative;
}
bool operator!=(const DocumentFontSize& value)const
{
return size != value.size || relative != value.relative;
}
};
/// <summary>Represents a text style.</summary>
class DocumentStyleProperties : public Object, public Description<DocumentStyleProperties>
{
@@ -3907,7 +3936,7 @@ Rich Content Document (style)
/// <summary>Font face.</summary>
Nullable<WString> face;
/// <summary>Font size.</summary>
Nullable<vint> size;
Nullable<DocumentFontSize> size;
/// <summary>Font color.</summary>
Nullable<Color> color;
/// <summary>Font color.</summary>
@@ -4171,8 +4200,10 @@ Rich Content Document (model)
DocumentModel();
static void MergeStyle(Ptr<DocumentStyleProperties> style, Ptr<DocumentStyleProperties> parent);
void MergeBaselineStyle(Ptr<DocumentStyleProperties> style, const WString& styleName);
void MergeBaselineStyle(Ptr<DocumentModel> baselineDocument, const WString& styleName);
void MergeBaselineStyles(Ptr<DocumentModel> baselineDocument);
void MergeDefaultFont(const FontProperties& defaultFont);
ResolvedStyle GetStyle(Ptr<DocumentStyleProperties> sp, const ResolvedStyle& context);
ResolvedStyle GetStyle(const WString& styleName, const ResolvedStyle& context);
@@ -14548,7 +14579,9 @@ GuiDocumentCommonInterface
void AddShortcutCommand(vint key, const Func<void()>& eventHandler);
void EditTextInternal(TextPos begin, TextPos end, const Func<void(TextPos, TextPos, vint&, vint&)>& editor);
void EditStyleInternal(TextPos begin, TextPos end, const Func<void(TextPos, TextPos)>& editor);
void MergeBaselineAndDefaultFont(Ptr<DocumentModel> document);
void OnFontChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
void OnCaretNotify(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
void OnGotFocus(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
void OnLostFocus(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
@@ -17351,6 +17384,9 @@ namespace vl
/// <summary>Create a style for document label.</summary>
/// <returns>The created style.</returns>
virtual controls::GuiDocumentLabel::IStyleController* CreateDocumentLabelStyle()=0;
/// <summary>Create a style for document text box.</summary>
/// <returns>The created style.</returns>
virtual controls::GuiDocumentLabel::IStyleController* CreateDocumentTextBoxStyle()=0;
/// <summary>Create a style for list view.</summary>
/// <returns>The created style.</returns>
virtual controls::GuiListView::IStyleProvider* CreateListViewStyle()=0;
@@ -17445,8 +17481,8 @@ namespace vl
/// <returns>The current theme style factory object.</returns>
extern ITheme* GetCurrentTheme();
/// <summary>Set the current theme style factory object.</summary>
/// <param name="theam">The current theme style factory object.</param>
extern void SetCurrentTheme(ITheme* theam);
/// <param name="theme">The current theme style factory object.</param>
extern void SetCurrentTheme(ITheme* theme);
namespace g
{
@@ -17637,6 +17673,7 @@ Theme
elements::text::ColorEntry GetDefaultTextBoxColorEntry()override;
controls::GuiDocumentViewer::IStyleProvider* CreateDocumentViewerStyle()override;
controls::GuiDocumentLabel::IStyleController* CreateDocumentLabelStyle()override;
controls::GuiDocumentLabel::IStyleController* CreateDocumentTextBoxStyle()override;
controls::GuiListView::IStyleProvider* CreateListViewStyle()override;
controls::GuiTreeView::IStyleProvider* CreateTreeViewStyle()override;
controls::GuiSelectableButton::IStyleController* CreateListItemBackgroundStyle()override;
@@ -17724,6 +17761,7 @@ Theme
elements::text::ColorEntry GetDefaultTextBoxColorEntry()override;
controls::GuiDocumentViewer::IStyleProvider* CreateDocumentViewerStyle()override;
controls::GuiDocumentLabel::IStyleController* CreateDocumentLabelStyle()override;
controls::GuiDocumentLabel::IStyleController* CreateDocumentTextBoxStyle()override;
controls::GuiListView::IStyleProvider* CreateListViewStyle()override;
controls::GuiTreeView::IStyleProvider* CreateTreeViewStyle()override;
controls::GuiSelectableButton::IStyleController* CreateListItemBackgroundStyle()override;
@@ -20339,15 +20377,37 @@ TextBox
};
/// <summary>Document label style (Windows 7).</summary>
class Win7DocumentlabelStyle : public controls::GuiControl::EmptyStyleController, public virtual controls::GuiDocumentLabel::IStyleController, public Description<Win7DocumentlabelStyle>
class Win7DocumentLabelStyle : public controls::GuiControl::EmptyStyleController, public virtual controls::GuiDocumentLabel::IStyleController, public Description<Win7DocumentLabelStyle>
{
public:
/// <summary>Create the style.</summary>
Win7DocumentlabelStyle();
~Win7DocumentlabelStyle();
Win7DocumentLabelStyle();
~Win7DocumentLabelStyle();
Ptr<DocumentModel> GetBaselineDocument()override;
};
/// <summary>Document label style (Windows 7).</summary>
class Win7DocumentTextBoxStyle : public controls::GuiControl::EmptyStyleController, public virtual controls::GuiDocumentLabel::IStyleController, public Description<Win7DocumentTextBoxStyle>
{
protected:
Win7TextBoxBackground background;
compositions::GuiBoundsComposition* boundsComposition;
compositions::GuiGraphicsComposition* containerComposition;
public:
/// <summary>Create the style.</summary>
Win7DocumentTextBoxStyle();
~Win7DocumentTextBoxStyle();
compositions::GuiBoundsComposition* GetBoundsComposition()override;
compositions::GuiGraphicsComposition* GetContainerComposition()override;
void SetFocusableComposition(compositions::GuiGraphicsComposition* value)override;
void SetText(const WString& value)override;
void SetFont(const FontProperties& value)override;
void SetVisuallyEnabled(bool value)override;
Ptr<DocumentModel> GetBaselineDocument()override;
};
#pragma warning(pop)
}
}
@@ -21214,7 +21274,7 @@ TextBox
#pragma warning(push)
#pragma warning(disable:4250)
/// <summary>Document viewer style (Windows 7).</summary>
/// <summary>Document viewer style (Windows 8).</summary>
class Win8DocumentViewerStyle : public Win8MultilineTextBoxProvider, public virtual controls::GuiDocumentViewer::IStyleProvider, public Description<Win8DocumentViewerStyle>
{
public:
@@ -21225,16 +21285,38 @@ TextBox
Ptr<DocumentModel> GetBaselineDocument()override;
};
/// <summary>Document label style (Windows 7).</summary>
class Win8DocumentlabelStyle : public controls::GuiControl::EmptyStyleController, public virtual controls::GuiDocumentLabel::IStyleController, public Description<Win8DocumentlabelStyle>
/// <summary>Document label style (Windows 8).</summary>
class Win8DocumentLabelStyle : public controls::GuiControl::EmptyStyleController, public virtual controls::GuiDocumentLabel::IStyleController, public Description<Win8DocumentLabelStyle>
{
public:
/// <summary>Create the style.</summary>
Win8DocumentlabelStyle();
~Win8DocumentlabelStyle();
Win8DocumentLabelStyle();
~Win8DocumentLabelStyle();
Ptr<DocumentModel> GetBaselineDocument()override;
};
/// <summary>Document label style (Windows 8).</summary>
class Win8DocumentTextBoxStyle : public virtual controls::GuiDocumentLabel::IStyleController, public Description<Win8DocumentTextBoxStyle>
{
protected:
Win8TextBoxBackground background;
compositions::GuiBoundsComposition* boundsComposition;
compositions::GuiGraphicsComposition* containerComposition;
public:
/// <summary>Create the style.</summary>
Win8DocumentTextBoxStyle();
~Win8DocumentTextBoxStyle();
compositions::GuiBoundsComposition* GetBoundsComposition()override;
compositions::GuiGraphicsComposition* GetContainerComposition()override;
void SetFocusableComposition(compositions::GuiGraphicsComposition* value)override;
void SetText(const WString& value)override;
void SetFont(const FontProperties& value)override;
void SetVisuallyEnabled(bool value)override;
Ptr<DocumentModel> GetBaselineDocument()override;
};
#pragma warning(pop)
}
}
@@ -22238,7 +22320,7 @@ namespace vl
Tab
***********************************************************************/
/// <summary>Tab page header style (Windows 7).</summary>
/// <summary>Tab page header style (Windows 8).</summary>
class Win8TabPageHeaderStyle : public Win8ButtonStyleBase, public Description<Win8TabPageHeaderStyle>
{
protected:
+1
View File
@@ -5147,6 +5147,7 @@ GuiPredefinedInstanceLoadersPlugin
ADD_VIRTUAL_CONTROL (RadioButton, GuiSelectableButton, CreateRadioButtonStyle, GuiSelectableButtonTemplate );
ADD_VIRTUAL_CONTROL (HScroll, GuiScroll, CreateHScrollStyle, GuiScrollTemplate );
ADD_VIRTUAL_CONTROL (VScroll, GuiScroll, CreateVScrollStyle, GuiScrollTemplate );
ADD_VIRTUAL_CONTROL (DocumentTextBox, GuiDocumentLabel, CreateDocumentTextBoxStyle, GuiDocumentLabelTemplate );
ADD_VIRTUAL_CONTROL_F (HTracker, GuiScroll, CreateHTrackerStyle, GuiScrollTemplate, InitializeTrackerProgressBar);
ADD_VIRTUAL_CONTROL_F (VTracker, GuiScroll, CreateVTrackerStyle, GuiScrollTemplate, InitializeTrackerProgressBar);
ADD_VIRTUAL_CONTROL_F (ProgressBar, GuiScroll, CreateProgressBarStyle, GuiScrollTemplate, InitializeTrackerProgressBar);
+9 -3
View File
@@ -306,7 +306,7 @@ Instance Namespace
public:
GlobalStringKey name;
WString typeName;
WString value;\
WString value;
};
// Workflow: <instance>.<name>
@@ -992,7 +992,7 @@ GuiVrtualTypeInstanceLoader
static Ptr<WfExpression> CreateStyleMethodArgument(const WString& method, ArgumentMap& arguments)
{
vint indexControlTemplate = arguments.Keys().IndexOf(GlobalStringKey::_ControlTemplate);
if (indexControlTemplate == -1)
if (indexControlTemplate != -1)
{
auto refControlStyle = MakePtr<WfReferenceExpression>();
refControlStyle->name.value = L"<controlStyle>";
@@ -1095,6 +1095,7 @@ GuiVrtualTypeInstanceLoader
condition->type = GetTypeFromTypeInfo(viewModelType);
auto ifStat = MakePtr<WfIfStatement>();
subBlock->statements.Add(ifStat);
ifStat->expression = condition;
returnStatBlock = MakePtr<WfBlockStatement>();
@@ -1112,7 +1113,12 @@ GuiVrtualTypeInstanceLoader
{
auto refViewModel = MakePtr<WfReferenceExpression>();
refViewModel->name.value = L"<viewModel>";
createControlTemplate->arguments.Add(refViewModel);
auto cast = MakePtr<WfTypeCastingExpression>();
cast->strategy = WfTypeCastingStrategy::Strong;
cast->expression = refViewModel;
cast->type = GetTypeFromTypeInfo(viewModelType);
createControlTemplate->arguments.Add(cast);
}
auto varTemplate = MakePtr<WfVariableDeclaration>();
+28 -6
View File
@@ -214,7 +214,7 @@ namespace vl
}
/***********************************************************************
Color Serialization
Serialization (Color)
***********************************************************************/
Color TypedValueSerializerProvider<Color>::GetDefaultValue()
@@ -235,7 +235,28 @@ Color Serialization
}
/***********************************************************************
GlobalStringKey Serialization
Serialization (DocumentFontSize)
***********************************************************************/
DocumentFontSize TypedValueSerializerProvider<DocumentFontSize>::GetDefaultValue()
{
return DocumentFontSize();
}
bool TypedValueSerializerProvider<DocumentFontSize>::Serialize(const DocumentFontSize& input, WString& output)
{
output=input.ToString();
return true;
}
bool TypedValueSerializerProvider<DocumentFontSize>::Deserialize(const WString& input, DocumentFontSize& output)
{
output=DocumentFontSize::Parse(input);
return true;
}
/***********************************************************************
Serialization (GlobalStringKey)
***********************************************************************/
GlobalStringKey TypedValueSerializerProvider<GlobalStringKey>::GetDefaultValue()
@@ -1515,6 +1536,7 @@ Type Declaration
CLASS_MEMBER_METHOD(GetDefaultTextBoxColorEntry, NO_PARAMETER)
CLASS_MEMBER_METHOD(CreateDocumentViewerStyle, NO_PARAMETER)
CLASS_MEMBER_METHOD(CreateDocumentLabelStyle, NO_PARAMETER)
CLASS_MEMBER_METHOD(CreateDocumentTextBoxStyle, NO_PARAMETER)
CLASS_MEMBER_METHOD(CreateListViewStyle, NO_PARAMETER)
CLASS_MEMBER_METHOD(CreateTreeViewStyle, NO_PARAMETER)
CLASS_MEMBER_METHOD(CreateListItemBackgroundStyle, NO_PARAMETER)
@@ -2632,8 +2654,8 @@ Type Declaration
CLASS_MEMBER_PROPERTY_READONLY_FAST(CaretBegin)
CLASS_MEMBER_PROPERTY_READONLY_FAST(CaretEnd)
CLASS_MEMBER_PROPERTY_READONLY_FAST(ActiveHyperlinkReference)
CLASS_MEMBER_PROPERTY_READONLY_FAST(SelectionText)
CLASS_MEMBER_PROPERTY_READONLY_FAST(SelectionModel)
CLASS_MEMBER_PROPERTY_EVENT_FAST(SelectionText, SelectionChanged)
CLASS_MEMBER_PROPERTY_EVENT_FAST(SelectionModel, SelectionChanged)
CLASS_MEMBER_METHOD(SetCaret, {L"begin" _ L"end" _ L"frontSide"})
CLASS_MEMBER_METHOD(CalculateCaretFromPoint, {L"point"})
@@ -4065,13 +4087,13 @@ Type Declaration
BEGIN_CLASS_MEMBER(GuiListItemTemplate_ItemStyleController)
CLASS_MEMBER_BASE(GuiListControl::IItemStyleController)
CLASS_MEMBER_CONSTRUCTOR(Ptr<GuiListItemTemplate_ItemStyleController>(GuiListItemTemplate_ItemStyleProvider*), { L"itemStyleProvider" })
CLASS_MEMBER_CONSTRUCTOR(GuiListItemTemplate_ItemStyleController*(GuiListItemTemplate_ItemStyleProvider*), { L"itemStyleProvider" })
END_CLASS_MEMBER(GuiListItemTemplate_ItemStyleController)
BEGIN_CLASS_MEMBER(GuiListItemTemplate_ItemStyleProvider)
CLASS_MEMBER_BASE(GuiSelectableListControl::IItemStyleProvider)
CLASS_MEMBER_CONSTRUCTOR(GuiListItemTemplate_ItemStyleProvider*(Ptr<GuiTemplate::IFactory>), { L"factory" })
CLASS_MEMBER_CONSTRUCTOR(Ptr<GuiListItemTemplate_ItemStyleProvider>(Ptr<GuiTemplate::IFactory>), { L"factory" })
END_CLASS_MEMBER(GuiListItemTemplate_ItemStyleProvider)
BEGIN_CLASS_MEMBER(GuiTreeItemTemplate_ItemStyleProvider)
+25 -1
View File
@@ -73,6 +73,7 @@ Type List
F(presentation::INativeController)\
F(presentation::GuiImageData)\
F(presentation::GuiTextData)\
F(presentation::DocumentFontSize)\
F(presentation::DocumentStyleProperties)\
F(presentation::DocumentRun)\
F(presentation::DocumentContainerRun)\
@@ -110,7 +111,7 @@ Type List
GUIREFLECTIONBASIC_TYPELIST(DECL_TYPE_INFO)
/***********************************************************************
Type Declaration
Serialization (Color)
***********************************************************************/
template<>
@@ -128,6 +129,29 @@ Type Declaration
typedef SerializableTypeDescriptor<TypedDefaultValueSerializer<presentation::Color>, TypeDescriptorFlags::Primitive> CustomTypeDescriptorImpl;
};
/***********************************************************************
Serialization (DocumentFontSize)
***********************************************************************/
template<>
struct TypedValueSerializerProvider<presentation::DocumentFontSize>
{
static presentation::DocumentFontSize GetDefaultValue();
static bool Serialize(const presentation::DocumentFontSize& input, WString& output);
static bool Deserialize(const WString& input, presentation::DocumentFontSize& output);
};
template<>
struct CustomTypeDescriptorSelector<presentation::DocumentFontSize>
{
public:
typedef SerializableTypeDescriptor<TypedDefaultValueSerializer<presentation::DocumentFontSize>, TypeDescriptorFlags::Primitive> CustomTypeDescriptorImpl;
};
/***********************************************************************
Serialization (GlobalStringKey)
***********************************************************************/
template<>
struct TypedValueSerializerProvider<presentation::GlobalStringKey>
{
+6 -1
View File
@@ -2104,7 +2104,12 @@ ControllerListener
}
}
#if _DEBUG
CHECK_ERROR(d3d11Device, L"Direct2DWindowsNativeControllerListener::NativeWindowCreated(INativeWindow*)#Failed to create Direct3D 11 Device. This error will be skipped under Release mode, but you still need to check your Windows SDK Installation.");
CHECK_ERROR(d3d11Device,
L"Direct2DWindowsNativeControllerListener::NativeWindowCreated(INativeWindow*)#"
L"Failed to create Direct3D 11 Device. "
L"If you are running in Debug mode on Windows 10, please ensure the optional feature [Graphics Tools] is correctly installed. "
L"This error will be skipped in Release mode and GacUI will fallback to use Direct2D 1.0, but you still need to check your Windows SDK Installation."
);
#endif
}
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -35,7 +35,7 @@
</Cell>
<Cell Site="row:0 column:1">
<SinglelineTextBox ref.Name="textBoxA" Text="1">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -44,7 +44,7 @@
</Cell>
<Cell Site="row:1 column:1">
<SinglelineTextBox ref.Name="textBoxB" Text="2">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -53,7 +53,7 @@
</Cell>
<Cell Site="row:2 column:1">
<SinglelineTextBox ref.Name="textBoxC" Readonly="true" Text-bind="(cast int textBoxA.Text) + (cast int textBoxB.Text) ?? 'ERROR'">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
</Table>
@@ -34,7 +34,7 @@
</Cell>
<Cell Site="row:0 column:1">
<SinglelineTextBox ref.Name="textBoxName" Text="Jack">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -50,7 +50,7 @@
</Cell>
<Cell Site="row:0 column:1">
<SinglelineTextBox ref.Name="textBoxName" Text="Jack">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
+3 -3
View File
@@ -36,7 +36,7 @@
</Cell>
<Cell Site="row:0 column:1 columnSpan:2">
<SinglelineTextBox ref.Name="textBoxA" Text="1">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -45,7 +45,7 @@
</Cell>
<Cell Site="row:1 column:1 columnSpan:2">
<SinglelineTextBox ref.Name="textBoxB" Text="2">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -54,7 +54,7 @@
</Cell>
<Cell Site="row:2 column:1">
<SinglelineTextBox ref.Name="textBoxC" Readonly="true">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
<Cell Site="row:2 column:2">
@@ -36,7 +36,7 @@
</Cell>
<Cell Site="row:0 column:1 columnSpan:2">
<SinglelineTextBox ref.Name="textBoxA" Text="1">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -45,7 +45,7 @@
</Cell>
<Cell Site="row:1 column:1 columnSpan:2">
<SinglelineTextBox ref.Name="textBoxB" Text="2">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -54,7 +54,7 @@
</Cell>
<Cell Site="row:2 column:1">
<SinglelineTextBox ref.Name="textBoxC" Readonly="true">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
<Cell Site="row:2 column:2">
@@ -53,7 +53,7 @@
</Cell>
<Cell Site="row:0 column:1 columnSpan:2">
<SinglelineTextBox ref.Name="textBoxA" Text="1">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -62,7 +62,7 @@
</Cell>
<Cell Site="row:1 column:1 columnSpan:2">
<SinglelineTextBox ref.Name="textBoxB" Text="2">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -71,7 +71,7 @@
</Cell>
<Cell Site="row:2 column:1">
<SinglelineTextBox ref.Name="textBoxC" Readonly="true">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
<Cell Site="row:2 column:2">
@@ -32,7 +32,7 @@
<Cell Site="row:0 column:0">
<SinglelineTextBox ref.Name="textBoxA" Text="12345">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
@@ -52,7 +52,7 @@
<Cell Site="row:1 column:0">
<SinglelineTextBox ref.Name="textBoxB" Text="">
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="y:24"/>
<att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
</SinglelineTextBox>
</Cell>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.