Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 02:36:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Margin fixes

Browse Source
This commit is contained in:
Niels Laute
2021-07-22 13:49:17 +02:00
parent 468709b488
commit eb8a9bb836
16 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SidePanel/SettingsPageControl.xaml
View File

@@ -34,7 +34,7 @@
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage" /> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage" />
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage" /> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage" />
<Setter Target="LinksPanel.Margin" Value="0,12,0,0" /> <Setter Target="LinksPanel.Margin" Value="0,12,0,0" />
<Setter Target="AboutImage.Margin" Value="-12,12,12,0" /> <Setter Target="AboutImage.Margin" Value="0,12,12,0" />
<Setter Target="Header.Margin" Value="24,44,0,0" /> <Setter Target="Header.Margin" Value="24,44,0,0" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
@@ -78,10 +78,12 @@
<HyperlinkButton x:Name="AboutImage" <HyperlinkButton x:Name="AboutImage"
RelativePanel.Below="AboutDescription" RelativePanel.Below="AboutDescription"
MaxWidth="240" MaxWidth="240"
CornerRadius="4" CornerRadius="8"
x:Uid="Learn_More_Description" x:Uid="Learn_More_Description"
Padding="0"
Background="Red"
NavigateUri="{x:Bind ModuleImageLink}" NavigateUri="{x:Bind ModuleImageLink}"
Margin="-12, 12, 0, 12"> Margin="0, 12, 0, 12">
<Image> <Image>
<Image.Source> <Image.Source>
<BitmapImage UriSource="{x:Bind ModuleImageSource}" /> <BitmapImage UriSource="{x:Bind ModuleImageSource}" />

3
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml
View File

@@ -30,7 +30,8 @@
Margin="0,4,0,0" Margin="0,4,0,0"
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Margin="0,0,0,4"> <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

3
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeColorPicker.xaml
View File

@@ -31,7 +31,8 @@
Margin="0,4,0,0" Margin="0,4,0,0"
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" Margin="0,0,0,4"> <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFancyZones.xaml
View File

@@ -30,7 +30,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeFileExplorer.xaml
View File

@@ -31,7 +31,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeImageResizer.xaml
View File

@@ -32,7 +32,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeKBM.xaml
View File

@@ -31,7 +31,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobePowerRename.xaml
View File

@@ -31,7 +31,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeRun.xaml
View File

@@ -32,7 +32,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

5
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
View File

@@ -7,6 +7,7 @@
xmlns:localModels="using:Microsoft.PowerToys.Settings.UI.OOBE.ViewModel" xmlns:localModels="using:Microsoft.PowerToys.Settings.UI.OOBE.ViewModel"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
winui:BackdropMaterial.ApplyToRootOrPageBackground="True"
mc:Ignorable="d" mc:Ignorable="d"
Loaded="UserControl_Loaded"> Loaded="UserControl_Loaded">
@@ -19,8 +20,8 @@
</winui:NavigationViewItem> </winui:NavigationViewItem>
</DataTemplate> </DataTemplate>
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
View File

@@ -32,7 +32,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeVideoConference.xaml
View File

@@ -32,7 +32,7 @@
Text="{x:Bind ViewModel.Description}" /> Text="{x:Bind ViewModel.Description}" />
<HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}" <HyperlinkButton NavigateUri="{x:Bind ViewModel.Link}"
Margin="0,0,0,4"> Margin="-12,0,0,4">
<TextBlock> <TextBlock>
<Run x:Uid="Oobe_LearnMore" /> <Run x:Uid="Oobe_LearnMore" />
<Run Text="{x:Bind ViewModel.ModuleName}" /> <Run Text="{x:Bind ViewModel.ModuleName}" />

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@@ -51,7 +51,7 @@
IsEnabled="{Binding Mode=TwoWay, Path=IsElevated}" IsEnabled="{Binding Mode=TwoWay, Path=IsElevated}"
IsOn="{Binding Mode=TwoWay, Path=RunElevated}"/> IsOn="{Binding Mode=TwoWay, Path=RunElevated}"/>
<HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"> <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp" Margin="-12,0,0,0">
<TextBlock x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link" TextWrapping="Wrap" /> <TextBlock x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link" TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
@@ -73,7 +73,7 @@
<RadioButton x:Uid="Radio_Theme_Default" <RadioButton x:Uid="Radio_Theme_Default"
IsChecked="{ Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}"/> IsChecked="{ Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}"/>
<HyperlinkButton Click="OpenColorsSettings_Click"> <HyperlinkButton Click="OpenColorsSettings_Click" Margin="-12,0,0,0">
<TextBlock x:Uid="Windows_Color_Settings" /> <TextBlock x:Uid="Windows_Color_Settings" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View File

@@ -195,7 +195,7 @@
<ToggleSwitch x:Uid="KeyboardManager_EnableToggle" <ToggleSwitch x:Uid="KeyboardManager_EnableToggle"
IsOn="{x:Bind Path=ViewModel.Enabled, Mode=TwoWay}"/> IsOn="{x:Bind Path=ViewModel.Enabled, Mode=TwoWay}"/>
<HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys" Margin="{StaticResource XSmallTopMargin}"> <HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys" Margin="-12, 8, 0, 0">
<TextBlock x:Uid="KBM_KeysCannotBeRemapped" /> <TextBlock x:Uid="KBM_KeysCannotBeRemapped" />
</HyperlinkButton> </HyperlinkButton>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View File

@@ -161,7 +161,7 @@
<RadioButton x:Uid="Radio_Theme_Default" <RadioButton x:Uid="Radio_Theme_Default"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" /> IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" />
<HyperlinkButton Click="OpenColorsSettings_Click" <HyperlinkButton Click="OpenColorsSettings_Click" Margin="-12,0,0,0"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"> IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
<TextBlock x:Uid="Windows_Color_Settings" /> <TextBlock x:Uid="Windows_Color_Settings" />
</HyperlinkButton> </HyperlinkButton>

1
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View File

@@ -78,6 +78,7 @@
<RadioButton x:Uid="Radio_Theme_Default"/> <RadioButton x:Uid="Radio_Theme_Default"/>
</muxc:RadioButtons> </muxc:RadioButtons>
<HyperlinkButton Click="OpenColorsSettings_Click" <HyperlinkButton Click="OpenColorsSettings_Click"
Margin="-12,0,0,0"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<TextBlock x:Uid="Windows_Color_Settings" /> <TextBlock x:Uid="Windows_Color_Settings" />
</HyperlinkButton> </HyperlinkButton>