Merge pull request #213 from enisn/fix/advanced-entry-focus

✨ Add Focused & Unfocused wrapper for AdvancedEntry

Author: enisn

InputKit/Shared/Controls/AdvancedEntry.cs

@@ -85,6 +85,8 @@ public AdvancedEntry()
 
             txtInput.TextChanged += TxtInput_TextChanged;
             txtInput.Completed += (s, args) => { ExecuteCommand(); Completed?.Invoke(this, new EventArgs()); FocusNext(); };
+            txtInput.Focused += (s, args) => { var arg = new FocusEventArgs(this, true); FocusedCommand?.Execute(arg); Focused?.Invoke(this, arg); };
+            txtInput.Unfocused += (s, args) => { var arg = new FocusEventArgs(this, false); UnfocusedCommand?.Execute(arg); Unfocused?.Invoke(this, arg); };
             imgWarning.IsVisible = this.IsRequired;
             Reset();
         }
@@ -107,6 +109,8 @@ public AdvancedEntry()
         public event EventHandler<TextChangedEventArgs> TextChanged;
         public event EventHandler Clicked;
         public event EventHandler ValidationChanged;
+        public new event EventHandler<FocusEventArgs> Unfocused;
+        public new event EventHandler<FocusEventArgs> Focused;
         #endregion
         #region Properties
         ///------------------------------------------------------------------------
@@ -374,6 +378,16 @@ public string ValidationMessage
         public ICommand CompletedCommand { get; set; }
         ///----------------------------------------- -------------------------------
         /// <summary>
+        /// Executed when entry focused.
+        /// </summary>
+        public Command<FocusEventArgs> FocusedCommand { get; set; }
+        ///----------------------------------------- -------------------------------
+        /// <summary>
+        /// Executed when entry unfocused.
+        /// </summary>
+        public Command<FocusEventArgs> UnfocusedCommand { get; set; }
+        ///----------------------------------------- -------------------------------
+        /// <summary>
         /// Parameter to send with CompletedCommand
         /// </summary>
         public object CommandParameter { get => GetValue(CommandParameterProperty); set => SetValue(CommandParameterProperty, value); }
@@ -462,17 +476,18 @@ void ExecuteCommand()
         /// </summary>
         public virtual new void Focus()
         {
-            base.Focus(); // To trigger base.Focused event
+            Focused?.Invoke(this, new FocusEventArgs(this, true));
             txtInput.Focus();
         }
         /// <summary>
         /// Onfocus from this entry and hides keyboard.
         /// </summary>
         public virtual new void Unfocus()
         {
-            base.Unfocus(); // To trigger base.Unfocused event
+            Focused?.Invoke(this, new FocusEventArgs(this, true));
             txtInput.Unfocus();
         }
+
         /// <summary>
         /// Automaticly finds next Advanced entry and focus it.
         /// </summary>