Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 04:07:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImageResizer: skip Settings tab focus when hidden

Browse Source
This commit is contained in:
yuyoyuppe
2020-10-31 02:57:56 +03:00
committed by Andrey Nekrasov
parent 49811fc4b8
commit ccf02579e6
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/imageresizer/ui/App.xaml
View File

@@ -23,6 +23,7 @@
<v:EnumValueConverter x:Key="EnumValueConverter"/> <v:EnumValueConverter x:Key="EnumValueConverter"/>
<v:AutoDoubleConverter x:Key="AutoDoubleConverter"/> <v:AutoDoubleConverter x:Key="AutoDoubleConverter"/>
<v:BoolValueConverter x:Key="BoolValueConverter"/> <v:BoolValueConverter x:Key="BoolValueConverter"/>
<v:VisibilityBoolConverter x:Key="VisibilityBoolConverter"/>
<Style x:Key="MainInstructionTextBlockStyle" TargetType="TextBlock"> <Style x:Key="MainInstructionTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="12pt"/> <Setter Property="FontSize" Value="12pt"/>
<Setter Property="Foreground" Value="#039"/> <Setter Property="Foreground" Value="#039"/>

2
src/modules/imageresizer/ui/Views/BoolValueConverter.cs
View File

@@ -16,6 +16,6 @@ namespace ImageResizer.Views
=> (bool)value ? Visibility.Visible : Visibility.Collapsed; => (bool)value ? Visibility.Visible : Visibility.Collapsed;
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
=> throw new NotImplementedException(); => (Visibility)value == Visibility.Visible;
} }
} }

9
src/modules/imageresizer/ui/Views/InputPage.xaml
View File

@@ -130,9 +130,12 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" <TextBlock x:Name="AdvancedSettingsTextBlock"
Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}"> VerticalAlignment="Center"
Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}"
IsEnabled="{Binding Visibility,ElementName=AdvancedSettingsTextBlock, Converter={StaticResource VisibilityBoolConverter}}"
Focusable="{Binding Visibility,ElementName=AdvancedSettingsTextBlock, Converter={StaticResource VisibilityBoolConverter}}">
<local:AccessibleHyperlink ControlType="Button" Command="{Binding ShowAdvancedCommand}"> <local:AccessibleHyperlink ControlType="Button" Command="{Binding ShowAdvancedCommand}">
<Run Text="{x:Static p:Resources.Input_ShowAdvanced}"/> <Run Text="{x:Static p:Resources.Input_ShowAdvanced}"/>
</local:AccessibleHyperlink> </local:AccessibleHyperlink>

21
src/modules/imageresizer/ui/Views/VisibilityBoolConverter.cs Normal file
View File

@@ -0,0 +1,21 @@
// Copyright (c) Brice Lambson
// The Brice Lambson licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information. Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
using System;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
namespace ImageResizer.Views
{
[ValueConversion(typeof(Visibility), typeof(bool))]
internal class VisibilityBoolConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
=> (Visibility)value == Visibility.Visible;
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
=> (bool)value ? Visibility.Visible : Visibility.Collapsed;
}
}