Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Settings: small tweaks to VCM page #24735

Merged
merged 7 commits into from
Mar 21, 2023
+11 −8
Merged

Settings: small tweaks to VCM page #24735

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
acae5a5
Remove `IsVideoConferenceBuild`
Jay-o-Way Mar 10, 2023
b97a679
small tweaks VCM page
Jay-o-Way Mar 10, 2023
cd8f8ef
Merge branch 'microsoft:main' into remove-VCM-logic
Jay-o-Way Mar 16, 2023
ab8a52d
Button: Visibility --> IsEnabled
Jay-o-Way Mar 16, 2023
444aaa7
Merge branch 'microsoft:main' into remove-VCM-logic
Jay-o-Way Mar 17, 2023
d0b4087
Revert "Remove `IsVideoConferenceBuild`"
Jay-o-Way Mar 18, 2023
d746132
negate IsOpen bool
Jay-o-Way Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/settings-ui/Settings.UI/Views/VideoConference.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
x:Name="EmptyToCollapsedConverter"
EmptyValue="Collapsed"
NotEmptyValue="Visible" />
<converters:StringVisibilityConverter
x:Name="EmptyToBoolConverter"
EmptyValue="False"
NotEmptyValue="True" />
</Page.Resources>

<controls:SettingsPageControl
Expand All @@ -28,7 +32,7 @@
IsClosable="False"
IsOpen="True"
IsTabStop="True"
Severity="Error">
Severity="Informational">
<InfoBar.ActionButton>
<HyperlinkButton
x:Uid="VideoConference_DeprecationWarningButton"
Expand All @@ -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"/>
Jay-o-Way marked this conversation as resolved.
Show resolved Hide resolved
<InfoBar
x:Uid="GPO_IsSettingForced"
IsClosable="False"
Expand Down Expand Up @@ -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}}">
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@niels9001 When I change EmptyToCollapsedConverter to StringVisibilityConverter, things break. Do you know why?

<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}"
Expand Down