Skip to content

Commit 39d8c88

Browse files
committed
Improve Control Border Colors
1 parent 612c716 commit 39d8c88

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

Files/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="#191919" />
4242
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="#191919"/>
4343
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="#FF363636"/>
44-
<SolidColorBrush x:Key="TextControlBorderBrush" Color="#FF363636"/>
44+
<!--<SolidColorBrush x:Key="TextControlBorderBrush" Color="#FF363636"/>-->
4545
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="#131313"/>
4646
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor"/>
4747
</ResourceDictionary>

Files/UserControls/NavigationToolbar/NavigationToolbar.xaml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,25 @@
397397
</Setter.Value>
398398
</Setter>
399399
</Style>
400+
<Style x:Key="AutoSuggestBoxTextBoxStyleFixed" TargetType="TextBox" BasedOn="{StaticResource AutoSuggestBoxTextBoxStyle}">
401+
<Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}"/>
402+
<Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}"/>
403+
<Setter Property="Foreground" Value="{ThemeResource TextControlForeground}"/>
404+
<Setter Property="Background" Value="{ThemeResource TextControlBackground}"/>
405+
<Setter Property="BorderBrush" Value="{ThemeResource SystemBaseMediumLowColor}"/>
406+
<Setter Property="Opacity" Value="1"/>
407+
<Setter Property="SelectionHighlightColor" Value="{ThemeResource TextControlSelectionHighlightColor}"/>
408+
<Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}"/>
409+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
410+
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
411+
<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto"/>
412+
<Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto"/>
413+
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden"/>
414+
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden"/>
415+
<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False"/>
416+
<Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}"/>
417+
</Style>
418+
400419
</UserControl.Resources>
401420
<Grid
402421
x:Name="ToolbarGrid"
@@ -504,7 +523,7 @@
504523
Padding="4"
505524
HorizontalAlignment="Stretch"
506525
VerticalAlignment="Center"
507-
BorderBrush="{ThemeResource CustomInputFieldBorderBrush}"
526+
BorderBrush="{ThemeResource SystemBaseMediumLowColor}"
508527
FocusDisengaged="VisiblePath_LostFocus"
509528
FontFamily="Segoe UI"
510529
FontSize="14"
@@ -519,17 +538,16 @@
519538

520539
<Grid
521540
x:Name="ClickablePath"
522-
Height="32.5"
541+
MinHeight="32"
542+
x:Load="{x:Bind ClickablePathLoaded, Mode=OneWay}"
523543
HorizontalAlignment="Stretch"
524-
VerticalAlignment="Center"
525-
BorderBrush="{ThemeResource TextBoxBorderThemeBrush}"
544+
BorderBrush="{ThemeResource SystemBaseMediumLowColor}"
526545
BorderThickness="1"
527546
CornerRadius="2"
528-
PointerPressed="ManualPathEntryItem_Click">
547+
PointerPressed="ManualPathEntryItem_Click" VerticalAlignment="Center">
529548

530549
<ListView
531550
x:Name="PathViewInteract"
532-
x:Load="{x:Bind ClickablePathLoaded, Mode=OneWay}"
533551
VerticalAlignment="Stretch"
534552
HorizontalContentAlignment="Stretch"
535553
VerticalContentAlignment="Stretch"
@@ -604,18 +622,14 @@
604622
ResizeDirection="Columns"
605623
Style="{StaticResource GridSplitterStyle_Invisible}" />
606624
<AutoSuggestBox
607-
x:Name="SearchReigon"
625+
x:Name="SearchReigon" TextBoxStyle="{StaticResource AutoSuggestBoxTextBoxStyleFixed}"
608626
x:Load="{x:Bind SearchBoxLoaded, Mode=OneWay}"
609627
Grid.Column="2"
610628
MaxWidth="485"
611629
Margin="0,0,4,0"
612630
VerticalAlignment="Center"
613631
PlaceholderText="Search"
614632
QueryIcon="Find">
615-
<AutoSuggestBox.Resources>
616-
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="TextBoxBorderThemeBrush" />
617-
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="TextBoxBorderThemeBrush" />
618-
</AutoSuggestBox.Resources>
619633
</AutoSuggestBox>
620634
</Grid>
621635
<VisualStateManager.VisualStateGroups>

0 commit comments

Comments
 (0)