Equbuxu 3 лет назад
Родитель
Сommit
930c677d80
1 измененных файлов с 8 добавлено и 1 удалено
  1. 8 1
      src/PixiEditor/Helpers/Behaviours/TextBoxFocusBehavior.cs

+ 8 - 1
src/PixiEditor/Helpers/Behaviours/TextBoxFocusBehavior.cs

@@ -87,7 +87,14 @@ internal class TextBoxFocusBehavior : Behavior<TextBox>
     {
     {
         if (!FocusNext)
         if (!FocusNext)
         {
         {
-            MainWindow.Current.mainGrid.Focus();
+            FrameworkElement parent = (FrameworkElement)AssociatedObject.Parent;
+            while (parent is IInputElement elem && !elem.Focusable)
+            {
+                parent = (FrameworkElement)parent.Parent;
+            }
+
+            DependencyObject scope = FocusManager.GetFocusScope(AssociatedObject);
+            FocusManager.SetFocusedElement(scope, parent);
         }
         }
         else
         else
         {
         {