diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml index 46881ce98..27aa4e0f6 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml @@ -3,7 +3,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" - xmlns:usp="clr-namespace:mbts.ui.spark"> + xmlns:usp="clr-namespace:mbts.ui.spark" + FocusManager.IsFocusScope="True"> diff --git a/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs b/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs index 38c100868..4b13c63eb 100644 --- a/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs +++ b/src/client/spark/view/Controls/Popup/PopupControl.xaml.cs @@ -67,9 +67,11 @@ namespace mbts.ui.controls { new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsOpenChanged)); static void OnIsOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { var target = (PopupControl)d; - if ((bool)e.NewValue) + if ((bool)e.NewValue) { target.RaiseEvent(new RoutedEventArgs(OpenedEvent, target)); - else + (FocusManager.GetFocusScope(target) as UIElement)?.Focus(); + target._popup?.Child?.Focus(); + } else target.RaiseEvent(new RoutedEventArgs(ClosedEvent, target)); } public bool IsOpen { get => (bool)GetValue(IsOpenProperty); set => SetValue(IsOpenProperty, value); } diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml index 001f98a16..e351462b8 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml @@ -9,7 +9,8 @@ xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" xmlns:sys="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d" - d:DesignHeight="600" d:DesignWidth="1080"> + d:DesignHeight="600" d:DesignWidth="1080" + FocusManager.IsFocusScope="True">