maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[FancyZones][Settings] "Allow zones to span across monitors" prerequisites description. (#12913)

Browse source
This commit is contained in:
Seraphima Zykova 2021-08-31 18:23:00 +03:00 committed by GitHub
parent 19fb3fd56c
commit f7333c89bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 118 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/TextBlockControl.xaml Normal file
View file

@ -0,0 +1,15 @@
<UserControl
x:Class="Microsoft.PowerToys.Settings.UI.Controls.TextBlockControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
d:DesignHeight="300"
d:DesignWidth="400">
<TextBlock x:Name="textBlock"
Text="{Binding Text}"
TextWrapping="WrapWholeWords"
Loaded="TextBlock_Loaded"/>
</UserControl>

76
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/TextBlockControl.xaml.cs Normal file
View file

@ -0,0 +1,76 @@
// Copyright (c) Microsoft Corporation
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.ComponentModel;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
namespace Microsoft.PowerToys.Settings.UI.Controls
{
public sealed partial class TextBlockControl : UserControl
{
public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
"Text",
typeof(string),
typeof(TextBlockControl),
null);
[Localizable(true)]
public string Text
{
get => (string)GetValue(TextProperty);
set => SetValue(TextProperty, value);
}
public static readonly DependencyProperty EnabledForegroundProperty = DependencyProperty.Register(
"EnabledForeground",
typeof(Brush),
typeof(TextBlockControl),
null);
public Brush EnabledForeground
{
get => (Brush)GetValue(EnabledForegroundProperty);
set => SetValue(EnabledForegroundProperty, value);
}
public static readonly DependencyProperty DisabledForegroundProperty = DependencyProperty.Register(
"DisabledForeground",
typeof(Brush),
typeof(TextBlockControl),
null);
public Brush DisabledForeground
{
get => (Brush)GetValue(DisabledForegroundProperty);
set => SetValue(DisabledForegroundProperty, value);
}
public TextBlockControl()
{
this.InitializeComponent();
DataContext = this;
IsEnabledChanged += TextBlockControl_IsEnabledChanged;
}
private void TextBlockControl_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
{
if ((bool)e.NewValue)
{
textBlock.Foreground = EnabledForeground;
}
else
{
textBlock.Foreground = DisabledForeground;
}
}
private void TextBlock_Loaded(object sender, RoutedEventArgs e)
{
textBlock.Foreground = IsEnabled ? EnabledForeground : DisabledForeground;
}
}
}

7
src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View file

@ -115,6 +115,9 @@
<DependentUpon>OOBEPageControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\SettingsPageControl\PageLink.cs" />
<Compile Include="Controls\TextBlockControl.xaml.cs">
<DependentUpon>TextBlockControl.xaml</DependentUpon>
</Compile>
<Compile Include="Converters\AwakeModeToBoolConverter.cs" />
<Compile Include="Converters\ImageResizerFitToStringConverter.cs" />
<Compile Include="Converters\ImageResizerUnitToStringConverter.cs" />
@ -334,6 +337,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\TextBlockControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="OOBE\Views\OobeAwake.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>

7
src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View file

@ -880,8 +880,8 @@
Made with 💗 by Microsoft and the PowerToys community.</value>
<comment>Windows refers to the OS</comment>
</data>
<data name="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl.Content" xml:space="preserve">
<value>Allow zones to span across monitors (all monitors must have the same DPI scaling)</value>
<data name="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl.Text" xml:space="preserve">
<value>Allow zones to span across monitors</value>
</data>
<data name="ImageResizer_Formatting_ActualHeight.Text" xml:space="preserve">
<value>Actual height</value>
@ -1574,4 +1574,7 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<data name="RemoveTooltip.Text" xml:space="preserve">
<value>Remove</value>
</data>
<data name="FancyZones_SpanZonesAcrossMonitorsPrerequisites.Text" xml:space="preserve">
<value>All monitors must have the same DPI scaling and will be treated as one large combined rectangle which contains all monitors.</value>
</data>
</root>

19
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View file

@ -1,4 +1,4 @@
<Page
<Page
x:Class="Microsoft.PowerToys.Settings.UI.Views.FancyZonesPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -73,7 +73,7 @@
</controls:SettingsGroup>
<controls:SettingsGroup x:Uid="FancyZones_Zones" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:SettingsGroup x:Uid="FancyZones_Zones" x:Name="ZonesSettingsGroup" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:SettingExpander IsExpanded="True">
<controls:SettingExpander.Header>
<controls:Setting x:Uid="FancyZones_ZoneBehavior_GroupSettings" Icon="&#xE620;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
@ -87,8 +87,19 @@
<Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
<CheckBox x:Uid="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowOnAllMonitors}" Margin="{StaticResource ExpanderSettingMargin}" />
<Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
<CheckBox x:Uid="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}" Margin="{StaticResource ExpanderSettingMargin}" />
<CheckBox IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}"
Margin="{StaticResource ExpanderSettingMargin}"
AutomationProperties.Name="{Binding ElementName=SpanZonesAcrossMonitorsPrerequisitesTitle, Path=Text}">
<StackPanel Orientation="Vertical">
<TextBlock x:Name="SpanZonesAcrossMonitorsPrerequisitesTitle" x:Uid="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl" />
<controls:TextBlockControl x:Uid="FancyZones_SpanZonesAcrossMonitorsPrerequisites"
FontSize="{StaticResource SecondaryTextFontSize}"
EnabledForeground="{ThemeResource TextFillColorSecondaryBrush}"
DisabledForeground="{ThemeResource TextFillColorDisabledBrush}"
IsEnabled="{Binding ElementName=ZonesSettingsGroup, Path=IsEnabled, Mode=OneWay}"/>
</StackPanel>
</CheckBox>
<controls:Setting x:Uid="FancyZones_OverlappingZones" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent>
<ComboBox SelectedIndex="{x:Bind Path=ViewModel.OverlappingZonesAlgorithmIndex, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}">