Skip to content

Commit

Permalink
[Code] Updated xaml formatting to current convention (stride3d#166)
Browse files Browse the repository at this point in the history
  • Loading branch information
Eideren authored and xen2 committed Sep 2, 2018
1 parent a521375 commit ed622e1
Show file tree
Hide file tree
Showing 39 changed files with 7,732 additions and 7,322 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<xk:ModalWindow x:Class="Xenko.Assets.Presentation.Templates.ProjectLibraryWindow"
<xk:ModalWindow x:Class="Xenko.Assets.Presentation.Templates.ProjectLibraryWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand All @@ -10,13 +10,13 @@
Title="{xk:Localize New code library}" SizeToContent="Height" Width="480"
Style="{DynamicResource WindowChromeStyle}" d:DataContext="{d:DesignInstance templates:ProjectLibraryWindow}">
<xk:ModalWindow.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/Xenko.Core.Assets.Editor;component/View/CommonResources.xaml"/>
<ResourceDictionary Source="../View/ImageDictionary.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</xk:ModalWindow.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/Xenko.Core.Assets.Editor;component/View/CommonResources.xaml"/>
<ResourceDictionary Source="../View/ImageDictionary.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</xk:ModalWindow.Resources>
<StackPanel>
<TextBlock Text="{xk:Localize Library name:}" Margin="20,20,20,0"/>
<TextBox Name="LibBox" Text="{Binding LibraryName, UpdateSourceTrigger=PropertyChanged}" Margin="20,5,20,20"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Icon="{DynamicResource EditorIcon}" ShowInTaskbar="False"
Style="{DynamicResource WindowChromeStyle}"
Title="{xk:Localize Add asset...}">
<Grid>
<Grid>
<ListBox SnapsToDevicePixels="True"
Width="{x:Static view:AddItemUserControl.TemplateListWidth}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ItemsSource="{Binding Templates}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="Xenko.Core.Assets.Editor.Components.DebugTools.UndoRedo.Views.DebugUndoRedoUserControl"
<UserControl x:Class="Xenko.Core.Assets.Editor.Components.DebugTools.UndoRedo.Views.DebugUndoRedoUserControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand All @@ -20,20 +20,20 @@
</HierarchicalDataTemplate>

<!--<HierarchicalDataTemplate DataType="{x:Type as:CollectionChangedActionItem}">
<TextBlock Margin="0,0,10,0">
<Run Text="{Binding Name}"/> (CollectionChanged: <Run Text="{Binding ActionToUndo, Mode=OneWay}"/> <Run Text="{Binding ItemCount, Mode=OneWay}"/> items)
</TextBlock>
</HierarchicalDataTemplate>
<TextBlock Margin="0,0,10,0">
<Run Text="{Binding Name}"/> (CollectionChanged: <Run Text="{Binding ActionToUndo, Mode=OneWay}"/> <Run Text="{Binding ItemCount, Mode=OneWay}"/> items)
</TextBlock>
</HierarchicalDataTemplate>
<HierarchicalDataTemplate DataType="{x:Type actionStack:ContentValueChangedActionItem}">
<TextBlock Margin="0,0,10,0">
<Run Text="{Binding Name}"/> (ContentChanged: <Run Text="{Binding ChangeType, Mode=OneWay}"/>)
</TextBlock>
</HierarchicalDataTemplate>
<HierarchicalDataTemplate DataType="{x:Type actionStack:ContentValueChangedActionItem}">
<TextBlock Margin="0,0,10,0">
<Run Text="{Binding Name}"/> (ContentChanged: <Run Text="{Binding ChangeType, Mode=OneWay}"/>)
</TextBlock>
</HierarchicalDataTemplate>
<HierarchicalDataTemplate DataType="{x:Type as:ActionItem}">
<TextBlock Margin="0,0,10,0" Text="{Binding Name}"/>
</HierarchicalDataTemplate>-->
<HierarchicalDataTemplate DataType="{x:Type as:ActionItem}">
<TextBlock Margin="0,0,10,0" Text="{Binding Name}"/>
</HierarchicalDataTemplate>-->
</ResourceDictionary>
</UserControl.Resources>
<DockPanel>
Expand Down
Loading

0 comments on commit ed622e1

Please sign in to comment.