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

- Change Toggle Switch Flow (LTR from RTL)

Browse source 
- Change Open Theme Folder Button Width to Responsive
This commit is contained in:
DB p 2022-01-03 23:48:54 +09:00
parent f6d8d3e9a9
commit 2a093fff84
2 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1478,7 +1478,7 @@
<ui:SimpleVisualStateManager /> <ui:SimpleVisualStateManager />
</VisualStateManager.CustomVisualStateManager> </VisualStateManager.CustomVisualStateManager>
<Grid> <Grid HorizontalAlignment="Right">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@ -1486,7 +1486,7 @@
<ui:ContentPresenterEx <ui:ContentPresenterEx
x:Name="HeaderContentPresenter" x:Name="HeaderContentPresenter"
Grid.Row="1" Grid.Row="0"
Margin="{DynamicResource ToggleSwitchTopHeaderMargin}" Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
VerticalAlignment="Top" VerticalAlignment="Top"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
@ -1497,11 +1497,9 @@
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="Collapsed" /> Visibility="Collapsed" />
<Grid <Grid
Grid.Row="0" Grid.Row="1"
Width="100"
MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}" MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
Margin="10,0,0,0" HorizontalAlignment="Right"
HorizontalAlignment="Left"
VerticalAlignment="Top"> VerticalAlignment="Top">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -1511,7 +1509,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="12" MaxWidth="12" /> <ColumnDefinition Width="12" MaxWidth="12" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -1520,6 +1518,7 @@
Grid.RowSpan="3" Grid.RowSpan="3"
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
Margin="0,5" Margin="0,5"
HorizontalAlignment="Right"
ui:FocusVisualHelper.IsTemplateFocusTarget="True" ui:FocusVisualHelper.IsTemplateFocusTarget="True"
Background="{DynamicResource ToggleSwitchContainerBackground}" /> Background="{DynamicResource ToggleSwitchContainerBackground}" />
<ContentPresenter <ContentPresenter
@ -1552,6 +1551,7 @@
Grid.Column="2" Grid.Column="2"
Width="40" Width="40"
Height="20" Height="20"
HorizontalAlignment="Right"
Fill="{DynamicResource ToggleSwitchFillOff}" Fill="{DynamicResource ToggleSwitchFillOff}"
RadiusX="10" RadiusX="10"
RadiusY="10" RadiusY="10"
@ -1563,6 +1563,7 @@
Grid.Column="2" Grid.Column="2"
Width="40" Width="40"
Height="20" Height="20"
HorizontalAlignment="Right"
Fill="{DynamicResource ToggleSwitchFillOn}" Fill="{DynamicResource ToggleSwitchFillOn}"
Opacity="0" Opacity="0"
RadiusX="10" RadiusX="10"

32
Flow.Launcher/SettingWindow.xaml
View file

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