diff options
| author | Eric Maupin <ermaup@microsoft.com> | 2018-04-30 23:22:06 +0300 |
|---|---|---|
| committer | Eric Maupin <ermaup@microsoft.com> | 2018-05-01 01:00:33 +0300 |
| commit | 1cfb879d9165bd728ddad38ee2d202589c7df60f (patch) | |
| tree | 5284ad2c859ebdbe3fd89db88bdab1d63f1979e7 /Xamarin.PropertyEditing.Windows | |
| parent | b7c1f820dfd56e6cefeb10a45ca5b04fe87b32b0 (diff) | |
[Win] Fix grouping for collection property list
Diffstat (limited to 'Xamarin.PropertyEditing.Windows')
| -rw-r--r-- | Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml | 2 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Windows/Themes/PropertyEditorPanelStyle.xaml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml b/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml index 1b4fccb..7e89890 100644 --- a/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml +++ b/Xamarin.PropertyEditing.Windows/CollectionEditorWindow.xaml @@ -54,7 +54,7 @@ <Button Grid.Column="2" Command="{Binding AddTargetCommand,Mode=OneTime}" Margin="4,0,0,0">Add</Button> </Grid> - <ItemsControl Margin="12,4,0,0" Style="{StaticResource PropertyListStyle}" ItemsSource="{Binding Panel.Properties}" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" /> + <ItemsControl Margin="12,4,0,0" Style="{StaticResource PropertyListStyle}" Background="{DynamicResource ListBackgroundBrush}" Grid.IsSharedSizeScope="True" DataContext="{Binding Panel}" ItemsSource="{Binding ArrangedEditors}" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" /> <StackPanel Grid.Row="3" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal" Margin="0,4,0,0"> <Button IsDefault="True" MinWidth="75" MinHeight="23" Content="{x:Static prop:Resources.OK}" Command="{Binding CommitCommand,Mode=OneTime}" Click="OnOkClick" /> diff --git a/Xamarin.PropertyEditing.Windows/Themes/PropertyEditorPanelStyle.xaml b/Xamarin.PropertyEditing.Windows/Themes/PropertyEditorPanelStyle.xaml index dfac430..9d66a6e 100644 --- a/Xamarin.PropertyEditing.Windows/Themes/PropertyEditorPanelStyle.xaml +++ b/Xamarin.PropertyEditing.Windows/Themes/PropertyEditorPanelStyle.xaml @@ -52,6 +52,8 @@ <Setter Property="Focusable" Value="False" /> <Setter Property="ItemTemplateSelector" Value="{StaticResource EditorTreeSelector}" /> <Setter Property="ScrollViewer.CanContentScroll" Value="True" /> + <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" /> + <Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel" /> <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="ItemsControl"> @@ -144,7 +146,7 @@ <ContextMenu ItemsSource="{Binding ArrangeModes,Mode=OneTime}" StaysOpen="True" ItemContainerStyle="{DynamicResource ArrangeMenuItem}" /> </local:MenuButton.ContextMenu> </local:MenuButton> - <ItemsControl Name="propertyItems" Grid.Row="2" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Background="{DynamicResource ListBackgroundBrush}" Grid.IsSharedSizeScope="True" Style="{StaticResource PropertyListStyle}" VirtualizingPanel.ScrollUnit="Pixel"/> + <ItemsControl Name="propertyItems" Grid.Row="2" Background="{DynamicResource ListBackgroundBrush}" Grid.IsSharedSizeScope="True" Style="{StaticResource PropertyListStyle}" /> </Grid> <ScrollViewer Name="eventsPane" Grid.Row="1" Visibility="Collapsed"> |