Skip to content

Commit 5b08605

Browse files
onesoundsonesounds
committed
- Change Sidebar Width to Responsoive
- Fix Narrow Things (in hotkey, themes page)
1 parent 7e04a70 commit 5b08605

File tree

1 file changed

+98
-87
lines changed

1 file changed

+98
-87
lines changed

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 98 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Title="{DynamicResource flowlauncher_settings}"
1616
Width="{Binding SettingWindowWidth, Mode=TwoWay}"
1717
Height="{Binding SettingWindowHeight, Mode=TwoWay}"
18-
MinWidth="900"
18+
MinWidth="940"
1919
MinHeight="600"
2020
d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
2121
Closed="OnClosed"
@@ -98,6 +98,7 @@
9898
<Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
9999
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
100100
<Setter Property="Margin" Value="0,0,0,0" />
101+
<Setter Property="TextWrapping" Value="Wrap" />
101102
</Style>
102103

103104
<Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
@@ -201,52 +202,46 @@
201202
</Setter>
202203
<!--#endregion-->
203204
</Style>
204-
<Style TargetType="{x:Type TabItem}">
205+
<Style x:Key="NavTabItem" TargetType="{x:Type TabItem}">
206+
<Setter Property="DockPanel.Dock" Value="Top" />
205207
<Setter Property="Template">
206208
<Setter.Value>
207209
<ControlTemplate TargetType="{x:Type TabItem}">
208-
<Border>
209-
<Grid>
210+
<Grid>
211+
<Border
212+
x:Name="border"
213+
Height="40"
214+
Margin="14,4,8,4"
215+
Padding="0,0,0,0"
216+
HorizontalAlignment="Stretch"
217+
Background="{DynamicResource Color01B}"
218+
CornerRadius="5">
210219
<Grid>
211-
<Border
212-
x:Name="Spacer"
213-
Width="Auto"
214-
Height="Auto"
215-
Margin="14,4,8,4"
216-
Padding="0,0,0,0"
217-
BorderBrush="Transparent"
218-
BorderThickness="0">
219-
<Border
220-
x:Name="border"
221-
Height="40"
222-
Background="{DynamicResource Color01B}"
223-
CornerRadius="5">
224-
<Grid>
225-
<Canvas>
226-
<Rectangle
227-
x:Name="Bullet"
228-
Canvas.Left="0"
229-
Width="4"
230-
Height="18"
231-
Margin="0,11,0,11"
232-
Fill="{DynamicResource ToggleSwitchFillOn}"
233-
RadiusX="2"
234-
RadiusY="2"
235-
Visibility="Hidden" />
236-
<ContentPresenter
237-
x:Name="ContentSite"
238-
Margin="12,11,0,11"
239-
HorizontalAlignment="LEFT"
240-
VerticalAlignment="Center"
241-
ContentSource="Header"
242-
TextBlock.Foreground="#000" />
243-
</Canvas>
244-
</Grid>
245-
</Border>
246-
</Border>
220+
<Grid.ColumnDefinitions>
221+
<ColumnDefinition Width="4" />
222+
<ColumnDefinition />
223+
</Grid.ColumnDefinitions>
224+
<Rectangle
225+
x:Name="Bullet"
226+
Grid.Column="0"
227+
Width="4"
228+
Height="18"
229+
Margin="0,11,0,11"
230+
Fill="{DynamicResource ToggleSwitchFillOn}"
231+
RadiusX="2"
232+
RadiusY="2"
233+
Visibility="Hidden" />
234+
<ContentPresenter
235+
x:Name="ContentSite"
236+
Grid.Column="1"
237+
Margin="12,11,18,11"
238+
HorizontalAlignment="Stretch"
239+
VerticalAlignment="Center"
240+
ContentSource="Header"
241+
TextBlock.Foreground="#000" />
247242
</Grid>
248-
</Grid>
249-
</Border>
243+
</Border>
244+
</Grid>
250245
<ControlTemplate.Triggers>
251246
<Trigger Property="IsMouseOver" Value="True">
252247
<Setter TargetName="border" Property="Background" Value="{DynamicResource Color06B}" />
@@ -418,30 +413,61 @@
418413
</Style.Triggers>
419414
</Style>
420415
<!-- For Tab Header responsive Width -->
421-
<Style TargetType="{x:Type TabControl}">
416+
<Style x:Key="NavTabControl" TargetType="{x:Type TabControl}">
417+
<Setter Property="Padding" Value="0" />
418+
<Setter Property="HorizontalContentAlignment" Value="Left" />
419+
<Setter Property="VerticalContentAlignment" Value="Top" />
420+
<Setter Property="Background" Value="Transparent" />
421+
<Setter Property="BorderBrush" Value="Transparent" />
422+
<Setter Property="BorderThickness" Value="1" />
422423
<Setter Property="FontSize" Value="14" />
423424
<Setter Property="Template">
424425
<Setter.Value>
425426
<ControlTemplate TargetType="{x:Type TabControl}">
426-
<Grid>
427+
<Grid
428+
x:Name="templateRoot"
429+
ClipToBounds="true"
430+
KeyboardNavigation.TabNavigation="Local"
431+
SnapsToDevicePixels="true">
427432
<Grid.ColumnDefinitions>
428-
<ColumnDefinition Width="2.2*" />
429-
<ColumnDefinition Width="7.8*" />
433+
<ColumnDefinition
434+
x:Name="ColumnDefinition0"
435+
Width="Auto"
436+
MinWidth="230" />
437+
<ColumnDefinition x:Name="ColumnDefinition1" Width="7.5*" />
430438
</Grid.ColumnDefinitions>
431-
<TabPanel
439+
<!-- here is the edit -->
440+
<DockPanel
441+
x:Name="headerPanel"
442+
Grid.Row="0"
432443
Grid.Column="0"
433-
Margin="0,0,0,0"
444+
Margin="2,2,2,0"
434445
Panel.ZIndex="1"
435-
Background="{DynamicResource Color01B}"
436-
IsItemsHost="True" />
446+
Background="Transparent"
447+
IsItemsHost="true"
448+
KeyboardNavigation.TabIndex="1" />
437449
<Border
450+
x:Name="contentPanel"
451+
Grid.Row="0"
438452
Grid.Column="1"
439-
BorderBrush="Black"
440-
BorderThickness="0"
441-
CornerRadius="0">
442-
<ContentPresenter Grid.Column="1" ContentSource="SelectedContent" />
453+
Background="{TemplateBinding Background}"
454+
BorderBrush="{TemplateBinding BorderBrush}"
455+
BorderThickness="{TemplateBinding BorderThickness}"
456+
KeyboardNavigation.DirectionalNavigation="Contained"
457+
KeyboardNavigation.TabIndex="2"
458+
KeyboardNavigation.TabNavigation="Local">
459+
<ContentPresenter
460+
x:Name="PART_SelectedContentHost"
461+
Margin="{TemplateBinding Padding}"
462+
ContentSource="SelectedContent"
463+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
443464
</Border>
444465
</Grid>
466+
<ControlTemplate.Triggers>
467+
<Trigger Property="IsEnabled" Value="false">
468+
<Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
469+
</Trigger>
470+
</ControlTemplate.Triggers>
445471
</ControlTemplate>
446472
</Setter.Value>
447473
</Setter>
@@ -568,8 +594,9 @@
568594
Grid.ColumnSpan="5"
569595
Height="auto"
570596
SelectedIndex="1"
597+
Style="{DynamicResource NavTabControl}"
571598
TabStripPlacement="Left">
572-
<TabItem Style="{DynamicResource logo}">
599+
<TabItem DockPanel.Dock="Top" Style="{DynamicResource logo}">
573600
<TabItem.Header>
574601
<Grid Margin="0,18,0,0">
575602
<Grid.RowDefinitions>
@@ -591,7 +618,7 @@
591618
</Grid>
592619
</TabItem.Header>
593620
</TabItem>
594-
<TabItem>
621+
<TabItem DockPanel.Dock="Top" Style="{DynamicResource NavTabItem}">
595622
<!-- LEFT TAB WIDTH -->
596623
<TabItem.Header>
597624
<Grid>
@@ -947,7 +974,7 @@
947974
</VirtualizingStackPanel>
948975
</ScrollViewer>
949976
</TabItem>
950-
<TabItem KeyDown="OnPluginSettingKeydown">
977+
<TabItem KeyDown="OnPluginSettingKeydown" Style="{DynamicResource NavTabItem}">
951978
<TabItem.Header>
952979
<Grid>
953980
<Grid.ColumnDefinitions>
@@ -1368,7 +1395,7 @@
13681395
</TabItem>
13691396

13701397
<!--#region Plugin Store-->
1371-
<TabItem KeyDown="PluginStore_OnKeyDown">
1398+
<TabItem KeyDown="PluginStore_OnKeyDown" Style="{DynamicResource NavTabItem}">
13721399
<TabItem.Header>
13731400
<Grid>
13741401
<Grid.ColumnDefinitions>
@@ -1721,7 +1748,7 @@
17211748
</TabItem>
17221749
<!--#endregion-->
17231750

1724-
<TabItem>
1751+
<TabItem Style="{DynamicResource NavTabItem}">
17251752
<TabItem.Header>
17261753
<Grid>
17271754
<Grid.ColumnDefinitions>
@@ -1848,15 +1875,15 @@
18481875
</StackPanel>
18491876
<StackPanel Grid.Column="2" Orientation="Horizontal">
18501877
<TextBlock
1851-
Width="100"
1878+
Width="Auto"
18521879
Margin="0,0,8,2"
18531880
VerticalAlignment="Center"
18541881
Foreground="{DynamicResource Color05B}"
18551882
Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
18561883
TextAlignment="Right" />
18571884
<Slider
18581885
Name="WindowWidthValue"
1859-
Width="300"
1886+
Width="250"
18601887
Margin="0,0,18,0"
18611888
VerticalAlignment="Center"
18621889
IsMoveToPointEnabled="True"
@@ -2300,7 +2327,7 @@
23002327
</TabItem>
23012328

23022329

2303-
<TabItem>
2330+
<TabItem Style="{DynamicResource NavTabItem}">
23042331
<TabItem.Header>
23052332
<Grid>
23062333
<Grid.ColumnDefinitions>
@@ -2323,23 +2350,7 @@
23232350
VirtualizingStackPanel.IsVirtualizing="True"
23242351
VirtualizingStackPanel.ScrollUnit="Pixel">
23252352
<Border>
2326-
<Grid Margin="5,18,18,10">
2327-
<Grid.RowDefinitions>
2328-
<RowDefinition Height="43" />
2329-
<RowDefinition Height="80" />
2330-
<RowDefinition Height="146" />
2331-
2332-
<RowDefinition Height="50" />
2333-
<RowDefinition Height="*" />
2334-
<RowDefinition Height="50" />
2335-
2336-
<RowDefinition Height="50" />
2337-
<RowDefinition Height="*" />
2338-
<RowDefinition Height="50" />
2339-
2340-
<RowDefinition Height="50" />
2341-
<RowDefinition Height="*" />
2342-
</Grid.RowDefinitions>
2353+
<StackPanel Margin="5,18,18,10">
23432354
<TextBlock
23442355
Grid.Row="0"
23452356
Margin="0,5,0,2"
@@ -2411,7 +2422,7 @@
24112422
Style="{StaticResource SettingSeparatorStyle}" />
24122423
<Border
24132424
Margin="0"
2414-
Padding="0,10,0,0"
2425+
Padding="0,10,0,10"
24152426
BorderThickness="0"
24162427
Style="{DynamicResource SettingGroupBox}">
24172428
<ItemsControl Style="{StaticResource SettingGrid}">
@@ -2434,7 +2445,7 @@
24342445

24352446
<TextBlock
24362447
Grid.Row="3"
2437-
Margin="0,0,12,2"
2448+
Margin="0,10,12,10"
24382449
Padding="0,12,0,0"
24392450
VerticalAlignment="Center"
24402451
FontSize="14"
@@ -2459,7 +2470,7 @@
24592470
</DataTemplate>
24602471
</GridViewColumn.CellTemplate>
24612472
</GridViewColumn>
2462-
<GridViewColumn Width="540" Header="{DynamicResource customQuery}">
2473+
<GridViewColumn Width="430" Header="{DynamicResource customQuery}">
24632474
<GridViewColumn.CellTemplate>
24642475
<DataTemplate DataType="userSettings:CustomPluginHotkey">
24652476
<TextBlock Text="{Binding ActionKeyword}" />
@@ -2520,7 +2531,7 @@
25202531
</DataTemplate>
25212532
</GridViewColumn.CellTemplate>
25222533
</GridViewColumn>
2523-
<GridViewColumn Width="540" Header="{DynamicResource customShortcutExpansion}">
2534+
<GridViewColumn Width="430" Header="{DynamicResource customShortcutExpansion}">
25242535
<GridViewColumn.CellTemplate>
25252536
<DataTemplate>
25262537
<TextBlock Text="{Binding Value}" />
@@ -2579,7 +2590,7 @@
25792590
</DataTemplate>
25802591
</GridViewColumn.CellTemplate>
25812592
</GridViewColumn>
2582-
<GridViewColumn Width="540" Header="{DynamicResource builtinShortcutDescription}">
2593+
<GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
25832594
<GridViewColumn.CellTemplate>
25842595
<DataTemplate>
25852596
<TextBlock Text="{Binding Description, Converter={StaticResource TranlationConverter}}" />
@@ -2589,13 +2600,13 @@
25892600
</GridView>
25902601
</ListView.View>
25912602
</ListView>
2592-
</Grid>
2603+
</StackPanel>
25932604
</Border>
25942605
</ScrollViewer>
25952606
</TabItem>
25962607

25972608

2598-
<TabItem>
2609+
<TabItem Style="{DynamicResource NavTabItem}">
25992610
<TabItem.Header>
26002611
<Grid>
26012612
<Grid.ColumnDefinitions>
@@ -2771,7 +2782,7 @@
27712782
</Border>
27722783
</ScrollViewer>
27732784
</TabItem>
2774-
<TabItem>
2785+
<TabItem Style="{DynamicResource NavTabItem}">
27752786
<TabItem.Header>
27762787
<Grid>
27772788
<Grid.ColumnDefinitions>

0 commit comments

Comments
 (0)