Skip to content

Commit 230a97b

Browse files
yaira2yaira2
committed
Code Quality: Fixed spacing for address bar actions (regression from moving the settings button)
1 parent 4575b08 commit 230a97b

File tree

1 file changed

+83
-53
lines changed

1 file changed

+83
-53
lines changed

‎src/Files.App/UserControls/NavigationToolbar.xaml

Lines changed: 83 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@
208208
<Grid.ColumnDefinitions>
209209
<ColumnDefinition Width="*" />
210210
<ColumnDefinition Width="Auto" />
211-
<ColumnDefinition Width="Auto" />
212211
</Grid.ColumnDefinitions>
213212
<!-- Path Box -->
214213
<AutoSuggestBox
@@ -313,21 +312,6 @@
313312
SearchBoxViewModel="{x:Bind ViewModel.SearchBoxViewModel, Mode=OneWay}"
314313
Visibility="{x:Bind converters:MultiBooleanConverter.OrConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}" />
315314

316-
<!-- Mini Search Button -->
317-
<Button
318-
x:Name="ShowSearchButton"
319-
Grid.Column="2"
320-
AccessKey="I"
321-
AccessKeyInvoked="Button_AccessKeyInvoked"
322-
AutomationProperties.Name="{x:Bind Commands.Search.Label, Mode=OneWay}"
323-
Command="{x:Bind Commands.Search, Mode=OneWay}"
324-
IsEnabled="{x:Bind Commands.Search.IsExecutable, Mode=OneWay}"
325-
Style="{StaticResource AddressToolbarButtonStyle}"
326-
ToolTipService.ToolTip="{x:Bind Commands.Search.LabelWithHotKey, Mode=OneWay}"
327-
Visibility="Collapsed">
328-
<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.SearchButtonGlyph, Mode=OneWay}" />
329-
</Button>
330-
331315
</Grid>
332316

333317
<!-- Omnibar -->
@@ -385,40 +369,40 @@
385369
ModeName="{x:Bind Commands.OpenCommandPalette.LabelWithHotKey, Mode=OneWay}"
386370
PlaceholderText="{helpers:ResourceString Name=OmnibarCommandPaletteModeTextPlaceholder}">
387371
<!--<controls:OmnibarMode.SuggestionItemTemplate>
388-
<DataTemplate x:DataType="data:OmnibarPaletteSuggestionItem">
389-
<Grid Height="48" ColumnSpacing="12">
390-
<Grid.ColumnDefinitions>
391-
<ColumnDefinition Width="Auto" />
392-
<ColumnDefinition Width="*" />
393-
<ColumnDefinition Width="Auto" />
394-
</Grid.ColumnDefinitions>
395-
<controls:ThemedIcon
396-
Width="20"
397-
Height="20"
398-
VerticalAlignment="Center"
399-
Style="{StaticResource App.ThemedIcons.Actions.Copying}" />
400-
<StackPanel Grid.Column="1" VerticalAlignment="Center">
401-
<TextBlock
402-
Style="{StaticResource BodyStrongTextBlockStyle}"
403-
Text="{x:Bind Title}"
404-
TextTrimming="CharacterEllipsis"
405-
TextWrapping="NoWrap" />
406-
<TextBlock
407-
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
408-
Style="{StaticResource CaptionTextBlockStyle}"
409-
Text="{x:Bind Description}"
410-
TextTrimming="CharacterEllipsis"
411-
TextWrapping="NoWrap" />
412-
</StackPanel>
413-
<StackPanel Grid.Column="2" VerticalAlignment="Center">
414-
<TextBlock
415-
Text="{x:Bind HotKeys}"
416-
TextTrimming="CharacterEllipsis"
417-
TextWrapping="NoWrap" />
418-
</StackPanel>
419-
</Grid>
420-
</DataTemplate>
421-
</controls:OmnibarMode.SuggestionItemTemplate>-->
372+
<DataTemplate x:DataType="data:OmnibarPaletteSuggestionItem">
373+
<Grid Height="48" ColumnSpacing="12">
374+
<Grid.ColumnDefinitions>
375+
<ColumnDefinition Width="Auto" />
376+
<ColumnDefinition Width="*" />
377+
<ColumnDefinition Width="Auto" />
378+
</Grid.ColumnDefinitions>
379+
<controls:ThemedIcon
380+
Width="20"
381+
Height="20"
382+
VerticalAlignment="Center"
383+
Style="{StaticResource App.ThemedIcons.Actions.Copying}" />
384+
<StackPanel Grid.Column="1" VerticalAlignment="Center">
385+
<TextBlock
386+
Style="{StaticResource BodyStrongTextBlockStyle}"
387+
Text="{x:Bind Title}"
388+
TextTrimming="CharacterEllipsis"
389+
TextWrapping="NoWrap" />
390+
<TextBlock
391+
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
392+
Style="{StaticResource CaptionTextBlockStyle}"
393+
Text="{x:Bind Description}"
394+
TextTrimming="CharacterEllipsis"
395+
TextWrapping="NoWrap" />
396+
</StackPanel>
397+
<StackPanel Grid.Column="2" VerticalAlignment="Center">
398+
<TextBlock
399+
Text="{x:Bind HotKeys}"
400+
TextTrimming="CharacterEllipsis"
401+
TextWrapping="NoWrap" />
402+
</StackPanel>
403+
</Grid>
404+
</DataTemplate>
405+
</controls:OmnibarMode.SuggestionItemTemplate>-->
422406
</controls:OmnibarMode>
423407

424408
<controls:OmnibarMode
@@ -432,10 +416,23 @@
432416

433417
<!-- Right Side Action Buttons -->
434418
<StackPanel
419+
x:Name="RightSideActionsStackPanel"
435420
Grid.Column="2"
436-
Margin="0,0,4,0"
437421
Orientation="Horizontal"
438422
Spacing="4">
423+
<!-- Mini Search Button -->
424+
<Button
425+
x:Name="ShowSearchButton"
426+
AccessKey="I"
427+
AccessKeyInvoked="Button_AccessKeyInvoked"
428+
AutomationProperties.Name="{x:Bind Commands.Search.Label, Mode=OneWay}"
429+
Command="{x:Bind Commands.Search, Mode=OneWay}"
430+
IsEnabled="{x:Bind Commands.Search.IsExecutable, Mode=OneWay}"
431+
Style="{StaticResource AddressToolbarButtonStyle}"
432+
ToolTipService.ToolTip="{x:Bind Commands.Search.LabelWithHotKey, Mode=OneWay}"
433+
Visibility="Collapsed">
434+
<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.SearchButtonGlyph, Mode=OneWay}" />
435+
</Button>
439436

440437
<!-- Shelf Pane -->
441438
<ToggleButton
@@ -561,7 +558,7 @@
561558
Target="{x:Bind ShowStatusCenterButton}" />
562559

563560
<VisualStateManager.VisualStateGroups>
564-
<VisualStateGroup>
561+
<VisualStateGroup x:Name="SearchBoxStates">
565562
<VisualState x:Name="SearchBoxAlwaysShown">
566563
<VisualState.StateTriggers>
567564
<triggers:IsEqualStateTrigger Value="{x:Bind ShowSearchBox, Mode=OneWay}" To="True" />
@@ -579,7 +576,40 @@
579576
</VisualState.Setters>
580577
</VisualState>
581578
</VisualStateGroup>
582-
<VisualStateGroup>
579+
580+
<VisualStateGroup x:Name="RightActionsGroup">
581+
<VisualState>
582+
<VisualState.Setters>
583+
<Setter Target="RightSideActionsStackPanel.Margin" Value="0" />
584+
</VisualState.Setters>
585+
</VisualState>
586+
<VisualState x:Name="StatusButtonVisible">
587+
<VisualState.StateTriggers>
588+
<triggers:IsEqualStateTrigger Value="{x:Bind OngoingTasksViewModel.HasAnyItem, Mode=OneWay}" To="True" />
589+
</VisualState.StateTriggers>
590+
<VisualState.Setters>
591+
<Setter Target="RightSideActionsStackPanel.Margin" Value="0,0,4,0" />
592+
</VisualState.Setters>
593+
</VisualState>
594+
<VisualState x:Name="ShelfButtonVisible">
595+
<VisualState.StateTriggers>
596+
<triggers:IsEqualStateTrigger Value="{x:Bind ViewModel.ShowShelfPaneToggleButton, Mode=OneWay}" To="True" />
597+
</VisualState.StateTriggers>
598+
<VisualState.Setters>
599+
<Setter Target="RightSideActionsStackPanel.Margin" Value="0,0,4,0" />
600+
</VisualState.Setters>
601+
</VisualState>
602+
<VisualState x:Name="UpdateButtonVisible">
603+
<VisualState.StateTriggers>
604+
<triggers:IsEqualStateTrigger Value="{x:Bind ViewModel.IsUpdateAvailable, Mode=OneWay}" To="True" />
605+
</VisualState.StateTriggers>
606+
<VisualState.Setters>
607+
<Setter Target="RightSideActionsStackPanel.Margin" Value="0,0,4,0" />
608+
</VisualState.Setters>
609+
</VisualState>
610+
</VisualStateGroup>
611+
612+
<VisualStateGroup x:Name="StatusIconStates">
583613
<VisualState x:Name="TasksSuccess">
584614
<VisualState.StateTriggers>
585615
<triggers:CompareStateTrigger

0 commit comments

Comments
 (0)