From ef52fd6fd07508883dce4eb002acda59f0169e59 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 23 四月 2026 10:19:33 +0800
Subject: [PATCH] 优化；
---
WPFProject/Controls/MainTabControl.xaml.cs | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/WPFProject/Controls/MainTabControl.xaml.cs b/WPFProject/Controls/MainTabControl.xaml.cs
index a476ebd..6b3fba5 100644
--- a/WPFProject/Controls/MainTabControl.xaml.cs
+++ b/WPFProject/Controls/MainTabControl.xaml.cs
@@ -1,6 +1,7 @@
锘縰sing HMI.Base;
using HMI.Core.Api;
using Panuon.WPF.UI;
+using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
@@ -11,6 +12,12 @@
namespace WPFProject.Controls
{
+ public class TabChangedEventArg
+ {
+ public IPlugin oldValue { get; set; }
+ public IPlugin newValue { get; set; }
+ }
+
/// <summary>
/// MainTabControl.xaml 鐨勪氦浜掗�昏緫
/// </summary>
@@ -46,21 +53,7 @@
}
// Tab鍒囨崲浜嬩欢
- public static readonly RoutedEvent OnTabChangeEvent =
- EventManager.RegisterRoutedEvent("OnTabChange", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(MenuTabControl));
-
- public event RoutedEventHandler OnTabChange
- {
- add
- {
- AddHandler(OnTabChangeEvent, value);
- }
-
- remove
- {
- RemoveHandler(OnTabChangeEvent, value);
- }
- }
+ public event EventHandler<TabChangedEventArg> TabChanged;
private ObservableCollection<PluginInfo> _MenuItems;
@@ -193,19 +186,21 @@
{
page.Child = (UIElement)content;
}
+ TabChanged?.Invoke(this, new TabChangedEventArg { oldValue = last, newValue = newPlugin });
}
}
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
var ss = ((WindowX)Window.GetWindow(this));
- Binding binding = new Binding("IsMaskVisible")
- {
- Source = ((WindowX)Window.GetWindow(this)),
- Mode = BindingMode.TwoWay,
- UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
- };
- winFormHolder.SetBinding(WinFormHolder.MaskVisiableProperty, binding);
+ /// binding WinformHost 閬僵
+ //Binding binding = new Binding("IsMaskVisible")
+ //{
+ // Source = ((WindowX)Window.GetWindow(this)),
+ // Mode = BindingMode.TwoWay,
+ // UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
+ //};
+ //winFormHolder.SetBinding(WinFormHolder.MaskVisiableProperty, binding);
if (MenuItems != null && MenuItems.Count > 0)
{
SelectedMenu = MenuItems[0];
--
Gitblit v1.9.1