Skip to content

Commit 67f7eed

Browse files
jjw24jjw24
authored
Merge pull request #952 from onesounds/FixToggleSwitchCircle
Fix Toggle Switch Knob (White Circle) Positioning
2 parents bdf81d6 + 6c595e6 commit 67f7eed

File tree

2 files changed

+27
-22
lines changed

2 files changed

+27
-22
lines changed

‎Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,6 +1469,7 @@
14691469
<Setter.Value>
14701470
<ControlTemplate TargetType="ui:ToggleSwitch">
14711471
<Border
1472+
Width="Auto"
14721473
Background="{TemplateBinding Background}"
14731474
BorderBrush="{TemplateBinding BorderBrush}"
14741475
BorderThickness="{TemplateBinding BorderThickness}"
@@ -1478,15 +1479,15 @@
14781479
<ui:SimpleVisualStateManager />
14791480
</VisualStateManager.CustomVisualStateManager>
14801481

1481-
<Grid>
1482+
<Grid HorizontalAlignment="Right">
14821483
<Grid.RowDefinitions>
14831484
<RowDefinition Height="Auto" />
14841485
<RowDefinition Height="*" />
14851486
</Grid.RowDefinitions>
14861487

14871488
<ui:ContentPresenterEx
14881489
x:Name="HeaderContentPresenter"
1489-
Grid.Row="1"
1490+
Grid.Row="0"
14901491
Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
14911492
VerticalAlignment="Top"
14921493
Content="{TemplateBinding Header}"
@@ -1497,11 +1498,9 @@
14971498
TextWrapping="Wrap"
14981499
Visibility="Collapsed" />
14991500
<Grid
1500-
Grid.Row="0"
1501-
Width="100"
1502-
MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
1503-
Margin="10,0,0,0"
1504-
HorizontalAlignment="Left"
1501+
Grid.Row="1"
1502+
MinWidth="10"
1503+
HorizontalAlignment="Right"
15051504
VerticalAlignment="Top">
15061505

15071506
<Grid.RowDefinitions>
@@ -1520,6 +1519,7 @@
15201519
Grid.RowSpan="3"
15211520
Grid.ColumnSpan="3"
15221521
Margin="0,5"
1522+
HorizontalAlignment="Right"
15231523
ui:FocusVisualHelper.IsTemplateFocusTarget="True"
15241524
Background="{DynamicResource ToggleSwitchContainerBackground}" />
15251525
<ContentPresenter
@@ -1552,6 +1552,7 @@
15521552
Grid.Column="2"
15531553
Width="40"
15541554
Height="20"
1555+
HorizontalAlignment="Right"
15551556
Fill="{DynamicResource ToggleSwitchFillOff}"
15561557
RadiusX="10"
15571558
RadiusY="10"
@@ -1563,6 +1564,7 @@
15631564
Grid.Column="2"
15641565
Width="40"
15651566
Height="20"
1567+
HorizontalAlignment="Right"
15661568
Fill="{DynamicResource ToggleSwitchFillOn}"
15671569
Opacity="0"
15681570
RadiusX="10"

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@
5757
MinWidth="20"
5858
MaxWidth="60" />
5959
<ColumnDefinition Width="8*" />
60-
<ColumnDefinition
61-
Width="Auto"
62-
MinWidth="40"
63-
MaxWidth="550" />
60+
<ColumnDefinition Width="Auto" MinWidth="30" />
6461
</Grid.ColumnDefinitions>
6562
</Grid>
6663
</ItemsPanelTemplate>
@@ -102,19 +99,24 @@
10299
TargetType="{x:Type CheckBox}">
103100
<Setter Property="Width" Value="24" />
104101
<Setter Property="Grid.Column" Value="2" />
105-
<Setter Property="Margin" Value="0,4,0,4" />
102+
<Setter Property="Margin" Value="0,4,10,4" />
106103
<Setter Property="LayoutTransform">
107104
<Setter.Value>
108105
<ScaleTransform ScaleX="1" ScaleY="1" />
109106
</Setter.Value>
110107
</Setter>
111108
</Style>
112109

113-
<Style x:Key="SideToggleSwitch" TargetType="{x:Type ui:ToggleSwitch}">
110+
<Style
111+
x:Key="SideToggleSwitch"
112+
BasedOn="{StaticResource DefaultToggleSwitch}"
113+
TargetType="{x:Type ui:ToggleSwitch}">
114114
<Setter Property="Grid.Column" Value="2" />
115+
<Setter Property="Width" Value="Auto" />
116+
<Setter Property="HorizontalAlignment" Value="Right" />
117+
<Setter Property="HorizontalContentAlignment" Value="Right" />
115118
<Setter Property="OffContent" Value="{DynamicResource disable}" />
116119
<Setter Property="OnContent" Value="{DynamicResource enable}" />
117-
<Setter Property="FlowDirection" Value="RightToLeft" />
118120
<Setter Property="Margin" Value="0,4,22,4" />
119121
</Style>
120122

@@ -948,9 +950,9 @@
948950
FlowDirection="LeftToRight">
949951
<Grid.ColumnDefinitions>
950952
<ColumnDefinition Width="100" MinWidth="100" />
951-
<ColumnDefinition Width="3*" />
952-
<ColumnDefinition />
953-
<ColumnDefinition />
953+
<ColumnDefinition Width="8*" />
954+
<ColumnDefinition Width="Auto" />
955+
<ColumnDefinition Width="Auto" />
954956
</Grid.ColumnDefinitions>
955957
<StackPanel
956958
Grid.Column="0"
@@ -990,7 +992,7 @@
990992
<Border>
991993
<Button
992994
x:Name="PriorityButton"
993-
Margin="0,0,12,0"
995+
Margin="0,0,22,0"
994996
VerticalAlignment="Center"
995997
Click="OnPluginPriorityClick"
996998
Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
@@ -1022,10 +1024,11 @@
10221024
</StackPanel>
10231025
<DockPanel Grid.Column="3">
10241026
<ui:ToggleSwitch
1025-
Margin="0"
1026-
DockPanel.Dock="Right"
1027+
Margin="0,0,6,0"
1028+
HorizontalAlignment="Right"
10271029
IsOn="{Binding PluginState}"
1028-
Style="{DynamicResource SideToggleSwitch}" />
1030+
OffContent="{DynamicResource disable}"
1031+
OnContent="{DynamicResource enable}" />
10291032
</DockPanel>
10301033
</Grid>
10311034

@@ -1955,7 +1958,7 @@
19551958
</StackPanel>
19561959
<Button
19571960
Grid.Column="2"
1958-
Width="180"
1961+
MinWidth="180"
19591962
Margin="0,0,18,0"
19601963
HorizontalAlignment="Center"
19611964
Click="OpenThemeFolder"

0 commit comments

Comments
 (0)