Skip to content

Commit

Permalink
[Mouse Jump] - fixing xaml formatting - microsoft#25482
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeclayton committed Aug 7, 2024
1 parent f33d5d0 commit 2c23ae2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
</tkcontrols:SettingsCard>

<tkcontrols:SettingsCard
x:Uid="MouseUtils_MouseJump_ThumbnailSize"
x:Name="MouseUtils_MouseJump_ThumbnailSize"
x:Uid="MouseUtils_MouseJump_ThumbnailSize"
HeaderIcon="{ui:FontIcon Glyph=&#xE740;}"
IsEnabled="{x:Bind ViewModel.IsMouseJumpEnabled, Mode=OneWay}">
<tkcontrols:SettingsCard.Description>
Expand Down Expand Up @@ -133,17 +133,12 @@
MaxHeight="300"
Loaded="PreviewImage_Loaded">
<Grid
HorizontalAlignment="Stretch"
MinHeight="283"
MaxHeight="283"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
<StackPanel
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Image
Source="{x:Bind Path=ViewModel.MouseJumpPreviewImage, Mode=OneWay}"
Stretch="None"
/>
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<Image Source="{x:Bind Path=ViewModel.MouseJumpPreviewImage, Mode=OneWay}" Stretch="None" />
</StackPanel>
</Grid>
</tkcontrols:SettingsCard>
Expand All @@ -156,13 +151,13 @@
SelectionMode="Single"
Style="{StaticResource ButtonSegmentedStyle}">
<tkcontrols:SegmentedItem>
<TextBlock x:Uid="MouseUtils_MouseJump_PreviewType_Compact"></TextBlock>
<TextBlock x:Uid="MouseUtils_MouseJump_PreviewType_Compact" />
</tkcontrols:SegmentedItem>
<tkcontrols:SegmentedItem>
<TextBlock x:Uid="MouseUtils_MouseJump_PreviewType_Bezelled"></TextBlock>
<TextBlock x:Uid="MouseUtils_MouseJump_PreviewType_Bezelled" />
</tkcontrols:SegmentedItem>
<tkcontrols:SegmentedItem>
<TextBlock x:Uid="MouseUtils_MouseJump_PreviewType_Custom"></TextBlock>
<TextBlock x:Uid="MouseUtils_MouseJump_PreviewType_Custom" />
</tkcontrols:SegmentedItem>
</tkcontrols:Segmented>
<Button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ bool TryFindFrameworkElement(SettingsCard settingsCard, string partName, out Fra

/*
apply a variation of the "Left" VisualState for SettingsCards
to center the preview image in the true center of the card
see https://github.com/CommunityToolkit/Windows/blob/9c7642ff35eaaa51a404f9bcd04b10c7cf851921/components/SettingsControls/src/SettingsCard/SettingsCard.xaml#L334-L347
*/

Expand Down
2 changes: 1 addition & 1 deletion src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -3989,7 +3989,7 @@ Activate by holding the key for the character you want to add an accent to, then
<value>Appearance</value>
</data>
<data name="MouseUtils_MouseJump_PreviewType.Header" xml:space="preserve">
<value>Preview Style</value>
<value>Preview style</value>
</data>
<data name="MouseUtils_MouseJump_PreviewType.Description" xml:space="preserve">
<value>Select a predefined style, or apply a custom one</value>
Expand Down

0 comments on commit 2c23ae2

Please sign in to comment.