From ccf02579e6705ce990c7d7a5736386385a106c5a Mon Sep 17 00:00:00 2001
From: yuyoyuppe <a.yuyoyuppe@gmail.com>
Date: Sat, 31 Oct 2020 02:57:56 +0300
Subject: [PATCH] ImageResizer: skip Settings tab focus when hidden

---
 src/modules/imageresizer/ui/App.xaml          |  1 +
 .../ui/Views/BoolValueConverter.cs            |  2 +-
 .../imageresizer/ui/Views/InputPage.xaml      |  9 +++++---
 .../ui/Views/VisibilityBoolConverter.cs       | 21 +++++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 src/modules/imageresizer/ui/Views/VisibilityBoolConverter.cs

diff --git a/src/modules/imageresizer/ui/App.xaml b/src/modules/imageresizer/ui/App.xaml
index 092f74ea24..85bf35ee18 100644
--- a/src/modules/imageresizer/ui/App.xaml
+++ b/src/modules/imageresizer/ui/App.xaml
@@ -23,6 +23,7 @@
         <v:EnumValueConverter x:Key="EnumValueConverter"/>
         <v:AutoDoubleConverter x:Key="AutoDoubleConverter"/>
         <v:BoolValueConverter x:Key="BoolValueConverter"/>
+        <v:VisibilityBoolConverter x:Key="VisibilityBoolConverter"/>
         <Style x:Key="MainInstructionTextBlockStyle" TargetType="TextBlock">
             <Setter Property="FontSize" Value="12pt"/>
             <Setter Property="Foreground" Value="#039"/>
diff --git a/src/modules/imageresizer/ui/Views/BoolValueConverter.cs b/src/modules/imageresizer/ui/Views/BoolValueConverter.cs
index 16274d611f..d8b0ac6d25 100644
--- a/src/modules/imageresizer/ui/Views/BoolValueConverter.cs
+++ b/src/modules/imageresizer/ui/Views/BoolValueConverter.cs
@@ -16,6 +16,6 @@ namespace ImageResizer.Views
             => (bool)value ? Visibility.Visible : Visibility.Collapsed;
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            => throw new NotImplementedException();
+            => (Visibility)value == Visibility.Visible;
     }
 }
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index 6ee6678e48..f12a37711a 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -130,9 +130,12 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                
-                <TextBlock VerticalAlignment="Center"
-                           Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}">
+
+                <TextBlock x:Name="AdvancedSettingsTextBlock"
+                           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}">
                         <Run Text="{x:Static p:Resources.Input_ShowAdvanced}"/>
                     </local:AccessibleHyperlink>
diff --git a/src/modules/imageresizer/ui/Views/VisibilityBoolConverter.cs b/src/modules/imageresizer/ui/Views/VisibilityBoolConverter.cs
new file mode 100644
index 0000000000..1ebfdaa751
--- /dev/null
+++ b/src/modules/imageresizer/ui/Views/VisibilityBoolConverter.cs
@@ -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;
+    }
+}