Browse Source

Move Control static constructor statements to more accurate layers.

Jeremy Koritzinsky 7 years ago
parent
commit
72a4889435
2 changed files with 4 additions and 11 deletions
  1. 0 11
      src/Avalonia.Controls/Control.cs
  2. 4 0
      src/Avalonia.Input/InputElement.cs

+ 0 - 11
src/Avalonia.Controls/Control.cs

@@ -60,17 +60,6 @@ namespace Avalonia.Controls
         private DataTemplates _dataTemplates;
         private IControl _focusAdorner;
 
-        /// <summary>
-        /// Initializes static members of the <see cref="Control"/> class.
-        /// </summary>
-        static Control()
-        {
-            AffectsMeasure(IsVisibleProperty);
-            PseudoClass(IsEnabledCoreProperty, x => !x, ":disabled");
-            PseudoClass(IsFocusedProperty, ":focus");
-            PseudoClass(IsPointerOverProperty, ":pointerover");
-        }
-
         /// <summary>
         /// Gets or sets the control's focus adorner.
         /// </summary>

+ 4 - 0
src/Avalonia.Input/InputElement.cs

@@ -168,6 +168,10 @@ namespace Avalonia.Input
             PointerPressedEvent.AddClassHandler<InputElement>(x => x.OnPointerPressed);
             PointerReleasedEvent.AddClassHandler<InputElement>(x => x.OnPointerReleased);
             PointerWheelChangedEvent.AddClassHandler<InputElement>(x => x.OnPointerWheelChanged);
+
+            PseudoClass(IsEnabledCoreProperty, x => !x, ":disabled");
+            PseudoClass(IsFocusedProperty, ":focus");
+            PseudoClass(IsPointerOverProperty, ":pointerover");
         }
 
         /// <summary>