Update release

This commit is contained in:
Zihan Chen
2017-04-09 21:38:55 -07:00
parent 6491385b75
commit 4c27bc4715
5 changed files with 15 additions and 7 deletions
+2 -2
View File
@@ -27495,7 +27495,7 @@ GuiDocumentViewer
GuiDocumentViewer::GuiDocumentViewer(GuiDocumentViewer::IStyleProvider* styleProvider)
:GuiScrollContainer(styleProvider)
, GuiDocumentCommonInterface(styleProvider->GetBaselineDocument())
, GuiDocumentCommonInterface(styleProvider->GetBaselineDocument(), styleProvider->GetCaretColor())
{
SetExtendToFullWidth(true);
SetHorizontalAlwaysVisible(false);
@@ -43817,7 +43817,7 @@ DocumentModel
if(sp->face) XmlElementWriter(styleElement).Element(L"face").Text( sp->face.Value() );
if(sp->size) XmlElementWriter(styleElement).Element(L"size").Text( sp->size.Value().ToString() );
if(sp->color) XmlElementWriter(styleElement).Element(L"color").Text( sp->color.Value().ToString() );
if(sp->backgroundColor) XmlElementWriter(styleElement).Element(L"bkcolor").Text( sp->color.Value().ToString() );
if(sp->backgroundColor) XmlElementWriter(styleElement).Element(L"bkcolor").Text( sp->backgroundColor.Value().ToString() );
if(sp->bold) XmlElementWriter(styleElement).Element(L"b").Text( sp->bold.Value()?L"true":L"false" );
if(sp->italic) XmlElementWriter(styleElement).Element(L"i").Text( sp->italic.Value()?L"true":L"false" );
if(sp->underline) XmlElementWriter(styleElement).Element(L"u").Text( sp->underline.Value()?L"true":L"false" );
+13 -5
View File
@@ -1648,17 +1648,25 @@ namespace vl
void Visit(WfVirtualExpression* node)override
{
traverse_visitor::ExpressionVisitor::Visit(node);
auto record = sp->nodePositions[node];
Workflow_RecordScriptPosition(context, record.position, node->expandedExpression, record.availableAfter);
vint index = sp->nodePositions.Keys().IndexOf(node);
if (index != -1)
{
auto record = sp->nodePositions.Values()[index];
Workflow_RecordScriptPosition(context, record.position, node->expandedExpression, record.availableAfter);
}
}
void Visit(WfVirtualDeclaration* node)override
{
traverse_visitor::DeclarationVisitor::Visit(node);
auto record = sp->nodePositions[node];
FOREACH(Ptr<WfDeclaration>, decl, node->expandedDeclarations)
vint index = sp->nodePositions.Keys().IndexOf(node);
if (index != -1)
{
Workflow_RecordScriptPosition(context, record.position, decl, record.availableAfter);
auto record = sp->nodePositions.Values()[index];
FOREACH(Ptr<WfDeclaration>, decl, node->expandedDeclarations)
{
Workflow_RecordScriptPosition(context, record.position, decl, record.availableAfter);
}
}
}
};
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.