From e64d24005284e88daec445c7e79e6b93929d2463 Mon Sep 17 00:00:00 2001
From: chr <chrry550@163.com>
Date: 星期三, 28 二月 2024 15:35:32 +0800
Subject: [PATCH] 优化程序UI；
---
UI/WorkControl.xaml.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/UI/WorkControl.xaml.cs b/UI/WorkControl.xaml.cs
index 146c005..0e58efc 100644
--- a/UI/WorkControl.xaml.cs
+++ b/UI/WorkControl.xaml.cs
@@ -21,11 +21,6 @@
Loaded += UserControl_Loaded;
}
- private void ProgramList_FocusableChanged(object sender, DependencyPropertyChangedEventArgs e)
- {
-
- }
-
private List<CanvasPosition> InitGridSize()
{
List<CanvasPosition> result = new List<CanvasPosition>();
@@ -120,17 +115,25 @@
}
+ public int CanvasChildrenCount { get; private set; } = 0;
private void HandleInnerWindow(InnerWindow inner)
{
inner.MinEvent += InnerWindowMin;
inner.MaxEvent += InnerWindowMax;
inner.ZIndexEvent += Inner_ZIndexEvent;
+ inner.GotFocus += Inner_GotFocus;
inner.AttachToCanvas(WorkArea);
- }
-
+ inner.Zindex = CanvasChildrenCount++;
+ }
+
+ private void Inner_GotFocus(object sender, RoutedEventArgs e)
+ {
+ CanvasHelper.SetTopZIndex(sender as InnerWindow, WorkArea, typeof(InnerWindow));
+ }
+
private void Inner_ZIndexEvent(object sender, EventArgs e)
{
- CanvasHelper.SetTopZIndex(sender, WorkArea, typeof(InnerWindow));
+ CanvasHelper.SetTopZIndex(sender as InnerWindow, WorkArea, typeof(InnerWindow));
}
private void HandleMinInnerWindow(InnerWindow inner)
@@ -173,6 +176,7 @@
{
MinInnerWindow min = sender as MinInnerWindow;
min.Inner.Visibility = Visibility.Visible;
+ CanvasHelper.SetTopZIndex(min.Inner, WorkArea, typeof(InnerWindow));
BottomBar.RemoveMinWindow(min);
}
--
Gitblit v1.9.1