Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DataGrid styling #30

Merged
merged 43 commits into from
Dec 20, 2019
+1,168 −86
Merged

Add DataGrid styling #30

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e09c9ed
Added datagrid to collections example
Bert-Proesmans Jun 13, 2019
cd5819f
Datagrid and Datagrid row styling
Bert-Proesmans Jun 13, 2019
cbca576
Explicit Binding Path for clarity
Bert-Proesmans Jul 21, 2019
e5ef0fa
Updated DataGridRow with DGHeader and Scrollbar
Bert-Proesmans Jul 21, 2019
df14165
Added DataGrid styling
Bert-Proesmans Jul 21, 2019
f13312f
Reversed unintended changes to ListView.xaml
Bert-Proesmans Jul 21, 2019
a3017b9
Added DataGridCell styling
Bert-Proesmans Jul 21, 2019
7e281db
Added DataGridRowHeader style
Bert-Proesmans Jul 21, 2019
6006990
Fixed invalid RowDetailsVisibilityMode value
Bert-Proesmans Jul 21, 2019
83503d9
Moved style definitions to collectionsview
Aug 7, 2019
a14fc3b
Merge branch 'master' of https://github.com/benruehl/adonis-ui
benruehl Oct 14, 2019
2e0a8b1
Move datagrid styles to default styles
benruehl Oct 14, 2019
498bd73
Fix minor issues in data grid style and clean up
benruehl Oct 17, 2019
62260aa
Rename data grid style file to pascal case
benruehl Oct 17, 2019
1d99252
Fix data grid row border intersecting with grid lines
benruehl Oct 18, 2019
03250c8
Fix data grid cell foreground switching back to normal even though ro…
benruehl Oct 18, 2019
b3256bb
Update data grid 'select all' button template
benruehl Oct 18, 2019
810130f
Added button to disable/enable Adonis theming
Bert-Proesmans Oct 20, 2019
a2db481
Moved DataGrid example layout to resource for re-use
Bert-Proesmans Oct 20, 2019
7b3a9b2
Fixed comment about gridrowdetails
Bert-Proesmans Oct 22, 2019
8da9cb2
Consistent ordering of Grid Column and Row property
Bert-Proesmans Oct 22, 2019
d2ab603
Added item grouping to the collection example
Bert-Proesmans Oct 22, 2019
f96728f
Added collections rowheader template
Bert-Proesmans Oct 22, 2019
0ccac0f
Attempt at auto-sizing the rowheader error template
Bert-Proesmans Oct 22, 2019
173979f
Fix 'select all' button growing in size with the parent cell
benruehl Oct 23, 2019
ba5c4bb
Update (de-)activation button of AdonisUI's theming
benruehl Oct 23, 2019
1b73133
Format xaml code
benruehl Oct 23, 2019
e7e0242
Add support for aligning content in row header & add icon to demo header
benruehl Oct 23, 2019
c4c970b
Update datagrid column header in demo
benruehl Oct 23, 2019
1b8fe9b
New converter to apply unary minus on each component of Thickness
Bert-Proesmans Oct 29, 2019
6b2621b
Applying Thickness converter for negative margin of spotlight layer
Bert-Proesmans Oct 29, 2019
b7489ca
Iterated grid comments
Bert-Proesmans Nov 1, 2019
524b65f
Set padding and borderthickness to 0 on datagridrow
Bert-Proesmans Nov 1, 2019
3d69df4
Added virtualization options to Datagrid demo
Bert-Proesmans Nov 1, 2019
334c302
Added group styles to Datagrid demo
Bert-Proesmans Nov 1, 2019
a0e1b45
Remove data grid grouping which leads to unhandled exceptions
benruehl Dec 8, 2019
1bdfb73
Update details template of data grid demo
benruehl Dec 8, 2019
3f7fa73
Update data grid validation error template
benruehl Dec 8, 2019
5371ef6
Fix data grid row error icon leading to differing row header sizes wh…
benruehl Dec 19, 2019
8b1e2b7
Add button to collection demo which adds new items
benruehl Dec 19, 2019
5a3b043
Fix CanContentScroll on data grid having no effect
benruehl Dec 19, 2019
fc77792
Fix NullReferenceExceptions
benruehl Dec 19, 2019
ccc03c3
Remove preselection of data grid tab in demo
benruehl Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved DataGrid example layout to resource for re-use
@Bert-Proesmans
Bert-Proesmans committed Oct 20, 2019
commit a2db481fa62d54898c3e413276fee46114973cbc
82 changes: 42 additions & 40 deletions AdonisUI.Demo/Views/CollectionDemo.xaml
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,45 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>

<Grid.Resources>
<ControlTemplate x:Key="DataGridTemplate" x:Shared="false">
<DataGrid ItemsSource="{Binding Items}" AutoGenerateColumns="False" FrozenColumnCount="1">
<DataGrid.Columns>
<DataGridTextColumn Header="Name" Binding="{Binding Name}" MinWidth="200"/>
<DataGridTextColumn Header="Weight" Binding="{Binding Weight, StringFormat=N2}" MinWidth="500" IsReadOnly="True"/>
<DataGridTextColumn Header="Weight" Binding="{Binding Weight, StringFormat=N2}" MinWidth="50"/>
</DataGrid.Columns>

<DataGrid.RowDetailsTemplate>
<DataTemplate>
<DockPanel>
<Image DockPanel.Dock="Left" Source="{Binding ImageUrl}" Height="64" Margin="10" />
<Grid Margin="0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock Text="ID: " FontWeight="Bold" />
<TextBlock Text="IDVALUE" Grid.Column="1" />
<TextBlock Text="Name: " FontWeight="Bold" Grid.Row="1" />
<TextBlock Text="NAMEVALUE" Grid.Column="1" Grid.Row="1" />
<TextBlock Text="Birthday: " FontWeight="Bold" Grid.Row="2" />
<TextBlock Text="BDAYVALUE" Grid.Column="1" Grid.Row="2" />

</Grid>
</DockPanel>
</DataTemplate>
</DataGrid.RowDetailsTemplate>
</DataGrid>
</ControlTemplate>
</Grid.Resources>

<Menu>
<MenuItem Header="File">
<MenuItem Header="New">
@@ -92,42 +131,10 @@
</TabItem>

<TabItem Header="Data Grid" IsSelected="True">
<DataGrid ItemsSource="{Binding Items}" AutoGenerateColumns="False" FrozenColumnCount="1">
<DataGrid.Columns>
<DataGridTextColumn Header="Name" Binding="{Binding Name}" MinWidth="200"/>
<DataGridTextColumn Header="Weight" Binding="{Binding Weight, StringFormat=N2}" MinWidth="500" IsReadOnly="True"/>
<DataGridTextColumn Header="Weight" Binding="{Binding Weight, StringFormat=N2}" MinWidth="50"/>
</DataGrid.Columns>

<DataGrid.RowDetailsTemplate>
<DataTemplate>
<DockPanel>
<Image DockPanel.Dock="Left" Source="{Binding ImageUrl}" Height="64" Margin="10" />
<Grid Margin="0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock Text="ID: " FontWeight="Bold" />
<TextBlock Text="IDVALUE" Grid.Column="1" />
<TextBlock Text="Name: " FontWeight="Bold" Grid.Row="1" />
<TextBlock Text="NAMEVALUE" Grid.Column="1" Grid.Row="1" />
<TextBlock Text="Birthday: " FontWeight="Bold" Grid.Row="2" />
<TextBlock Text="BDAYVALUE" Grid.Column="1" Grid.Row="2" />

</Grid>
</DockPanel>
</DataTemplate>
</DataGrid.RowDetailsTemplate>
</DataGrid>
<Control Template="{StaticResource DataGridTemplate}"/>
</TabItem>


<TabItem Header="Tree View">
<TreeView ItemsSource="{Binding Items}">
<TreeView.ItemTemplate>
@@ -167,12 +174,7 @@
</TabItem>

<TabItem Header="Data Grid">
<DataGrid ItemsSource="{Binding Items}" AutoGenerateColumns="False">
<DataGrid.Columns>
<DataGridTextColumn Header="Name" Binding="{Binding Name}"/>
<DataGridTextColumn Header="Weight" Binding="{Binding Weight, StringFormat=N2}"/>
</DataGrid.Columns>
</DataGrid>
<Control Template="{StaticResource DataGridTemplate}"/>
</TabItem>

<TabItem Header="Tree View">