Browse Source
Merge branch 'master' into fixes/3127-window-keypresses
pull/3129/head
danwalmsley
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
5 deletions
-
src/Avalonia.Controls/Grid.cs
|
|
|
@ -24,13 +24,14 @@ namespace Avalonia.Controls |
|
|
|
{ |
|
|
|
static Grid() |
|
|
|
{ |
|
|
|
IsSharedSizeScopeProperty.Changed.AddClassHandler<Control>(DefinitionBase.OnIsSharedSizeScopePropertyChanged); |
|
|
|
ShowGridLinesProperty.Changed.AddClassHandler<Grid>(OnShowGridLinesPropertyChanged); |
|
|
|
|
|
|
|
ColumnProperty.Changed.AddClassHandler<Grid>(OnCellAttachedPropertyChanged); |
|
|
|
ColumnSpanProperty.Changed.AddClassHandler<Grid>(OnCellAttachedPropertyChanged); |
|
|
|
RowProperty.Changed.AddClassHandler<Grid>(OnCellAttachedPropertyChanged); |
|
|
|
RowSpanProperty.Changed.AddClassHandler<Grid>(OnCellAttachedPropertyChanged); |
|
|
|
IsSharedSizeScopeProperty.Changed.AddClassHandler<Control>(DefinitionBase.OnIsSharedSizeScopePropertyChanged); |
|
|
|
ColumnProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged); |
|
|
|
ColumnSpanProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged); |
|
|
|
RowProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged); |
|
|
|
RowSpanProperty.Changed.AddClassHandler<Control>(OnCellAttachedPropertyChanged); |
|
|
|
|
|
|
|
AffectsParentMeasure<Grid>(ColumnProperty, ColumnSpanProperty, RowProperty, RowSpanProperty); |
|
|
|
} |
|
|
|
|
|
|
|
|
