Browse Source

Updated OmniXAML

To see if it fixed nested markup extensions. Doesn't seem to have had.
pull/297/head
Steven Kirk 11 years ago
parent
commit
826d30d7d0
  1. 8
      samples/XamlTestApplicationPcl/TextBox.paml
  2. 2
      src/Markup/Perspex.Markup.Xaml/OmniXAML

8
samples/XamlTestApplicationPcl/TextBox.paml

@ -26,12 +26,8 @@
<Panel> <Panel>
<TextBlock Name="watermark" <TextBlock Name="watermark"
Opacity="0.5" Opacity="0.5"
Text="{TemplateBinding Watermark}"> Text="{TemplateBinding Watermark}"
<TextBlock.IsVisible> IsVisible="{TemplateBinding Path=Text, Converter={Static local:StringNullOrEmpty.Instance}}">
<Binding RelativeSource="{RelativeSource TemplatedParent}"
SourcePropertyPath="Text"
Converter="{Static local:StringNullOrEmpty.Instance}"/>
</TextBlock.IsVisible>
</TextBlock> </TextBlock>
<TextPresenter Name="PART_TextPresenter" <TextPresenter Name="PART_TextPresenter"
CaretIndex="{TemplateBinding CaretIndex}" CaretIndex="{TemplateBinding CaretIndex}"

2
src/Markup/Perspex.Markup.Xaml/OmniXAML

@ -1 +1 @@
Subproject commit 81afc557c85473ba5035039c89253c1e0fe03927 Subproject commit 99d24a3019504b901742496fffbdbb549a7245ab
Loading…
Cancel
Save