From f1cd198379a856d60dd3f061866d8ea65505c816 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Tue, 17 May 2022 21:11:44 -0400
Subject: [PATCH] Simplify getting changed property values

---
 .../Calendar/CalendarDatePicker.cs            | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
index 8dffc43d91..bb8a70ff6b 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
@@ -215,19 +215,18 @@ namespace Avalonia.Controls
             // IsDropDownOpen
             else if (change.Property == IsDropDownOpenProperty)
             {
-                var oldValue = change.GetOldValue<bool>();
-                var value = change.GetNewValue<bool>();
+                var (oldValue, newValue) = change.GetOldAndNewValue<bool>();
 
                 if (_popUp != null && _popUp.Child != null)
                 {
-                    if (value != oldValue)
+                    if (newValue != oldValue)
                     {
                         if (_calendar!.DisplayMode != CalendarMode.Month)
                         {
                             _calendar.DisplayMode = CalendarMode.Month;
                         }
 
-                        if (value)
+                        if (newValue)
                         {
                             OpenDropDown();
                         }
@@ -246,8 +245,7 @@ namespace Avalonia.Controls
             // SelectedDate
             else if (change.Property == SelectedDateProperty)
             {
-                var addedDate = change.GetNewValue<DateTime?>();
-                var removedDate = change.GetOldValue<DateTime?>();
+                var (removedDate, addedDate) = change.GetOldAndNewValue<DateTime?>();
 
                 if (SelectedDate != null)
                 {
@@ -272,8 +270,11 @@ namespace Avalonia.Controls
                     {
                         DisplayDate = day;
                     }
+
                     if(_calendar != null)
+                    {
                         _calendar.CalendarDatePickerDisplayDateFlag = false;
+                    }
                 }
                 else
                 {
@@ -291,19 +292,19 @@ namespace Avalonia.Controls
             // Text
             else if (change.Property == TextProperty)
             {
-                var (oldValue, value) = change.GetOldAndNewValue<string>();
+                var (oldValue, newValue) = change.GetOldAndNewValue<string>();
 
                 if (!_suspendTextChangeHandler)
                 {
-                    if (value != null)
+                    if (newValue != null)
                     {
                         if (_textBox != null)
                         {
-                            _textBox.Text = value;
+                            _textBox.Text = newValue;
                         }
                         else
                         {
-                            _defaultText = value;
+                            _defaultText = newValue;
                         }
 
                         if (!_settingSelectedDate)