Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AcrylicWindow's acrylic effects #114

Merged
merged 4 commits into from
Jul 4, 2021
Merged

Update AcrylicWindow's acrylic effects #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d12d2df
Update AcrylicWindow
sourcechord Mar 26, 2021
84e2636
Update AcrylicWindow
sourcechord Jul 3, 2021
58f7d84
Update AcrylicWindow
sourcechord Jul 4, 2021
b5f81d7
Update samples
sourcechord Jul 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FluentWPF/AcrylicContextMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected override void OnOpened(RoutedEventArgs e)
base.OnOpened(e);

var hwnd = (HwndSource)HwndSource.FromVisual(this);
AcrylicHelper.EnableBlur(hwnd.Handle, AccentFlagsType.Popup);
AcrylicHelper.SetBlur(hwnd.Handle, AccentFlagsType.Popup);
}
}
}
2 changes: 1 addition & 1 deletion FluentWPF/AcrylicPopup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected override void OnOpened(EventArgs e)
base.OnOpened(e);

var hwnd = (HwndSource)HwndSource.FromVisual(this.Child);
AcrylicHelper.EnableBlur(hwnd.Handle, AccentFlagsType.Popup);
AcrylicHelper.SetBlur(hwnd.Handle, AccentFlagsType.Popup);
}
}
}
2 changes: 1 addition & 1 deletion FluentWPF/AcrylicToolTip.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected override void OnOpened(RoutedEventArgs e)
{
base.OnOpened(e);
var hwnd = (HwndSource)HwndSource.FromVisual(this);
AcrylicHelper.EnableBlur(hwnd.Handle, AccentFlagsType.Popup);
AcrylicHelper.SetBlur(hwnd.Handle, AccentFlagsType.Popup);
}
}
}
362 changes: 343 additions & 19 deletions FluentWPF/AcrylicWindow.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion FluentWPF/RevealPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace SourceChord.FluentWPF
[TemplateVisualState(Name = "MouseOver", GroupName = "CommonStates")]
[TemplateVisualState(Name = "Pressed", GroupName = "CommonStates")]
[TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")]
public class RevealPanel : ContentControl//Control
public class RevealPanel : ContentControl
{
public bool IsPressed
{
Expand Down
10 changes: 9 additions & 1 deletion FluentWPF/Styles/Window.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="{Binding Path=(local:AccentColors.ImmersiveSystemAccentBrush)}" />
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="WindowStyle" Value="None" />
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate>
Expand Down Expand Up @@ -388,7 +389,14 @@
<Trigger Property="local:AcrylicWindow.AcrylicWindowStyle" Value="None">
</Trigger>
<Trigger Property="WindowState" Value="Maximized">
<Setter Property="BorderThickness" Value="8" />
<Setter Property="WindowChrome.WindowChrome">
<Setter.Value>
<WindowChrome CaptionHeight="{x:Static SystemParameters.CaptionHeight}"
GlassFrameThickness="1"
ResizeBorderThickness="0" UseAeroCaptionButtons="False" />
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="0"/>
</Trigger>
</Style.Triggers>
</Style>
Expand Down
51 changes: 29 additions & 22 deletions FluentWPF/Utility/AcrylicHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,11 @@ internal static class AcrylicHelper
[DllImport("user32.dll")]
internal static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref WindowCompositionAttributeData data);

internal static void EnableBlur(IntPtr hwnd, AccentFlagsType style = AccentFlagsType.Window)
internal static void SetBlur(IntPtr hwnd, AccentFlagsType style = AccentFlagsType.Window, AccentState? state = null)
{
var accent = new AccentPolicy();
var accentStructSize = Marshal.SizeOf(accent);
// ウィンドウ背景のぼかしを行うのはWindows10の場合のみ
// OSのバージョンに従い、AccentStateを切り替える
var currentVersion = SystemInfo.Version.Value;
if (currentVersion >= VersionInfos.Windows10_1903)
{
// Windows10 1903以降では、ACCENT_ENABLE_ACRYLICBLURBEHINDを用いると、ウィンドウのドラッグ移動などでマウス操作に追従しなくなる。
// SetWindowCompositionAttribute関数の動作が修正されるまで、ACCENT_ENABLE_ACRYLICBLURBEHINDは使用しない。
accent.AccentState = AccentState.ACCENT_ENABLE_BLURBEHIND;
}
else if (currentVersion >= VersionInfos.Windows10_1809)
{
accent.AccentState = AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND;
}
else if (currentVersion >= VersionInfos.Windows10)
{
accent.AccentState = AccentState.ACCENT_ENABLE_BLURBEHIND;
}
else
{
accent.AccentState = AccentState.ACCENT_ENABLE_TRANSPARENTGRADIENT;
}
accent.AccentState = state ?? SelectAccentState();

if (style == AccentFlagsType.Window)
{
Expand All @@ -102,5 +82,32 @@ internal static void EnableBlur(IntPtr hwnd, AccentFlagsType style = AccentFlags

Marshal.FreeHGlobal(accentPtr);
}

internal static AccentState SelectAccentState(AcrylicAccentState state = AcrylicAccentState.Default)
{
// ウィンドウのアクリル効果を設定する
AccentState value = state switch
{
// ウィンドウ背景のぼかしを行うのはWindows10の場合のみ
// OSのバージョンに従い、AccentStateを切り替える
AcrylicAccentState.Default => SystemInfo.Version.Value switch
{
// Windows10 1903以降では、ACCENT_ENABLE_ACRYLICBLURBEHINDを用いると、ウィンドウのドラッグ移動などでマウス操作に追従しなくなる。
// ウィンドウの移動/リサイズ中だけ、ACCENT_ENABLE_ACRYLICBLURBEHINDを無効にして、この問題を回避する
//var version when version >= VersionInfos.Windows10_1903 => AccentState.ACCENT_ENABLE_BLURBEHIND,
var version when version >= VersionInfos.Windows10_1809 => AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND,
var version when version >= VersionInfos.Windows10 => AccentState.ACCENT_ENABLE_BLURBEHIND,
_ => AccentState.ACCENT_ENABLE_TRANSPARENTGRADIENT,
},
AcrylicAccentState.Disabled => AccentState.ACCENT_DISABLED,
AcrylicAccentState.Gradient => AccentState.ACCENT_ENABLE_GRADIENT,
AcrylicAccentState.TransparentGradient => AccentState.ACCENT_ENABLE_TRANSPARENTGRADIENT,
AcrylicAccentState.BlurBehind => AccentState.ACCENT_ENABLE_BLURBEHIND,
AcrylicAccentState.AcrylicBlurBehind => AccentState.ACCENT_ENABLE_ACRYLICBLURBEHIND,
_ => throw new InvalidOperationException(),
};

return value;
}
}
}
20 changes: 16 additions & 4 deletions Sample/FluentWPFSample/Views/AcrylicWindow3.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
Title="AcrylicWindow3" Height="450" Width="800"
ResizeMode="CanResizeWithGrip"
fw:AcrylicWindow.AcrylicWindowStyle="{Binding SelectedValue, ElementName=cmbStyle}"
fw:AcrylicWindow.AcrylicAccentState="{Binding SelectedValue, ElementName=cmbState}"
Icon="/Assets/Images/logo_icon.png">
<Window.Style>
<Style TargetType="{x:Type Window}">
Expand Down Expand Up @@ -46,12 +47,23 @@
<x:Type TypeName="fw:AcrylicWindowStyle"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ObjectDataProvider x:Key="states" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="fw:AcrylicAccentState"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
</Window.Resources>
<Grid>
<TextBlock HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="AcrylicWindowStyle" VerticalAlignment="Top"/>
<ComboBox x:Name="cmbStyle" HorizontalAlignment="Left" Margin="10,31,0,0" VerticalAlignment="Top" Width="120"
<TextBlock HorizontalAlignment="Left" Margin="10,32,0,0" TextWrapping="Wrap" Text="AcrylicAccentState" VerticalAlignment="Top"/>
<ComboBox x:Name="cmbState" HorizontalAlignment="Left" Margin="10,53,0,0" VerticalAlignment="Top" Width="120"
ItemsSource="{Binding Source={StaticResource states}}"
SelectedIndex="5"/>

<TextBlock HorizontalAlignment="Left" Margin="10,111,0,0" TextWrapping="Wrap" Text="AcrylicWindowStyle" VerticalAlignment="Top"/>
<ComboBox x:Name="cmbStyle" HorizontalAlignment="Left" Margin="10,132,0,0" VerticalAlignment="Top" Width="120"
ItemsSource="{Binding Source={StaticResource styles}}"
SelectedIndex="0"/>
<CheckBox x:Name="chkCustomTitleBar" Content="Custom TitleBar" HorizontalAlignment="Left" Margin="10,80,0,0" VerticalAlignment="Top"/>
<CheckBox x:Name="chkCustomTitleBar" Content="Custom TitleBar" HorizontalAlignment="Left" Margin="10,169,0,0" VerticalAlignment="Top"/>

</Grid>
</fw:AcrylicWindow>
</fw:AcrylicWindow>
5 changes: 1 addition & 4 deletions Sample/FluentWPFSample/Views/MusicPlayer.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
xmlns:local="clr-namespace:FluentWPFSample.Views"
xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
mc:Ignorable="d"
Title="MusicPlayer" Height="300" Width="300"
fw:AcrylicWindow.Enabled="True">
Title="MusicPlayer" Height="300" Width="300">
<Grid fw:PointerTracker.Enabled="True" Background="#01FFFFFF">
<Grid Height="70" VerticalAlignment="Bottom" HorizontalAlignment="Center">
<Grid.Resources>
Expand All @@ -18,8 +17,6 @@
<Setter Property="Background" Value="Transparent" />
<Setter Property="FontSize" Value="20" />
<Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
<!--<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />-->
</Style>
</Grid.Resources>
<Grid.ColumnDefinitions>
Expand Down