From 061d724f44d25b3fed3c76baa27d99263cc25589 Mon Sep 17 00:00:00 2001
From: Jay <65828559+Jay-o-Way@users.noreply.github.com>
Date: Tue, 21 Mar 2023 13:02:28 +0100
Subject: [PATCH] Settings: small tweaks to VCM page (#24735)

* Remove `IsVideoConferenceBuild`

* small tweaks VCM page

* Button: Visibility --> IsEnabled

* Revert "Remove `IsVideoConferenceBuild`"

This reverts commit acae5a5f3a4a1baedc48aeb7dc48e23116693307.

* negate IsOpen bool
---
 .../Settings.UI/Views/VideoConference.xaml    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/settings-ui/Settings.UI/Views/VideoConference.xaml b/src/settings-ui/Settings.UI/Views/VideoConference.xaml
index ade28abe6a..7d94dde096 100644
--- a/src/settings-ui/Settings.UI/Views/VideoConference.xaml
+++ b/src/settings-ui/Settings.UI/Views/VideoConference.xaml
@@ -15,6 +15,10 @@
             x:Name="EmptyToCollapsedConverter"
             EmptyValue="Collapsed"
             NotEmptyValue="Visible" />
+        <converters:StringVisibilityConverter
+            x:Name="EmptyToBoolConverter"
+            EmptyValue="False"
+            NotEmptyValue="True" />
     </Page.Resources>
 
     <controls:SettingsPageControl
@@ -28,7 +32,7 @@
                     IsClosable="False"
                     IsOpen="True"
                     IsTabStop="True"
-                    Severity="Error">
+                    Severity="Informational">
                     <InfoBar.ActionButton>
                         <HyperlinkButton
                             x:Uid="VideoConference_DeprecationWarningButton"
@@ -49,10 +53,9 @@
                 <InfoBar
                     x:Uid="VideoConference_RunAsAdminRequired"
                     IsClosable="False"
-                    IsOpen="True"
+                    IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource BoolNegationConverter}}"
                     IsTabStop="True"
-                    Severity="Warning"
-                    Visibility="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource ReverseBoolToVisibilityConverter}}" />
+                    Severity="Informational"/>
                 <InfoBar
                     x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
@@ -117,15 +120,15 @@
                                     <Button
                                         x:Uid="VideoConference_CameraOverlayImageClear"
                                         Command="{Binding Mode=OneWay, Path=ClearOverlayImage}"
-                                        Visibility="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToCollapsedConverter}}" />
+                                        IsEnabled="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToBoolConverter}}" />
                                 </StackPanel>
                             </labs:SettingsCard>
-                            <labs:SettingsCard>
+                            <labs:SettingsCard
+                                Visibility="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToCollapsedConverter}}">
                                 <Border
                                     MaxHeight="100"
                                     HorizontalAlignment="Right"
-                                    CornerRadius="4"
-                                    Visibility="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToCollapsedConverter}}">
+                                    CornerRadius="4">
                                     <Image
                                         x:Uid="VideoConference_CameraOverlayImageAlt"
                                         Source="{Binding Mode=OneWay, Path=CameraImageOverlayPath}"