Making code simpler

Author: batzen

Fluent.Ribbon/Controls/ComboBox.cs

@@ -658,11 +658,11 @@ protected override void OnDropDownOpened(EventArgs e)
 
         if (this.SelectedItem is not null)
         {
-            var selectedItemContainer = this.ItemContainerGenerator.ContainerOrContainerContentFromItem<IInputElement>(this.SelectedItem);
-            if (selectedItemContainer is not null)
-            {
-                Keyboard.Focus(selectedItemContainer);
-            }
+            var selectedItemContainer = this.ItemContainerGenerator.ContainerOrContainerContentFromItem<IInputElement>(this.SelectedItem);
+            if (selectedItemContainer is not null)
+            {
+                Keyboard.Focus(selectedItemContainer);
+            }
         }
 
         this.focusedElement = Keyboard.FocusedElement;
@@ -678,8 +678,6 @@ protected override void OnDropDownOpened(EventArgs e)
             this.scrollViewer.Height = double.NaN;
         }
 
-        var popupChild = this.DropDownPopup?.Child as FrameworkElement;
-
         var initialHeight = Math.Min(RibbonControl.GetControlWorkArea(this).Height * 2 / 3, this.MaxDropDownHeight);
 
         if (double.IsNaN(this.DropDownHeight) == false)
@@ -693,7 +691,7 @@ protected override void OnDropDownOpened(EventArgs e)
             this.scrollViewer.Height = initialHeight;
         }
 
-        popupChild?.UpdateLayout();
+        this.DropDownPopup?.Child?.UpdateLayout();
     }
 
     /// <inheritdoc />