Skip to content

Commit 9d20d96

Browse files
authored
Merge pull request #239 from yaichenbaum/master
Path bar tweaks
2 parents c96e120 + e0e6e4f commit 9d20d96

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Files UWP/ProHome.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -814,11 +814,11 @@
814814
</Button>
815815
</StackPanel>
816816
<Grid Padding="5,5,5,5.5" Grid.Column="1">
817-
<TextBox LostFocus="VisiblePath_LostFocus" Visibility="Collapsed" HorizontalAlignment="Stretch" BorderBrush="DarkGray" Text="{x:Bind PathText.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Windows10version1809:CornerRadius="2" KeyDown="VisiblePath_TextChanged" Style="{StaticResource TextBoxStyleForPathBar}" BorderThickness="1" x:Name="VisiblePath" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="14" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" Padding="5" PlaceholderText="Enter a path"/>
818-
<Grid Background="Transparent" Padding="2.5,0,0,-1.5" HorizontalAlignment="Stretch" BorderBrush="DarkGray" Windows10version1809:CornerRadius="2" BorderThickness="1" x:Name="ClickablePath" VerticalAlignment="Stretch">
817+
<TextBox LostFocus="VisiblePath_LostFocus" FocusDisengaged="VisiblePath_LostFocus" Visibility="Collapsed" HorizontalAlignment="Stretch" BorderBrush="DarkGray" Text="{x:Bind PathText.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Windows10version1809:CornerRadius="2" KeyDown="VisiblePath_TextChanged" Style="{StaticResource TextBoxStyleForPathBar}" BorderThickness="1" x:Name="VisiblePath" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="14" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" Padding="4" PlaceholderText="Enter a path"/>
818+
<Grid Background="Transparent" Padding="2.5,0,0,0" PointerPressed="ManualPathEntryItem_Click" HorizontalAlignment="Stretch" BorderBrush="DarkGray" Windows10version1809:CornerRadius="2" BorderThickness="1" x:Name="ClickablePath" VerticalAlignment="Stretch">
819819
<Grid.ContextFlyout>
820820
<MenuFlyout>
821-
<MenuFlyoutItem x:Name="ManualPathEntryItem" Text="Enter path manually" Icon="Edit" Click="ManualPathEntryItem_Click"/>
821+
<MenuFlyoutItem x:Name="ManualPathEntryItem" Text="Edit address" Icon="Edit" Click="ManualPathEntryItem_Click"/>
822822
</MenuFlyout>
823823
</Grid.ContextFlyout>
824824
<ListView Margin="0" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Auto"
@@ -828,7 +828,7 @@
828828
<DataTemplate>
829829
<Grid x:Name="ListViewItemContentGrid" Tag="{Binding Path}" Background="Transparent">
830830
<StackPanel Spacing="5" Orientation="Horizontal">
831-
<TextBlock Text="{Binding Title}" FontWeight="SemiBold" FontSize="14"/>
831+
<TextBlock Text="{Binding Title}" FontWeight="SemiBold" FontSize="14" Margin="0,0,0,4"/>
832832
<FontIcon FontSize="8" Glyph="&#xE76C;"/>
833833
</StackPanel>
834834
</Grid>

Files UWP/ProHome.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,8 @@ private void ManualPathEntryItem_Click(object sender, RoutedEventArgs e)
998998
{
999999
VisiblePath.Visibility = Visibility.Visible;
10001000
ClickablePath.Visibility = Visibility.Collapsed;
1001+
VisiblePath.Focus(FocusState.Programmatic);
1002+
VisiblePath.SelectionStart = VisiblePath.Text.Length;
10011003
}
10021004
}
10031005
public class NavigationActions

0 commit comments

Comments
 (0)