完善Zindex层级显示

chr

2024-02-24 4adf06e546f77eeba227474e633dcc0105f802f9

 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,12 +115,20 @@

        }

        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)
@@ -173,6 +176,7 @@
        {
            MinInnerWindow min = sender as MinInnerWindow;
            min.Inner.Visibility = Visibility.Visible;
            CanvasHelper.SetTopZIndex(min.Inner, WorkArea, typeof(InnerWindow));
            BottomBar.RemoveMinWindow(min);
        }