From 5214df42a6109bcdc109afbc39c1483b46098ab0 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 8 Mar 2021 12:34:31 +0100
Subject: [PATCH] FZ disabled fix (#10100)

Co-authored-by: Niels Laute <niels9001@hotmail.com>
---
 .../Strings/en-us/Resources.resw                       |  2 +-
 .../Views/FancyZonesPage.xaml                          | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 21b8c0d511..10af378234 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -943,7 +943,7 @@
   <data name="FancyZones_OverlappingZonesSmallest.Content" xml:space="preserve">
     <value>Activate the smallest zone by area</value>
   </data>
-  <data name="FancyZones_OverlappingZonesLabel.Text" xml:space="preserve">
+  <data name="FancyZones_OverlappingZones.Header" xml:space="preserve">
     <value>When multiple zones overlap:</value>
   </data>
   <data name="PowerLauncher_Plugins.Text" xml:space="preserve">
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
index 2a9dc601a4..f20aa59cde 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -123,15 +123,11 @@
             <CheckBox x:Uid="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl"
                       IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}"
                       Margin="{StaticResource XSmallTopMargin}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
+                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" />
 
-            <TextBlock x:Uid="FancyZones_OverlappingZonesLabel"
-                       Margin="{StaticResource SmallTopMargin}"
-                       Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
-
-            <ComboBox Name="FancyZones_OverlappingZonesComboBox"
-                      x:Uid="FancyZones_OverlappingZonesComboBox"
+            <ComboBox x:Uid="FancyZones_OverlappingZones"
                       SelectedIndex="{x:Bind Path=ViewModel.OverlappingZonesAlgorithmIndex, Mode=TwoWay}"
+                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                       VerticalAlignment="Center"
                       Width="{StaticResource MaxComboBoxWidth}"
                       Margin="{StaticResource SmallTopMargin}">