mirror of
https://github.com/microsoft/PowerToys.git
synced 2024-12-24 09:07:59 +08:00
Merge remote-tracking branch 'origin/main' into dev/snickler/net8-upgrade
This commit is contained in:
commit
2371ad7cc4
@ -1,17 +1,17 @@
|
||||
<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
|
||||
<!-- Licensed under the MIT License. See LICENSE in the project root for license information. -->
|
||||
<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
|
||||
<!-- Licensed under the MIT License. See LICENSE in the project root for license information. -->
|
||||
|
||||
<UserControl
|
||||
x:Class="Peek.FilePreviewer.Controls.ShellPreviewHandlerControl"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
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:local="using:Peek.FilePreviewer.Controls"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d"
|
||||
Loaded="UserControl_Loaded"
|
||||
ActualThemeChanged="{x:Bind UpdatePreviewerTheme}"
|
||||
EffectiveViewportChanged="UserControl_EffectiveViewportChanged"
|
||||
IsEnabled="False" IsTabStop="True" GotFocus="UserControl_GotFocus"
|
||||
ActualThemeChanged="{x:Bind UpdatePreviewerTheme}">
|
||||
|
||||
</UserControl>
|
||||
GotFocus="UserControl_GotFocus"
|
||||
IsEnabled="False"
|
||||
IsTabStop="True"
|
||||
Loaded="UserControl_Loaded"
|
||||
mc:Ignorable="d" />
|
||||
|
@ -20,10 +20,10 @@
|
||||
|
||||
<controls:ShellPreviewHandlerControl
|
||||
x:Name="ShellPreviewHandlerPreview"
|
||||
Source="{x:Bind ShellPreviewHandlerPreviewer.Preview, Mode=OneWay}"
|
||||
HandlerVisibility="{x:Bind IsPreviewVisible(ShellPreviewHandlerPreviewer, Previewer.State), Mode=OneWay}"
|
||||
HandlerError="ShellPreviewHandlerPreview_HandlerError"
|
||||
HandlerLoaded="ShellPreviewHandlerPreview_HandlerLoaded"
|
||||
HandlerError="ShellPreviewHandlerPreview_HandlerError" />
|
||||
HandlerVisibility="{x:Bind IsPreviewVisible(ShellPreviewHandlerPreviewer, Previewer.State), Mode=OneWay}"
|
||||
Source="{x:Bind ShellPreviewHandlerPreviewer.Preview, Mode=OneWay}" />
|
||||
|
||||
<Image
|
||||
x:Name="ImagePreview"
|
||||
|
Loading…
Reference in New Issue
Block a user