16 files changed
+418
-235
No files matched your search
@@ -0,0 +1,41 @@
|
|||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using HandyControl.Data;
|
||||||
|
|
||||||
|
namespace HandyControl.Controls
|
||||||
|
{
|
||||||
|
public static class WindowAttach
|
||||||
|
{
|
||||||
|
public static readonly DependencyProperty IsDragElementProperty = DependencyProperty.RegisterAttached(
|
||||||
|
"IsDragElement", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDragElementChanged));
|
||||||
|
|
||||||
|
public static void SetIsDragElement(DependencyObject element, bool value)
|
||||||
|
=> element.SetValue(IsDragElementProperty, value);
|
||||||
|
|
||||||
|
public static bool GetIsDragElement(DependencyObject element)
|
||||||
|
=> (bool) element.GetValue(IsDragElementProperty);
|
||||||
|
|
||||||
|
private static void OnIsDragElementChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (d is UIElement ctl)
|
||||||
|
{
|
||||||
|
if ((bool)e.NewValue)
|
||||||
|
{
|
||||||
|
ctl.MouseLeftButtonDown += DragElement_MouseLeftButtonDown; ;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ctl.MouseLeftButtonDown -= DragElement_MouseLeftButtonDown;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void DragElement_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
if (sender is DependencyObject obj && e.ButtonState == MouseButtonState.Pressed)
|
||||||
|
{
|
||||||
|
System.Windows.Window.GetWindow(obj)?.DragMove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,17 +6,20 @@ using System.Windows.Input;
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using HandyControl.Data;
|
using HandyControl.Data;
|
||||||
using HandyControl.Tools;
|
using HandyControl.Tools;
|
||||||
|
using HandyControl.Tools.Extension;
|
||||||
#if netle40
|
#if netle40
|
||||||
using Microsoft.Windows.Shell;
|
using Microsoft.Windows.Shell;
|
||||||
#else
|
#else
|
||||||
using System.Windows.Shell;
|
using System.Windows.Shell;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace HandyControl.Controls
|
namespace HandyControl.Controls
|
||||||
{
|
{
|
||||||
|
[TemplatePart(Name = ElementNonClientArea, Type = typeof(UIElement))]
|
||||||
public class Window : System.Windows.Window
|
public class Window : System.Windows.Window
|
||||||
{
|
{
|
||||||
private Thickness _tempThickness;
|
private const string ElementNonClientArea = "PART_NonClientArea";
|
||||||
|
|
||||||
public static readonly DependencyProperty NonClientAreaContentProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty NonClientAreaContentProperty = DependencyProperty.Register(
|
||||||
"NonClientAreaContent", typeof(object), typeof(Window), new PropertyMetadata(default(object)));
|
"NonClientAreaContent", typeof(object), typeof(Window), new PropertyMetadata(default(object)));
|
||||||
@@ -66,42 +69,38 @@ namespace HandyControl.Controls
|
|||||||
new PropertyMetadata(28.0));
|
new PropertyMetadata(28.0));
|
||||||
|
|
||||||
public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty ShowNonClientAreaProperty = DependencyProperty.Register(
|
||||||
"ShowNonClientArea", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.TrueBox));
|
"ShowNonClientArea", typeof(bool), typeof(Window),
|
||||||
|
new PropertyMetadata(ValueBoxes.TrueBox, OnShowNonClientAreaChanged));
|
||||||
|
|
||||||
public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
|
||||||
"ShowTitle", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.FalseBox));
|
"ShowTitle", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.FalseBox));
|
||||||
|
|
||||||
public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
|
||||||
"IsFullScreen", typeof(bool), typeof(Window), new PropertyMetadata(ValueBoxes.FalseBox,
|
"IsFullScreen", typeof(bool), typeof(Window),
|
||||||
(o, args) =>
|
new PropertyMetadata(ValueBoxes.FalseBox, OnIsFullScreenChanged));
|
||||||
{
|
|
||||||
var ctl = (Window)o;
|
private bool _isFullScreen;
|
||||||
var v = (bool)args.NewValue;
|
|
||||||
if (v)
|
private UIElement _nonClientArea;
|
||||||
{
|
|
||||||
ctl.OriginState = ctl.WindowState;
|
private bool _showNonClientArea = true;
|
||||||
ctl.OriginStyle = ctl.WindowStyle;
|
|
||||||
ctl.OriginResizeMode = ctl.ResizeMode;
|
private double _tempNonClientAreaHeight;
|
||||||
ctl.WindowStyle = WindowStyle.None;
|
|
||||||
//下面三行不能改变,就是故意的
|
private Thickness _tempThickness;
|
||||||
ctl.WindowState = WindowState.Maximized;
|
|
||||||
ctl.WindowState = WindowState.Minimized;
|
private WindowState _tempWindowState;
|
||||||
ctl.WindowState = WindowState.Maximized;
|
|
||||||
}
|
private WindowStyle _tempWindowStyle;
|
||||||
else
|
|
||||||
{
|
private ResizeMode _tempResizeMode;
|
||||||
ctl.WindowState = ctl.OriginState;
|
|
||||||
ctl.WindowStyle = ctl.OriginStyle;
|
|
||||||
ctl.ResizeMode = ctl.OriginResizeMode;
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
public Window()
|
public Window()
|
||||||
{
|
{
|
||||||
var chrome = new WindowChrome
|
var chrome = new WindowChrome
|
||||||
{
|
{
|
||||||
CornerRadius = new CornerRadius(),
|
CornerRadius = new CornerRadius(),
|
||||||
GlassFrameThickness = new Thickness(1)
|
GlassFrameThickness = new Thickness(0, 0, 0, 1)
|
||||||
};
|
};
|
||||||
BindingOperations.SetBinding(chrome, WindowChrome.CaptionHeightProperty,
|
BindingOperations.SetBinding(chrome, WindowChrome.CaptionHeightProperty,
|
||||||
new Binding(NonClientAreaHeightProperty.Name) {Source = this});
|
new Binding(NonClientAreaHeightProperty.Name) {Source = this});
|
||||||
@@ -123,9 +122,192 @@ namespace HandyControl.Controls
|
|||||||
(s, e) => WindowState = WindowState.Normal));
|
(s, e) => WindowState = WindowState.Normal));
|
||||||
CommandBindings.Add(new CommandBinding(SystemCommands.CloseWindowCommand, (s, e) => Close()));
|
CommandBindings.Add(new CommandBinding(SystemCommands.CloseWindowCommand, (s, e) => Close()));
|
||||||
CommandBindings.Add(new CommandBinding(SystemCommands.ShowSystemMenuCommand, ShowSystemMenu));
|
CommandBindings.Add(new CommandBinding(SystemCommands.ShowSystemMenuCommand, ShowSystemMenu));
|
||||||
|
|
||||||
|
_tempNonClientAreaHeight = NonClientAreaHeight;
|
||||||
|
_tempWindowState = WindowState;
|
||||||
|
_tempWindowStyle = WindowStyle;
|
||||||
|
_tempResizeMode = ResizeMode;
|
||||||
|
|
||||||
|
SwitchIsFullScreen(_isFullScreen);
|
||||||
|
SwitchShowNonClientArea(_showNonClientArea);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Brush CloseButtonBackground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(CloseButtonBackgroundProperty);
|
||||||
|
set => SetValue(CloseButtonBackgroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush CloseButtonForeground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(CloseButtonForegroundProperty);
|
||||||
|
set => SetValue(CloseButtonForegroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush OtherButtonBackground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(OtherButtonBackgroundProperty);
|
||||||
|
set => SetValue(OtherButtonBackgroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush OtherButtonForeground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(OtherButtonForegroundProperty);
|
||||||
|
set => SetValue(OtherButtonForegroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double NonClientAreaHeight
|
||||||
|
{
|
||||||
|
get => (double) GetValue(NonClientAreaHeightProperty);
|
||||||
|
set => SetValue(NonClientAreaHeightProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsFullScreen
|
||||||
|
{
|
||||||
|
get => (bool) GetValue(IsFullScreenProperty);
|
||||||
|
set => SetValue(IsFullScreenProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public object NonClientAreaContent
|
||||||
|
{
|
||||||
|
get => GetValue(NonClientAreaContentProperty);
|
||||||
|
set => SetValue(NonClientAreaContentProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush CloseButtonHoverBackground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(CloseButtonHoverBackgroundProperty);
|
||||||
|
set => SetValue(CloseButtonHoverBackgroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush CloseButtonHoverForeground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(CloseButtonHoverForegroundProperty);
|
||||||
|
set => SetValue(CloseButtonHoverForegroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush OtherButtonHoverBackground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(OtherButtonHoverBackgroundProperty);
|
||||||
|
set => SetValue(OtherButtonHoverBackgroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush OtherButtonHoverForeground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(OtherButtonHoverForegroundProperty);
|
||||||
|
set => SetValue(OtherButtonHoverForegroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush NonClientAreaBackground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(NonClientAreaBackgroundProperty);
|
||||||
|
set => SetValue(NonClientAreaBackgroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Brush NonClientAreaForeground
|
||||||
|
{
|
||||||
|
get => (Brush) GetValue(NonClientAreaForegroundProperty);
|
||||||
|
set => SetValue(NonClientAreaForegroundProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool ShowNonClientArea
|
||||||
|
{
|
||||||
|
get => (bool) GetValue(ShowNonClientAreaProperty);
|
||||||
|
set => SetValue(ShowNonClientAreaProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool ShowTitle
|
||||||
|
{
|
||||||
|
get => (bool) GetValue(ShowTitleProperty);
|
||||||
|
set => SetValue(ShowTitleProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void OnShowNonClientAreaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
var ctl = (Window) d;
|
||||||
|
ctl.SwitchShowNonClientArea((bool) e.NewValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SwitchShowNonClientArea(bool showNonClientArea)
|
||||||
|
{
|
||||||
|
if (_nonClientArea == null)
|
||||||
|
{
|
||||||
|
_showNonClientArea = showNonClientArea;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (showNonClientArea)
|
||||||
|
{
|
||||||
|
if (IsFullScreen)
|
||||||
|
{
|
||||||
|
_nonClientArea.Show(false);
|
||||||
|
_tempNonClientAreaHeight = NonClientAreaHeight;
|
||||||
|
NonClientAreaHeight = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_nonClientArea.Show(true);
|
||||||
|
NonClientAreaHeight = _tempNonClientAreaHeight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_nonClientArea.Show(false);
|
||||||
|
_tempNonClientAreaHeight = NonClientAreaHeight;
|
||||||
|
NonClientAreaHeight = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void OnIsFullScreenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
var ctl = (Window) d;
|
||||||
|
ctl.SwitchIsFullScreen((bool) e.NewValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SwitchIsFullScreen(bool isFullScreen)
|
||||||
|
{
|
||||||
|
if (_nonClientArea == null)
|
||||||
|
{
|
||||||
|
_isFullScreen = isFullScreen;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isFullScreen)
|
||||||
|
{
|
||||||
|
_nonClientArea.Show(false);
|
||||||
|
_tempNonClientAreaHeight = NonClientAreaHeight;
|
||||||
|
NonClientAreaHeight = 0;
|
||||||
|
|
||||||
|
_tempWindowState = WindowState;
|
||||||
|
_tempWindowStyle = WindowStyle;
|
||||||
|
_tempResizeMode = ResizeMode;
|
||||||
|
WindowStyle = WindowStyle.None;
|
||||||
|
//下面三行不能改变,就是故意的
|
||||||
|
WindowState = WindowState.Maximized;
|
||||||
|
WindowState = WindowState.Minimized;
|
||||||
|
WindowState = WindowState.Maximized;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (ShowNonClientArea)
|
||||||
|
{
|
||||||
|
_nonClientArea.Show(true);
|
||||||
|
NonClientAreaHeight = _tempNonClientAreaHeight;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_nonClientArea.Show(false);
|
||||||
|
_tempNonClientAreaHeight = NonClientAreaHeight;
|
||||||
|
NonClientAreaHeight = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
WindowState = _tempWindowState;
|
||||||
|
WindowStyle = _tempWindowStyle;
|
||||||
|
ResizeMode = _tempResizeMode;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void OnStateChanged(EventArgs e)
|
protected override void OnStateChanged(EventArgs e)
|
||||||
{
|
{
|
||||||
base.OnStateChanged(e);
|
base.OnStateChanged(e);
|
||||||
@@ -143,6 +325,8 @@ namespace HandyControl.Controls
|
|||||||
{
|
{
|
||||||
base.OnApplyTemplate();
|
base.OnApplyTemplate();
|
||||||
|
|
||||||
|
_nonClientArea = GetTemplateChild(ElementNonClientArea) as UIElement;
|
||||||
|
|
||||||
if (SizeToContent != SizeToContent.WidthAndHeight)
|
if (SizeToContent != SizeToContent.WidthAndHeight)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -150,111 +334,6 @@ namespace HandyControl.Controls
|
|||||||
Dispatcher.BeginInvoke(new Action(() => { SizeToContent = SizeToContent.WidthAndHeight; }));
|
Dispatcher.BeginInvoke(new Action(() => { SizeToContent = SizeToContent.WidthAndHeight; }));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Brush CloseButtonBackground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(CloseButtonBackgroundProperty);
|
|
||||||
set => SetValue(CloseButtonBackgroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush CloseButtonForeground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(CloseButtonForegroundProperty);
|
|
||||||
set => SetValue(CloseButtonForegroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush OtherButtonBackground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(OtherButtonBackgroundProperty);
|
|
||||||
set => SetValue(OtherButtonBackgroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush OtherButtonForeground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(OtherButtonForegroundProperty);
|
|
||||||
set => SetValue(OtherButtonForegroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 原始状态
|
|
||||||
/// </summary>
|
|
||||||
private WindowState OriginState { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 原始样式
|
|
||||||
/// </summary>
|
|
||||||
private WindowStyle OriginStyle { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 原始尺寸调节模式
|
|
||||||
/// </summary>
|
|
||||||
private ResizeMode OriginResizeMode { get; set; }
|
|
||||||
|
|
||||||
public double NonClientAreaHeight
|
|
||||||
{
|
|
||||||
get => (double)GetValue(NonClientAreaHeightProperty);
|
|
||||||
set => SetValue(NonClientAreaHeightProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsFullScreen
|
|
||||||
{
|
|
||||||
get => (bool)GetValue(IsFullScreenProperty);
|
|
||||||
set => SetValue(IsFullScreenProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public object NonClientAreaContent
|
|
||||||
{
|
|
||||||
get => GetValue(NonClientAreaContentProperty);
|
|
||||||
set => SetValue(NonClientAreaContentProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush CloseButtonHoverBackground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(CloseButtonHoverBackgroundProperty);
|
|
||||||
set => SetValue(CloseButtonHoverBackgroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush CloseButtonHoverForeground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(CloseButtonHoverForegroundProperty);
|
|
||||||
set => SetValue(CloseButtonHoverForegroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush OtherButtonHoverBackground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(OtherButtonHoverBackgroundProperty);
|
|
||||||
set => SetValue(OtherButtonHoverBackgroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush OtherButtonHoverForeground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(OtherButtonHoverForegroundProperty);
|
|
||||||
set => SetValue(OtherButtonHoverForegroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush NonClientAreaBackground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(NonClientAreaBackgroundProperty);
|
|
||||||
set => SetValue(NonClientAreaBackgroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Brush NonClientAreaForeground
|
|
||||||
{
|
|
||||||
get => (Brush)GetValue(NonClientAreaForegroundProperty);
|
|
||||||
set => SetValue(NonClientAreaForegroundProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool ShowNonClientArea
|
|
||||||
{
|
|
||||||
get => (bool)GetValue(ShowNonClientAreaProperty);
|
|
||||||
set => SetValue(ShowNonClientAreaProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool ShowTitle
|
|
||||||
{
|
|
||||||
get => (bool)GetValue(ShowTitleProperty);
|
|
||||||
set => SetValue(ShowTitleProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ShowSystemMenu(object sender, ExecutedRoutedEventArgs e)
|
private void ShowSystemMenu(object sender, ExecutedRoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var point = WindowState == WindowState.Maximized
|
var point = WindowState == WindowState.Maximized
|
||||||
|
|||||||
@@ -114,6 +114,7 @@
|
|||||||
</When>
|
</When>
|
||||||
</Choose>
|
</Choose>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="Controls\Attach\WindowAttach.cs" />
|
||||||
<Compile Include="Controls\Attach\LinkElement.cs" />
|
<Compile Include="Controls\Attach\LinkElement.cs" />
|
||||||
<Compile Include="Controls\Attach\PanelElement.cs" />
|
<Compile Include="Controls\Attach\PanelElement.cs" />
|
||||||
<Compile Include="Controls\Attach\VisualElement.cs" />
|
<Compile Include="Controls\Attach\VisualElement.cs" />
|
||||||
|
|||||||
@@ -53,7 +53,6 @@
|
|||||||
value : The object must be serialized with
|
value : The object must be serialized with
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
value : The object must be serialized into a byte array
|
value : The object must be serialized into a byte array
|
||||||
: using a System.ComponentModel.TypeConverter
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
|||||||
@@ -40,16 +40,16 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
|
<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition/>
|
<ColumnDefinition/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<StackPanel shell:WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
|
<StackPanel shell:WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MinimizeWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MaximizeWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.RestoreWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="shell:SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="shell:SystemCommands.CloseWindowCommand" IsTabStop="False" shell:WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="shell:SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Grid Grid.Column="0">
|
<Grid Grid.Column="0">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -107,9 +107,6 @@
|
|||||||
<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
||||||
<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="ShowNonClientArea" Value="False">
|
|
||||||
<Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
|
|
||||||
</Trigger>
|
|
||||||
<Trigger Property="ShowTitle" Value="False">
|
<Trigger Property="ShowTitle" Value="False">
|
||||||
<Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
|
<Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
@@ -124,15 +121,6 @@
|
|||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
<Style.Triggers>
|
|
||||||
<Trigger Property="IsFullScreen" Value="True">
|
|
||||||
<Setter Property="shell:WindowChrome.WindowChrome">
|
|
||||||
<Setter.Value>
|
|
||||||
<shell:WindowChrome CornerRadius="0" GlassFrameThickness="1" CaptionHeight="0"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
</Trigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
|
<Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
|
||||||
|
|||||||
@@ -39,16 +39,16 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
|
<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition/>
|
<ColumnDefinition/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
|
<StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Grid Grid.Column="0">
|
<Grid Grid.Column="0">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -106,9 +106,6 @@
|
|||||||
<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
||||||
<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="ShowNonClientArea" Value="False">
|
|
||||||
<Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
|
|
||||||
</Trigger>
|
|
||||||
<Trigger Property="ShowTitle" Value="False">
|
<Trigger Property="ShowTitle" Value="False">
|
||||||
<Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
|
<Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
@@ -123,15 +120,6 @@
|
|||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
<Style.Triggers>
|
|
||||||
<Trigger Property="IsFullScreen" Value="True">
|
|
||||||
<Setter Property="WindowChrome.WindowChrome">
|
|
||||||
<Setter.Value>
|
|
||||||
<WindowChrome CornerRadius="0" GlassFrameThickness="1" CaptionHeight="0"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
</Trigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
|
<Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
|
||||||
|
|||||||
@@ -39,16 +39,16 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid Visibility="{TemplateBinding IsFullScreen,Converter={StaticResource Boolean2VisibilityReConverter}}" Background="{TemplateBinding NonClientAreaBackground}" Name="GridMenu" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
|
<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition/>
|
<ColumnDefinition/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
|
<StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" controls:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" WindowChrome.IsHitTestVisibleInChrome="True" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" controls:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" controls:IconElement.Width="10" controls:IconElement.Height="10"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Grid Grid.Column="0">
|
<Grid Grid.Column="0">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -106,9 +106,6 @@
|
|||||||
<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
||||||
<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="ShowNonClientArea" Value="False">
|
|
||||||
<Setter Property="Visibility" Value="Collapsed" TargetName="GridMenu"/>
|
|
||||||
</Trigger>
|
|
||||||
<Trigger Property="ShowTitle" Value="False">
|
<Trigger Property="ShowTitle" Value="False">
|
||||||
<Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
|
<Setter Property="Visibility" Value="Collapsed" TargetName="Title"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
@@ -123,15 +120,6 @@
|
|||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
<Style.Triggers>
|
|
||||||
<Trigger Property="IsFullScreen" Value="True">
|
|
||||||
<Setter Property="WindowChrome.WindowChrome">
|
|
||||||
<Setter.Value>
|
|
||||||
<WindowChrome CornerRadius="0" GlassFrameThickness="1" CaptionHeight="0"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
</Trigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
|
<Style x:Key="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="controls:BlurWindow">
|
||||||
|
|||||||
@@ -64,6 +64,8 @@
|
|||||||
|
|
||||||
public static readonly string BlurWindow = nameof(BlurWindow);
|
public static readonly string BlurWindow = nameof(BlurWindow);
|
||||||
|
|
||||||
|
public static readonly string NoNonClientAreaDragableWindow = nameof(NoNonClientAreaDragableWindow);
|
||||||
|
|
||||||
public static readonly string RateDemoCtl = nameof(RateDemoCtl);
|
public static readonly string RateDemoCtl = nameof(RateDemoCtl);
|
||||||
|
|
||||||
public static readonly string ShieldDemoCtl = nameof(ShieldDemoCtl);
|
public static readonly string ShieldDemoCtl = nameof(ShieldDemoCtl);
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ var controlList = new List<string>
|
|||||||
"FlipClockDemoCtl",
|
"FlipClockDemoCtl",
|
||||||
"QQGroupView",
|
"QQGroupView",
|
||||||
"BlurWindow",
|
"BlurWindow",
|
||||||
|
"NoNonClientAreaDragableWindow",
|
||||||
"RateDemoCtl",
|
"RateDemoCtl",
|
||||||
"ShieldDemoCtl",
|
"ShieldDemoCtl",
|
||||||
"WaterfallPanelDemoCtl",
|
"WaterfallPanelDemoCtl",
|
||||||
|
|||||||
@@ -328,6 +328,9 @@
|
|||||||
<Compile Include="Window\CustomNonClientAreaWindow.xaml.cs">
|
<Compile Include="Window\CustomNonClientAreaWindow.xaml.cs">
|
||||||
<DependentUpon>CustomNonClientAreaWindow.xaml</DependentUpon>
|
<DependentUpon>CustomNonClientAreaWindow.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="Window\NoNonClientAreaDragableWindow.xaml.cs">
|
||||||
|
<DependentUpon>NoNonClientAreaDragableWindow.xaml</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Page Include="MainWindow.xaml">
|
<Page Include="MainWindow.xaml">
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
@@ -664,6 +667,10 @@
|
|||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Include="Window\NoNonClientAreaDragableWindow.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Properties\AssemblyInfo.cs">
|
<Compile Include="Properties\AssemblyInfo.cs">
|
||||||
|
|||||||
+19
-1
@@ -47,7 +47,7 @@ namespace HandyControlDemo.Properties.Langs {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 使用此强类型资源类,为所有资源查找
|
/// 重写当前线程的 CurrentUICulture 属性
|
||||||
/// 重写当前线程的 CurrentUICulture 属性。
|
/// 重写当前线程的 CurrentUICulture 属性。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||||
@@ -366,6 +366,15 @@ namespace HandyControlDemo.Properties.Langs {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 在这里拖拽 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string DragHere {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("DragHere", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 邮箱 的本地化字符串。
|
/// 查找类似 邮箱 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -672,6 +681,15 @@ namespace HandyControlDemo.Properties.Langs {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string OpenNoNonClientAreaDragableWindow {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("OpenNoNonClientAreaDragableWindow", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 轮廓文本 的本地化字符串。
|
/// 查找类似 轮廓文本 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -462,4 +462,10 @@
|
|||||||
<data name="CoverFlow" xml:space="preserve">
|
<data name="CoverFlow" xml:space="preserve">
|
||||||
<value>CoverFlow</value>
|
<value>CoverFlow</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="OpenNoNonClientAreaDragableWindow" xml:space="preserve">
|
||||||
|
<value>open no Non-client Area dragable window</value>
|
||||||
|
</data>
|
||||||
|
<data name="DragHere" xml:space="preserve">
|
||||||
|
<value>Drag here</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -1,76 +1,96 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<root>
|
<root>
|
||||||
<!--
|
<!--
|
||||||
Microsoft ResX Schema
|
Microsoft ResX Schema
|
||||||
|
|
||||||
Version 1.3
|
Version 2.0
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
The primary goals of this format is to allow a simple XML format
|
||||||
that is mostly human readable. The generation and parsing of the
|
that is mostly human readable. The generation and parsing of the
|
||||||
various data types are done through the TypeConverter classes
|
various data types are done through the TypeConverter classes
|
||||||
associated with the data types.
|
associated with the data types.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
... ado.net/XML headers & schema ...
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
<resheader name="version">1.3</resheader>
|
<resheader name="version">2.0</resheader>
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
<data name="Name1">this is my long string</data>
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
[base64 mime encoded serialized .NET Framework object]
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
[base64 mime encoded string representing a byte array form of the .NET Framework object]
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
</data>
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
There are any number of "resheader" rows that contain simple
|
||||||
name/value pairs.
|
name/value pairs.
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
Each data row contains a name, and value. The row also contains a
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
text/value conversion through the TypeConverter architecture.
|
text/value conversion through the TypeConverter architecture.
|
||||||
Classes that don't support this are serialized and stored with the
|
Classes that don't support this are serialized and stored with the
|
||||||
mimetype set.
|
mimetype set.
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
The mimetype is used for serialized objects, and tells the
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
read any of the formats listed below.
|
read any of the formats listed below.
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
value : The object must be serialized with
|
value : The object must be serialized with
|
||||||
: System.Serialization.Formatters.Binary.BinaryFormatter
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
value : The object must be serialized with
|
value : The object must be serialized with
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
value : The object must be serialized into a byte array
|
value : The object must be serialized into a byte array
|
||||||
: using a System.ComponentModel.TypeConverter
|
: using a System.ComponentModel.TypeConverter
|
||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
@@ -89,13 +109,13 @@
|
|||||||
<value>text/microsoft-resx</value>
|
<value>text/microsoft-resx</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<resheader name="version">
|
<resheader name="version">
|
||||||
<value>1.3</value>
|
<value>2.0</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<resheader name="reader">
|
<resheader name="reader">
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<data name="Controls" xml:space="preserve">
|
<data name="Controls" xml:space="preserve">
|
||||||
<value>控件</value>
|
<value>控件</value>
|
||||||
@@ -442,4 +462,10 @@
|
|||||||
<data name="CoverFlow" xml:space="preserve">
|
<data name="CoverFlow" xml:space="preserve">
|
||||||
<value>封面流</value>
|
<value>封面流</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="OpenNoNonClientAreaDragableWindow" xml:space="preserve">
|
||||||
|
<value>打开无非客户端区域可拖拽窗口</value>
|
||||||
|
</data>
|
||||||
|
<data name="DragHere" xml:space="preserve">
|
||||||
|
<value>在这里拖拽</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -7,13 +7,14 @@
|
|||||||
DataContext="{Binding WindowDemo,Source={StaticResource Locator}}"
|
DataContext="{Binding WindowDemo,Source={StaticResource Locator}}"
|
||||||
Background="{DynamicResource RegionBrush}">
|
Background="{DynamicResource RegionBrush}">
|
||||||
<controls:TransitioningContentControl>
|
<controls:TransitioningContentControl>
|
||||||
<UniformGrid Margin="32" Columns="3" Rows="2" Height="200">
|
<UniformGrid Margin="32" Columns="3" Rows="3" Height="200">
|
||||||
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{x:Static langs:Lang.OpenCommonWindow}"/>
|
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{x:Static langs:Lang.OpenCommonWindow}"/>
|
||||||
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.BlurWindow}" Content="{x:Static langs:Lang.OpenBlurWindow}"/>
|
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.BlurWindow}" Content="{x:Static langs:Lang.OpenBlurWindow}"/>
|
||||||
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CustomNonClientAreaWindow}" Content="{x:Static langs:Lang.OpenCustomNonClientAreaWindow}"/>
|
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CustomNonClientAreaWindow}" Content="{x:Static langs:Lang.OpenCustomNonClientAreaWindow}"/>
|
||||||
<Button Click="ButtonMessage_OnClick" Content="{x:Static langs:Lang.OpenMessageWindow}"/>
|
<Button Click="ButtonMessage_OnClick" Content="{x:Static langs:Lang.OpenMessageWindow}"/>
|
||||||
<Button Click="ButtonCustomContent_OnClick" Content="{x:Static langs:Lang.OpenCustomContentWindow}"/>
|
<Button Click="ButtonCustomContent_OnClick" Content="{x:Static langs:Lang.OpenCustomContentWindow}"/>
|
||||||
<Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/>
|
<Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{x:Static langs:Lang.OpenMouseFollowWindow}"/>
|
||||||
|
<Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{x:Static langs:Lang.OpenNoNonClientAreaDragableWindow}"/>
|
||||||
</UniformGrid>
|
</UniformGrid>
|
||||||
</controls:TransitioningContentControl>
|
</controls:TransitioningContentControl>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<controls:BlurWindow x:Class="HandyControlDemo.Window.NoNonClientAreaDragableWindow"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
|
||||||
|
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
WindowStartupLocation="CenterScreen"
|
||||||
|
ShowTitle="True"
|
||||||
|
Style="{StaticResource WindowBlur}"
|
||||||
|
Icon="/HandyControlDemo;component/Resources/Img/icon.ico"
|
||||||
|
ShowNonClientArea="False"
|
||||||
|
Title="NoClientDragableWindow"
|
||||||
|
Height="450"
|
||||||
|
Width="800">
|
||||||
|
<Grid>
|
||||||
|
<Rectangle VerticalAlignment="Top" Margin="10" Height="30" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
|
||||||
|
<Border controls:WindowAttach.IsDragElement="True" VerticalAlignment="Top" Margin="11" Height="28" Background="{DynamicResource DarkDefaultBrush}" CornerRadius="4">
|
||||||
|
<TextBlock Text="{x:Static langs:Lang.DragHere}" Style="{StaticResource TextBlockDefault}"/>
|
||||||
|
</Border>
|
||||||
|
<Button Click="ButtonClose_OnClick" HorizontalAlignment="Right" Margin="0,15,15,0" VerticalAlignment="Top" Padding="0" Height="20" Width="20" Style="{StaticResource ButtonPrimary}" controls:IconElement.Geometry="{StaticResource CloseGeometry}" controls:BorderElement.CornerRadius="15"/>
|
||||||
|
</Grid>
|
||||||
|
</controls:BlurWindow>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using System.Windows;
|
||||||
|
|
||||||
|
namespace HandyControlDemo.Window
|
||||||
|
{
|
||||||
|
public partial class NoNonClientAreaDragableWindow
|
||||||
|
{
|
||||||
|
public NoNonClientAreaDragableWindow()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user