mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-20 14:57:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dev/snickler/net8-upgrade

Browse Source
This commit is contained in:
Jeremy Sinclair 2023-10-10 19:02:30 -04:00
commit 2371ad7cc4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/peek/Peek.FilePreviewer/Controls/ShellPreviewHandlerControl.xaml
View File

@ -1,17 +1,17 @@
<!-- Copyright (c) Microsoft Corporation. All rights reserved. --> <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
<!-- Licensed under the MIT License. See LICENSE in the project root for license information. --> <!-- Licensed under the MIT License. See LICENSE in the project root for license information. -->
<UserControl <UserControl
x:Class="Peek.FilePreviewer.Controls.ShellPreviewHandlerControl" x:Class="Peek.FilePreviewer.Controls.ShellPreviewHandlerControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Peek.FilePreviewer.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Peek.FilePreviewer.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" ActualThemeChanged="{x:Bind UpdatePreviewerTheme}"
Loaded="UserControl_Loaded"
EffectiveViewportChanged="UserControl_EffectiveViewportChanged" EffectiveViewportChanged="UserControl_EffectiveViewportChanged"
IsEnabled="False" IsTabStop="True" GotFocus="UserControl_GotFocus" GotFocus="UserControl_GotFocus"
ActualThemeChanged="{x:Bind UpdatePreviewerTheme}"> IsEnabled="False"
IsTabStop="True"
</UserControl> Loaded="UserControl_Loaded"
mc:Ignorable="d" />

6
src/modules/peek/Peek.FilePreviewer/FilePreview.xaml
View File

@ -20,10 +20,10 @@
<controls:ShellPreviewHandlerControl <controls:ShellPreviewHandlerControl
x:Name="ShellPreviewHandlerPreview" x:Name="ShellPreviewHandlerPreview"
Source="{x:Bind ShellPreviewHandlerPreviewer.Preview, Mode=OneWay}" HandlerError="ShellPreviewHandlerPreview_HandlerError"
HandlerVisibility="{x:Bind IsPreviewVisible(ShellPreviewHandlerPreviewer, Previewer.State), Mode=OneWay}"
HandlerLoaded="ShellPreviewHandlerPreview_HandlerLoaded" HandlerLoaded="ShellPreviewHandlerPreview_HandlerLoaded"
HandlerError="ShellPreviewHandlerPreview_HandlerError" /> HandlerVisibility="{x:Bind IsPreviewVisible(ShellPreviewHandlerPreviewer, Previewer.State), Mode=OneWay}"
Source="{x:Bind ShellPreviewHandlerPreviewer.Preview, Mode=OneWay}" />
<Image <Image
x:Name="ImagePreview" x:Name="ImagePreview"