prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #952 from onesounds/FixToggleSwitchCircle

Browse source 
Fix Toggle Switch Knob (White Circle) Positioning
This commit is contained in:
Jeremy Wu 2022-01-05 19:58:07 +11:00 committed by GitHub
commit 67f7eed7e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Flow.Launcher/Resources/CustomControlTemplate.xaml
View file

@ -1469,6 +1469,7 @@
<Setter.Value>
<ControlTemplate TargetType="ui:ToggleSwitch">
<Border
Width="Auto"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
@ -1478,7 +1479,7 @@
<ui:SimpleVisualStateManager />
</VisualStateManager.CustomVisualStateManager>
<Grid>
<Grid HorizontalAlignment="Right">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
@ -1486,7 +1487,7 @@
<ui:ContentPresenterEx
x:Name="HeaderContentPresenter"
Grid.Row="1"
Grid.Row="0"
Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
VerticalAlignment="Top"
Content="{TemplateBinding Header}"
@ -1497,11 +1498,9 @@
TextWrapping="Wrap"
Visibility="Collapsed" />
<Grid
Grid.Row="0"
Width="100"
MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
Margin="10,0,0,0"
HorizontalAlignment="Left"
Grid.Row="1"
MinWidth="10"
HorizontalAlignment="Right"
VerticalAlignment="Top">
<Grid.RowDefinitions>
@ -1520,6 +1519,7 @@
Grid.RowSpan="3"
Grid.ColumnSpan="3"
Margin="0,5"
HorizontalAlignment="Right"
ui:FocusVisualHelper.IsTemplateFocusTarget="True"
Background="{DynamicResource ToggleSwitchContainerBackground}" />
<ContentPresenter
@ -1552,6 +1552,7 @@
Grid.Column="2"
Width="40"
Height="20"
HorizontalAlignment="Right"
Fill="{DynamicResource ToggleSwitchFillOff}"
RadiusX="10"
RadiusY="10"
@ -1563,6 +1564,7 @@
Grid.Column="2"
Width="40"
Height="20"
HorizontalAlignment="Right"
Fill="{DynamicResource ToggleSwitchFillOn}"
Opacity="0"
RadiusX="10"

33
Flow.Launcher/SettingWindow.xaml
View file

@ -57,10 +57,7 @@
MinWidth="20"
MaxWidth="60" />
<ColumnDefinition Width="8*" />
<ColumnDefinition
Width="Auto"
MinWidth="40"
MaxWidth="550" />
<ColumnDefinition Width="Auto" MinWidth="30" />
</Grid.ColumnDefinitions>
</Grid>
</ItemsPanelTemplate>
@ -102,7 +99,7 @@
TargetType="{x:Type CheckBox}">
<Setter Property="Width" Value="24" />
<Setter Property="Grid.Column" Value="2" />
<Setter Property="Margin" Value="0,4,0,4" />
<Setter Property="Margin" Value="0,4,10,4" />
<Setter Property="LayoutTransform">
<Setter.Value>
<ScaleTransform ScaleX="1" ScaleY="1" />
@ -110,11 +107,16 @@
</Setter>
</Style>
<Style x:Key="SideToggleSwitch" TargetType="{x:Type ui:ToggleSwitch}">
<Style
x:Key="SideToggleSwitch"
BasedOn="{StaticResource DefaultToggleSwitch}"
TargetType="{x:Type ui:ToggleSwitch}">
<Setter Property="Grid.Column" Value="2" />
<Setter Property="Width" Value="Auto" />
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="HorizontalContentAlignment" Value="Right" />
<Setter Property="OffContent" Value="{DynamicResource disable}" />
<Setter Property="OnContent" Value="{DynamicResource enable}" />
<Setter Property="FlowDirection" Value="RightToLeft" />
<Setter Property="Margin" Value="0,4,22,4" />
</Style>
@ -948,9 +950,9 @@
FlowDirection="LeftToRight">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" MinWidth="100" />
<ColumnDefinition Width="3*" />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="8*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel
Grid.Column="0"
@ -990,7 +992,7 @@
<Border>
<Button
x:Name="PriorityButton"
Margin="0,0,12,0"
Margin="0,0,22,0"
VerticalAlignment="Center"
Click="OnPluginPriorityClick"
Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
@ -1022,10 +1024,11 @@
</StackPanel>
<DockPanel Grid.Column="3">
<ui:ToggleSwitch
Margin="0"
DockPanel.Dock="Right"
Margin="0,0,6,0"
HorizontalAlignment="Right"
IsOn="{Binding PluginState}"
Style="{DynamicResource SideToggleSwitch}" />
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
</DockPanel>
</Grid>
@ -1955,7 +1958,7 @@
</StackPanel>
<Button
Grid.Column="2"
Width="180"
MinWidth="180"
Margin="0,0,18,0"
HorizontalAlignment="Center"
Click="OpenThemeFolder"