Small refactoring: variables initialization was simplified (#5489)

dotnet · Sep 7, 2021 · 9b1c202 · 9b1c202
1 parent bcc8ca1
commit 9b1c202
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 29 deletions.
diff --git a/...Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs b/...Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs
@@ -42,13 +42,13 @@ public override Rectangle Bounds
             {
                 get
                 {
-                    int left = 0;
-                    int top = 0;
-                    int width = 0;
-                    int height = 0;
-                    var systemIAccessible = GetSystemIAccessibleInternal();
-                    systemIAccessible?.accLocation(out left, out top, out width, out height, COMBOBOX_DROPDOWN_BUTTON_ACC_ITEM_INDEX);
-                    return new Rectangle(left, top, width, height);
+                    if (GetSystemIAccessibleInternal() is not Accessibility.IAccessible systemIAccessible)
+                    {
+                        return Rectangle.Empty;
+                    }
+
+                    systemIAccessible.accLocation(out int left, out int top, out int width, out int height, COMBOBOX_DROPDOWN_BUTTON_ACC_ITEM_INDEX);
+                    return new(left, top, width, height);
                 }
             }
 

diff --git a/...System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs b/...System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs
@@ -22,21 +22,16 @@ public override Rectangle Bounds
             {
                 get
                 {
-                    if (!OwningScrollBar.IsHandleCreated || !IsDisplayed)
+                    if (!OwningScrollBar.IsHandleCreated || !IsDisplayed || ParentInternal.GetSystemIAccessibleInternal() is not Accessibility.IAccessible systemIAccessible)
                     {
                         return Rectangle.Empty;
                     }
 
-                    int left = 0;
-                    int top = 0;
-                    int width = 0;
-                    int height = 0;
-
                     // The "GetChildId" method returns to the id of the ScrollBar element,
                     // which allows to use the native "accLocation" method to get the "Bounds" property
-                    ParentInternal.GetSystemIAccessibleInternal()?.accLocation(out left, out top, out width, out height, GetChildId());
+                    systemIAccessible.accLocation(out int left, out int top, out int width, out int height, GetChildId());
 
-                    return new Rectangle(left, top, width, height);
+                    return new(left, top, width, height);
                 }
             }
 

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs
@@ -25,19 +25,14 @@ public override Rectangle Bounds
             {
                 get
                 {
-                    if (!_owningTrackBar.IsHandleCreated)
+                    if (!_owningTrackBar.IsHandleCreated || GetSystemIAccessibleInternal() is not Accessibility.IAccessible systemIAccessible)
                     {
                         return Rectangle.Empty;
                     }
 
-                    int left = 0;
-                    int top = 0;
-                    int width = 0;
-                    int height = 0;
-
                     // The "NativeMethods.CHILDID_SELF" constant returns to the id of the trackbar,
                     // which allows to use the native "accLocation" method to get the "Bounds" property
-                    GetSystemIAccessibleInternal()?.accLocation(out left, out top, out width, out height, NativeMethods.CHILDID_SELF);
+                    systemIAccessible.accLocation(out int left, out int top, out int width, out int height, NativeMethods.CHILDID_SELF);
 
                     return new(left, top, width, height);
                 }

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs
@@ -20,19 +20,14 @@ public override Rectangle Bounds
             {
                 get
                 {
-                    if (!OwningTrackBar.IsHandleCreated || !IsDisplayed)
+                    if (!OwningTrackBar.IsHandleCreated || !IsDisplayed || ParentInternal.GetSystemIAccessibleInternal() is not Accessibility.IAccessible systemIAccessible)
                     {
                         return Rectangle.Empty;
                     }
 
-                    int left = 0;
-                    int top = 0;
-                    int width = 0;
-                    int height = 0;
-
                     // The "GetChildId" method returns to the id of the trackbar element,
                     // which allows to use the native "accLocation" method to get the "Bounds" property
-                    ParentInternal.GetSystemIAccessibleInternal()?.accLocation(out left, out top, out width, out height, GetChildId());
+                    systemIAccessible.accLocation(out int left, out int top, out int width, out int height, GetChildId());
 
                     return new(left, top, width, height);
                 }