Skip to content

Commit 7257fc1

Browse files
Luke BlevinsLuke Blevins
Luke Blevins
authored and
Luke Blevins
committed
Fixed Icon Alignment and Added Labels
1 parent e8d2bca commit 7257fc1

File tree

1 file changed

+36
-18
lines changed

1 file changed

+36
-18
lines changed

‎GenericFileBrowser.xaml

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,37 +131,55 @@
131131
</VisualStateManager.VisualStateGroups>
132132

133133

134-
<Grid Tag="{x:Bind Tag, Mode=OneWay}" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Padding="50,0,50,0" VerticalAlignment="Stretch">
134+
<Grid Tag="{x:Bind Tag, Mode=OneWay}" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Padding="50,35,50,0" VerticalAlignment="Stretch">
135135
<Grid.RowDefinitions>
136-
<RowDefinition Height="18*"/>
137-
<RowDefinition Height="82*"/>
136+
<RowDefinition Height="20*"/>
137+
<RowDefinition Height="80*"/>
138138
</Grid.RowDefinitions>
139139
<TextBlock Name="EmptyText" Visibility="{x:Bind local2:ItemViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="475,100,0,0" Canvas.ZIndex="5" Grid.Row="1"/>
140-
<Grid DataContext="{Binding BackObject}" VerticalAlignment="Bottom" Margin="0,0,0,20">
140+
<Grid DataContext="{Binding BackObject}" VerticalAlignment="Center" Margin="0,0,0,0">
141141
<StackPanel Orientation="Vertical">
142142

143143
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="-15,0,0,0">
144-
<AppBarButton Style="{ThemeResource AppBarButtonRevealStyle}" x:FieldModifier="public" IsEnabled="{x:Bind local2:ItemViewModel.BS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Back" Content="&#xE76B;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Height="50" Width="50">
145-
146-
</AppBarButton>
147-
<Grid DataContext="{Binding ForwardObject}" VerticalAlignment="Center">
148-
<AppBarButton Style="{ThemeResource AppBarButtonRevealStyle}" IsEnabled="{x:Bind local2:ItemViewModel.FS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Forward" Content="&#xE76C;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Top" Height="50" Width="50" HorizontalAlignment="Left"/>
149-
</Grid>
150-
<AppBarButton x:Name="Refresh" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xE72C;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
151-
<AppBarButton x:Name="AddItem" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
152-
<AppBarButton x:Name="Paste" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xE77F;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
153-
<AppBarButton x:Name="GetPath" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xF271;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
154-
<AppBarButton x:Name="ViewMode" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xF0E2;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
155-
156-
</StackPanel>
144+
<StackPanel Orientation="Vertical" Margin="2">
145+
<AppBarButton HorizontalAlignment="Center" Style="{ThemeResource AppBarButtonRevealStyle}" x:FieldModifier="public" IsEnabled="{x:Bind local2:ItemViewModel.BS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Back" Content="&#xE76B;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Height="50" Width="50"/>
146+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" HorizontalAlignment="Center" TextAlignment="Center" Text="Back" Width="60"/>
147+
</StackPanel>
148+
<StackPanel Orientation="Vertical" Margin="2">
149+
<Grid HorizontalAlignment="Center" DataContext="{Binding ForwardObject}" VerticalAlignment="Center">
150+
<AppBarButton Style="{ThemeResource AppBarButtonRevealStyle}" IsEnabled="{x:Bind local2:ItemViewModel.FS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Forward" Content="&#xE76C;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Top" Height="50" Width="50" HorizontalAlignment="Left"/>
151+
</Grid>
152+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" TextAlignment="Center" HorizontalAlignment="Center" Text="Forward" Width="60"/>
153+
</StackPanel>
154+
<StackPanel Orientation="Vertical" Margin="2">
155+
<AppBarButton HorizontalAlignment="Center" x:Name="Refresh" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xE72C;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
156+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Refresh" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
157+
</StackPanel>
158+
<StackPanel Orientation="Vertical" Margin="2">
159+
<AppBarButton HorizontalAlignment="Center" x:Name="AddItem" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
160+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Add Item" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
161+
</StackPanel>
162+
<StackPanel Orientation="Vertical" Margin="2">
163+
<AppBarButton HorizontalAlignment="Center" x:Name="Paste" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xE77F;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
164+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Paste" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
165+
</StackPanel>
166+
<StackPanel Orientation="Vertical" Margin="2">
167+
<AppBarButton HorizontalAlignment="Center" x:Name="GetPath" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xF271;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
168+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Copy Path" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
169+
</StackPanel>
170+
<StackPanel Orientation="Vertical" Margin="2">
171+
<AppBarButton HorizontalAlignment="Center" x:Name="ViewMode" Style="{ThemeResource AppBarButtonRevealStyle}" Content="&#xF0E2;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
172+
<TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords" Text="Layout Mode" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
173+
</StackPanel>
174+
</StackPanel>
157175

158176
<ScrollViewer HorizontalScrollMode="Auto" HorizontalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" >
159177
<TextBlock x:Name="VisiblePath" Text="{x:Bind local:GenericFileBrowser.P.path,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="32" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
160178
</ScrollViewer>
161179
</StackPanel>
162180
</Grid>
163181

164-
<Grid Padding="0,25,0,0" HorizontalAlignment="Stretch" Margin="0,0,0,0" VerticalAlignment="Stretch" Grid.Row="1">
182+
<Grid HorizontalAlignment="Stretch" Margin="0,0,0,0" VerticalAlignment="Stretch" Grid.Row="1">
165183

166184
<controls:DataGrid FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" Drop="AllView_DropAsync" AutoGenerateColumns="False" CanDrag="False" AllowDrop="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" ItemsSource="{x:Bind local2:ItemViewModel.FilesAndFolders}" Margin="0,0,0,0" Padding="0, 0, 0, 0" HorizontalAlignment="Left">
167185

0 commit comments

Comments
 (0)