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 Sidebar Width to Responsoive

Browse source 
- Fix Narrow Things (in hotkey, themes page)
This commit is contained in:
DB p 2022-11-17 15:27:14 +09:00
parent 7e04a707b1
commit 5b0860515d
1 changed files with 98 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
Flow.Launcher/SettingWindow.xaml
View file

@ -15,7 +15,7 @@
Title="{DynamicResource flowlauncher_settings}" Title="{DynamicResource flowlauncher_settings}"
Width="{Binding SettingWindowWidth, Mode=TwoWay}" Width="{Binding SettingWindowWidth, Mode=TwoWay}"
Height="{Binding SettingWindowHeight, Mode=TwoWay}" Height="{Binding SettingWindowHeight, Mode=TwoWay}"
MinWidth="900" MinWidth="940"
MinHeight="600" MinHeight="600"
d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}" d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
Closed="OnClosed" Closed="OnClosed"
@ -98,6 +98,7 @@
<Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}"> <Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource Color05B}" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
<Setter Property="Margin" Value="0,0,0,0" /> <Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style> </Style>
<Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}"> <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
@ -201,52 +202,46 @@
</Setter> </Setter>
<!--#endregion--> <!--#endregion-->
</Style> </Style>
<Style TargetType="{x:Type TabItem}"> <Style x:Key="NavTabItem" TargetType="{x:Type TabItem}">
<Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TabItem}"> <ControlTemplate TargetType="{x:Type TabItem}">
<Border> <Grid>
<Grid> <Border
x:Name="border"
Height="40"
Margin="14,4,8,4"
Padding="0,0,0,0"
HorizontalAlignment="Stretch"
Background="{DynamicResource Color01B}"
CornerRadius="5">
<Grid> <Grid>
<Border <Grid.ColumnDefinitions>
x:Name="Spacer" <ColumnDefinition Width="4" />
Width="Auto" <ColumnDefinition />
Height="Auto" </Grid.ColumnDefinitions>
Margin="14,4,8,4" <Rectangle
Padding="0,0,0,0" x:Name="Bullet"
BorderBrush="Transparent" Grid.Column="0"
BorderThickness="0"> Width="4"
<Border Height="18"
x:Name="border" Margin="0,11,0,11"
Height="40" Fill="{DynamicResource ToggleSwitchFillOn}"
Background="{DynamicResource Color01B}" RadiusX="2"
CornerRadius="5"> RadiusY="2"
<Grid> Visibility="Hidden" />
<Canvas> <ContentPresenter
<Rectangle x:Name="ContentSite"
x:Name="Bullet" Grid.Column="1"
Canvas.Left="0" Margin="12,11,18,11"
Width="4" HorizontalAlignment="Stretch"
Height="18" VerticalAlignment="Center"
Margin="0,11,0,11" ContentSource="Header"
Fill="{DynamicResource ToggleSwitchFillOn}" TextBlock.Foreground="#000" />
RadiusX="2"
RadiusY="2"
Visibility="Hidden" />
<ContentPresenter
x:Name="ContentSite"
Margin="12,11,0,11"
HorizontalAlignment="LEFT"
VerticalAlignment="Center"
ContentSource="Header"
TextBlock.Foreground="#000" />
</Canvas>
</Grid>
</Border>
</Border>
</Grid> </Grid>
</Grid> </Border>
</Border> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="{DynamicResource Color06B}" /> <Setter TargetName="border" Property="Background" Value="{DynamicResource Color06B}" />
@ -418,30 +413,61 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<!-- For Tab Header responsive Width --> <!-- For Tab Header responsive Width -->
<Style TargetType="{x:Type TabControl}"> <Style x:Key="NavTabControl" TargetType="{x:Type TabControl}">
<Setter Property="Padding" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Top" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TabControl}"> <ControlTemplate TargetType="{x:Type TabControl}">
<Grid> <Grid
x:Name="templateRoot"
ClipToBounds="true"
KeyboardNavigation.TabNavigation="Local"
SnapsToDevicePixels="true">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="2.2*" /> <ColumnDefinition
<ColumnDefinition Width="7.8*" /> x:Name="ColumnDefinition0"
Width="Auto"
MinWidth="230" />
<ColumnDefinition x:Name="ColumnDefinition1" Width="7.5*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TabPanel <!-- here is the edit -->
<DockPanel
x:Name="headerPanel"
Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Margin="0,0,0,0" Margin="2,2,2,0"
Panel.ZIndex="1" Panel.ZIndex="1"
Background="{DynamicResource Color01B}" Background="Transparent"
IsItemsHost="True" /> IsItemsHost="true"
KeyboardNavigation.TabIndex="1" />
<Border <Border
x:Name="contentPanel"
Grid.Row="0"
Grid.Column="1" Grid.Column="1"
BorderBrush="Black" Background="{TemplateBinding Background}"
BorderThickness="0" BorderBrush="{TemplateBinding BorderBrush}"
CornerRadius="0"> BorderThickness="{TemplateBinding BorderThickness}"
<ContentPresenter Grid.Column="1" ContentSource="SelectedContent" /> KeyboardNavigation.DirectionalNavigation="Contained"
KeyboardNavigation.TabIndex="2"
KeyboardNavigation.TabNavigation="Local">
<ContentPresenter
x:Name="PART_SelectedContentHost"
Margin="{TemplateBinding Padding}"
ContentSource="SelectedContent"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border> </Border>
</Grid> </Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -568,8 +594,9 @@
Grid.ColumnSpan="5" Grid.ColumnSpan="5"
Height="auto" Height="auto"
SelectedIndex="1" SelectedIndex="1"
Style="{DynamicResource NavTabControl}"
TabStripPlacement="Left"> TabStripPlacement="Left">
<TabItem Style="{DynamicResource logo}"> <TabItem DockPanel.Dock="Top" Style="{DynamicResource logo}">
<TabItem.Header> <TabItem.Header>
<Grid Margin="0,18,0,0"> <Grid Margin="0,18,0,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -591,7 +618,7 @@
</Grid> </Grid>
</TabItem.Header> </TabItem.Header>
</TabItem> </TabItem>
<TabItem> <TabItem DockPanel.Dock="Top" Style="{DynamicResource NavTabItem}">
<!-- LEFT TAB WIDTH --> <!-- LEFT TAB WIDTH -->
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
@ -947,7 +974,7 @@
</VirtualizingStackPanel> </VirtualizingStackPanel>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
<TabItem KeyDown="OnPluginSettingKeydown"> <TabItem KeyDown="OnPluginSettingKeydown" Style="{DynamicResource NavTabItem}">
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -1368,7 +1395,7 @@
</TabItem> </TabItem>
<!--#region Plugin Store--> <!--#region Plugin Store-->
<TabItem KeyDown="PluginStore_OnKeyDown"> <TabItem KeyDown="PluginStore_OnKeyDown" Style="{DynamicResource NavTabItem}">
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -1721,7 +1748,7 @@
</TabItem> </TabItem>
<!--#endregion--> <!--#endregion-->
<TabItem> <TabItem Style="{DynamicResource NavTabItem}">
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -1848,7 +1875,7 @@
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal"> <StackPanel Grid.Column="2" Orientation="Horizontal">
<TextBlock <TextBlock
Width="100" Width="Auto"
Margin="0,0,8,2" Margin="0,0,8,2"
VerticalAlignment="Center" VerticalAlignment="Center"
Foreground="{DynamicResource Color05B}" Foreground="{DynamicResource Color05B}"
@ -1856,7 +1883,7 @@
TextAlignment="Right" /> TextAlignment="Right" />
<Slider <Slider
Name="WindowWidthValue" Name="WindowWidthValue"
Width="300" Width="250"
Margin="0,0,18,0" Margin="0,0,18,0"
VerticalAlignment="Center" VerticalAlignment="Center"
IsMoveToPointEnabled="True" IsMoveToPointEnabled="True"
@ -2300,7 +2327,7 @@
</TabItem> </TabItem>
<TabItem> <TabItem Style="{DynamicResource NavTabItem}">
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -2323,23 +2350,7 @@
VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.ScrollUnit="Pixel"> VirtualizingStackPanel.ScrollUnit="Pixel">
<Border> <Border>
<Grid Margin="5,18,18,10"> <StackPanel Margin="5,18,18,10">
<Grid.RowDefinitions>
<RowDefinition Height="43" />
<RowDefinition Height="80" />
<RowDefinition Height="146" />
<RowDefinition Height="50" />
<RowDefinition Height="*" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="*" />
<RowDefinition Height="50" />
<RowDefinition Height="50" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Margin="0,5,0,2" Margin="0,5,0,2"
@ -2411,7 +2422,7 @@
Style="{StaticResource SettingSeparatorStyle}" /> Style="{StaticResource SettingSeparatorStyle}" />
<Border <Border
Margin="0" Margin="0"
Padding="0,10,0,0" Padding="0,10,0,10"
BorderThickness="0" BorderThickness="0"
Style="{DynamicResource SettingGroupBox}"> Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}"> <ItemsControl Style="{StaticResource SettingGrid}">
@ -2434,7 +2445,7 @@
<TextBlock <TextBlock
Grid.Row="3" Grid.Row="3"
Margin="0,0,12,2" Margin="0,10,12,10"
Padding="0,12,0,0" Padding="0,12,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
@ -2459,7 +2470,7 @@
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="540" Header="{DynamicResource customQuery}"> <GridViewColumn Width="430" Header="{DynamicResource customQuery}">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate DataType="userSettings:CustomPluginHotkey"> <DataTemplate DataType="userSettings:CustomPluginHotkey">
<TextBlock Text="{Binding ActionKeyword}" /> <TextBlock Text="{Binding ActionKeyword}" />
@ -2520,7 +2531,7 @@
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="540" Header="{DynamicResource customShortcutExpansion}"> <GridViewColumn Width="430" Header="{DynamicResource customShortcutExpansion}">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Value}" /> <TextBlock Text="{Binding Value}" />
@ -2579,7 +2590,7 @@
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="540" Header="{DynamicResource builtinShortcutDescription}"> <GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Description, Converter={StaticResource TranlationConverter}}" /> <TextBlock Text="{Binding Description, Converter={StaticResource TranlationConverter}}" />
@ -2589,13 +2600,13 @@
</GridView> </GridView>
</ListView.View> </ListView.View>
</ListView> </ListView>
</Grid> </StackPanel>
</Border> </Border>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
<TabItem> <TabItem Style="{DynamicResource NavTabItem}">
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -2771,7 +2782,7 @@
</Border> </Border>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
<TabItem> <TabItem Style="{DynamicResource NavTabItem}">
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>