From a76d14650b8221e3a86ea3165e589c199cba2335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sun, 23 Feb 2020 23:46:01 +0000
Subject: [PATCH] Fixed obsolete API usages.

---
 src/Avalonia.Controls/ContextMenu.cs      | 3 +--
 src/Avalonia.Input/NavigationDirection.cs | 4 ++--
 src/Avalonia.Themes.Default/ComboBox.xaml | 1 -
 src/Avalonia.Themes.Default/MenuItem.xaml | 6 ++----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index 5dfa5863f5..fc56e26add 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -104,8 +104,7 @@ namespace Avalonia.Controls
                 {
                     PlacementMode = PlacementMode.Pointer,
                     PlacementTarget = control,
-                    StaysOpen = false,
-                    ObeyScreenEdges = true
+                    StaysOpen = false
                 };
 
                 _popup.Opened += PopupOpened;
diff --git a/src/Avalonia.Input/NavigationDirection.cs b/src/Avalonia.Input/NavigationDirection.cs
index 406890b767..0e7e991260 100644
--- a/src/Avalonia.Input/NavigationDirection.cs
+++ b/src/Avalonia.Input/NavigationDirection.cs
@@ -100,12 +100,12 @@ namespace Avalonia.Input
         /// </returns>
         public static NavigationDirection? ToNavigationDirection(
             this Key key,
-            InputModifiers modifiers = InputModifiers.None)
+            KeyModifiers modifiers = KeyModifiers.None)
         {
             switch (key)
             {
                 case Key.Tab:
-                    return (modifiers & InputModifiers.Shift) != 0 ?
+                    return (modifiers & KeyModifiers.Shift) != 0 ?
                         NavigationDirection.Next : NavigationDirection.Previous;
                 case Key.Up:
                     return NavigationDirection.Up;
diff --git a/src/Avalonia.Themes.Default/ComboBox.xaml b/src/Avalonia.Themes.Default/ComboBox.xaml
index 2afed09b0c..95bd9550a5 100644
--- a/src/Avalonia.Themes.Default/ComboBox.xaml
+++ b/src/Avalonia.Themes.Default/ComboBox.xaml
@@ -37,7 +37,6 @@
                    MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
                    PlacementTarget="{TemplateBinding}"
-                   ObeyScreenEdges="True"
                    StaysOpen="False">
               <Border BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="1">
diff --git a/src/Avalonia.Themes.Default/MenuItem.xaml b/src/Avalonia.Themes.Default/MenuItem.xaml
index 93989d3782..769ab893bf 100644
--- a/src/Avalonia.Themes.Default/MenuItem.xaml
+++ b/src/Avalonia.Themes.Default/MenuItem.xaml
@@ -45,8 +45,7 @@
             <Popup Name="PART_Popup"
                    PlacementMode="Right"
                    StaysOpen="True"
-                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
-                   ObeyScreenEdges="True">
+                   IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
               <Border Background="{TemplateBinding Background}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="{TemplateBinding BorderThickness}">
@@ -95,8 +94,7 @@
             </ContentPresenter>
             <Popup Name="PART_Popup"
                    IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"
-                   StaysOpen="True" 
-                   ObeyScreenEdges="True">
+                   StaysOpen="True">
               <Border Background="{TemplateBinding Background}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                       BorderThickness="{TemplateBinding BorderThickness}">