remove ShowMainWindowOnClickProperty
This commit is contained in:
1 parent
7b05651cc0
commit
ae98ecaae0
2 files changed
+18
-51
No files matched your search
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.ComponentModel;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Interop;
|
using System.Windows.Interop;
|
||||||
@@ -111,34 +112,26 @@ namespace HandyControl.Controls
|
|||||||
public static bool GetShowInTaskManager(DependencyObject element)
|
public static bool GetShowInTaskManager(DependencyObject element)
|
||||||
=> (bool)element.GetValue(ShowInTaskManagerProperty);
|
=> (bool)element.GetValue(ShowInTaskManagerProperty);
|
||||||
|
|
||||||
/// <summary>
|
public static readonly DependencyProperty HideWhenClosingProperty = DependencyProperty.RegisterAttached(
|
||||||
/// 隐藏窗口而不是关闭,在使用 <see cref="NotifyIcon"/> 时很有用,这时点击主窗口的关闭按钮通常是隐藏窗口而不是退出程序
|
"HideWhenClosing", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnHideWhenClosingChanged));
|
||||||
/// </summary>
|
|
||||||
public static readonly DependencyProperty HiddenInsteadCloseProperty =
|
|
||||||
DependencyProperty.RegisterAttached("HiddenInsteadClose", typeof(bool), typeof(WindowAttach), new PropertyMetadata(false, HiddenInsteadClosePropertyChanged));
|
|
||||||
|
|
||||||
public static bool GetHiddenInsteadClose(DependencyObject obj)
|
private static void OnHideWhenClosingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
return (bool)obj.GetValue(HiddenInsteadCloseProperty);
|
if (d is System.Windows.Window window)
|
||||||
}
|
|
||||||
|
|
||||||
public static void SetHiddenInsteadClose(DependencyObject obj, bool value)
|
|
||||||
{
|
|
||||||
obj.SetValue(HiddenInsteadCloseProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void HiddenInsteadClosePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
|
||||||
{
|
|
||||||
if (d is System.Windows.Window window && e.NewValue is bool enabled)
|
|
||||||
{
|
{
|
||||||
if (enabled)
|
var v = (bool)e.NewValue;
|
||||||
|
if (v)
|
||||||
|
{
|
||||||
window.Closing += Window_Closing;
|
window.Closing += Window_Closing;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
window.Closing -= Window_Closing;
|
window.Closing -= Window_Closing;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
|
private static void Window_Closing(object sender, CancelEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is System.Windows.Window window)
|
if (sender is System.Windows.Window window)
|
||||||
{
|
{
|
||||||
@@ -146,5 +139,11 @@ namespace HandyControl.Controls
|
|||||||
e.Cancel = true;
|
e.Cancel = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void SetHideWhenClosing(DependencyObject element, bool value)
|
||||||
|
=> element.SetValue(HideWhenClosingProperty, value);
|
||||||
|
|
||||||
|
public static bool GetHideWhenClosing(DependencyObject element)
|
||||||
|
=> (bool) element.GetValue(HideWhenClosingProperty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -387,38 +387,6 @@ namespace HandyControl.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty ShowMainWindowOnClickProperty =
|
|
||||||
DependencyProperty.RegisterAttached("ShowMainWindowOnClick", typeof(bool), typeof(NotifyIcon),
|
|
||||||
new PropertyMetadata(false, OnShowMainWindowOnClickChanged));
|
|
||||||
|
|
||||||
private static void OnShowMainWindowOnClickChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
|
||||||
{
|
|
||||||
if (d is NotifyIcon notifyIcon && e.NewValue is bool enabled)
|
|
||||||
{
|
|
||||||
if (enabled)
|
|
||||||
notifyIcon.Click += NotifyIcon_Click;
|
|
||||||
else
|
|
||||||
notifyIcon.Click -= NotifyIcon_Click;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void NotifyIcon_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if (sender is NotifyIcon)
|
|
||||||
{
|
|
||||||
Application.Current.MainWindow.Show();
|
|
||||||
Application.Current.MainWindow.Activate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 设置或获取点击托盘图标时是否显示主窗口
|
|
||||||
/// </summary>
|
|
||||||
public bool ShowMainWindowOnClick {
|
|
||||||
get => (bool)GetValue(ShowMainWindowOnClickProperty);
|
|
||||||
set => SetValue(ShowMainWindowOnClickProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
//referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
|
//referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
|
||||||
private IntPtr FindTrayToolbarWindow()
|
private IntPtr FindTrayToolbarWindow()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user