Skip to content

Commit 659ff21

Browse files
lukeblevinslukeblevins
committed
Reveal Effect in Favorites Cards, Revert Size/Alignment Change to DataGrid
1 parent 9c21a29 commit 659ff21

File tree

3 files changed

+88
-92
lines changed

3 files changed

+88
-92
lines changed

‎Files UWP/GenericFileBrowser.xaml

Lines changed: 86 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -151,34 +151,32 @@
151151
</Style>
152152
</Page.Resources>
153153

154-
<Grid Background="Transparent" Name="RootGrid">
154+
<Grid Background="Transparent" x:Name="RootGrid">
155155
<Grid.ContextFlyout>
156156
<MenuFlyout MenuFlyoutPresenterStyle="{StaticResource MenuFlyoutFluentThemeResources}">
157-
<MenuFlyout.Items>
158-
<MenuFlyoutItem Text="Refresh" Name="RefreshEmptySpace">
159-
<MenuFlyoutItem.Icon>
160-
<FontIcon Glyph="&#xE72C;"/>
161-
</MenuFlyoutItem.Icon>
162-
</MenuFlyoutItem>
163-
<MenuFlyoutItem Text="Paste" Name="PasteEmptySpace" IsEnabled="{x:Bind local:App.PS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
164-
<MenuFlyoutItem.Icon>
165-
<FontIcon Glyph="&#xE77F;"/>
166-
</MenuFlyoutItem.Icon>
167-
<MenuFlyoutItem.KeyboardAccelerators>
168-
<KeyboardAccelerator Modifiers="Control" Key="V"/>
169-
</MenuFlyoutItem.KeyboardAccelerators>
170-
</MenuFlyoutItem>
171-
<MenuFlyoutItem IsEnabled="False" Text="Open in PowerShell...">
172-
<MenuFlyoutItem.Icon>
173-
<FontIcon Glyph="&#xE756;"/>
174-
</MenuFlyoutItem.Icon>
175-
</MenuFlyoutItem>
176-
</MenuFlyout.Items>
157+
<MenuFlyoutItem Text="Refresh" x:Name="RefreshEmptySpace">
158+
<MenuFlyoutItem.Icon>
159+
<FontIcon Glyph="&#xE72C;"/>
160+
</MenuFlyoutItem.Icon>
161+
</MenuFlyoutItem>
162+
<MenuFlyoutItem Text="Paste" x:Name="PasteEmptySpace" IsEnabled="{x:Bind Mode=TwoWay, Path=local:App.PS.isEnabled, UpdateSourceTrigger=PropertyChanged}">
163+
<MenuFlyoutItem.Icon>
164+
<FontIcon Glyph="&#xE77F;"/>
165+
</MenuFlyoutItem.Icon>
166+
<MenuFlyoutItem.KeyboardAccelerators>
167+
<KeyboardAccelerator Modifiers="Control" Key="V"/>
168+
</MenuFlyoutItem.KeyboardAccelerators>
169+
</MenuFlyoutItem>
170+
<MenuFlyoutItem IsEnabled="False" Text="Open in PowerShell...">
171+
<MenuFlyoutItem.Icon>
172+
<FontIcon Glyph="&#xE756;"/>
173+
</MenuFlyoutItem.Icon>
174+
</MenuFlyoutItem>
177175
</MenuFlyout>
178176
</Grid.ContextFlyout>
179-
<ProgressBar Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
180-
<TextBlock Visibility="{x:Bind TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
181-
<controls:DataGrid ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" HorizontalAlignment="Stretch">
177+
<ProgressBar x:Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
178+
<TextBlock Visibility="{x:Bind Mode=TwoWay, Path=TextState.isVisible, UpdateSourceTrigger=PropertyChanged}" x:Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
179+
<controls:DataGrid ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" HorizontalAlignment="Left">
182180
<controls:DataGrid.Resources>
183181
<SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="Transparent"/>
184182
<SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="Transparent"/>
@@ -188,12 +186,12 @@
188186
<Setter Property="ContextFlyout">
189187
<Setter.Value>
190188
<MenuFlyout x:Name="HeaderRightClickMenu" MenuFlyoutPresenterStyle="{StaticResource MenuFlyoutFluentThemeResources}">
191-
<MenuFlyoutItem Text="Edit Columns" Name="EditColumn">
189+
<MenuFlyoutItem Text="Edit Columns" x:Name="EditColumn">
192190
<MenuFlyoutItem.Icon>
193191
<FontIcon Glyph="&#xE70F;"/>
194192
</MenuFlyoutItem.Icon>
195193
</MenuFlyoutItem>
196-
<MenuFlyoutItem Text="Size All Columns to Fit" Name="FitColumns">
194+
<MenuFlyoutItem Text="Size All Columns to Fit" x:Name="FitColumns">
197195
<MenuFlyoutItem.Icon>
198196
<FontIcon Glyph="&#xE9A6;"/>
199197
</MenuFlyoutItem.Icon>
@@ -209,72 +207,70 @@
209207
<Setter Property="ContextFlyout">
210208
<Setter.Value>
211209
<MenuFlyout Opened="RightClickContextMenu_Opened" x:Name="RightClickContextMenu" MenuFlyoutPresenterStyle="{StaticResource MenuFlyoutFluentThemeResources}">
212-
<MenuFlyout.Items>
213-
<MenuFlyoutItem Text="Open With..." Name="OpenItem">
214-
<MenuFlyoutItem.Icon>
215-
<FontIcon Glyph="&#xE7AC;"/>
216-
</MenuFlyoutItem.Icon>
217-
</MenuFlyoutItem>
210+
<MenuFlyoutItem Text="Open With..." x:Name="OpenItem">
211+
<MenuFlyoutItem.Icon>
212+
<FontIcon Glyph="&#xE7AC;"/>
213+
</MenuFlyoutItem.Icon>
214+
</MenuFlyoutItem>
218215

219-
<MenuFlyoutItem Text="Share" Name="ShareItem">
220-
<MenuFlyoutItem.Icon>
221-
<FontIcon Glyph="&#xE72D;"/>
222-
</MenuFlyoutItem.Icon>
223-
<MenuFlyoutItem.KeyboardAccelerators>
224-
<KeyboardAccelerator Modifiers="Control" Key="S"/>
225-
</MenuFlyoutItem.KeyboardAccelerators>
226-
</MenuFlyoutItem>
216+
<MenuFlyoutItem Text="Share" x:Name="ShareItem">
217+
<MenuFlyoutItem.Icon>
218+
<FontIcon Glyph="&#xE72D;"/>
219+
</MenuFlyoutItem.Icon>
220+
<MenuFlyoutItem.KeyboardAccelerators>
221+
<KeyboardAccelerator Modifiers="Control" Key="S"/>
222+
</MenuFlyoutItem.KeyboardAccelerators>
223+
</MenuFlyoutItem>
227224

228-
<MenuFlyoutSeparator/>
229-
<MenuFlyoutItem Text="Delete" Name="DeleteItem" >
230-
<MenuFlyoutItem.Icon>
231-
<FontIcon Glyph="&#xE74D;"/>
232-
</MenuFlyoutItem.Icon>
233-
<MenuFlyoutItem.KeyboardAccelerators>
234-
<KeyboardAccelerator Key="Delete"/>
235-
</MenuFlyoutItem.KeyboardAccelerators>
236-
</MenuFlyoutItem>
237-
<MenuFlyoutItem Text="Rename" Name="RenameItem" >
238-
<MenuFlyoutItem.Icon>
239-
<FontIcon Glyph="&#xE8AC;"/>
240-
</MenuFlyoutItem.Icon>
241-
<MenuFlyoutItem.KeyboardAccelerators>
242-
<KeyboardAccelerator Key="F2"/>
243-
</MenuFlyoutItem.KeyboardAccelerators>
244-
</MenuFlyoutItem>
245-
<MenuFlyoutSeparator/>
246-
<MenuFlyoutItem Text="Cut" Name="CutItem" >
247-
<MenuFlyoutItem.Icon>
248-
<FontIcon Glyph="&#xE8C6;"/>
249-
</MenuFlyoutItem.Icon>
250-
<MenuFlyoutItem.KeyboardAccelerators>
251-
<KeyboardAccelerator Modifiers="Control" Key="X"/>
252-
</MenuFlyoutItem.KeyboardAccelerators>
253-
</MenuFlyoutItem>
254-
<MenuFlyoutItem Text="Copy" Name="CopyItem" >
255-
<MenuFlyoutItem.Icon>
256-
<FontIcon Glyph="&#xE8C8;"/>
257-
</MenuFlyoutItem.Icon>
258-
<MenuFlyoutItem.KeyboardAccelerators>
259-
<KeyboardAccelerator Modifiers="Control" Key="C"/>
260-
</MenuFlyoutItem.KeyboardAccelerators>
261-
</MenuFlyoutItem>
225+
<MenuFlyoutSeparator/>
226+
<MenuFlyoutItem Text="Delete" x:Name="DeleteItem" >
227+
<MenuFlyoutItem.Icon>
228+
<FontIcon Glyph="&#xE74D;"/>
229+
</MenuFlyoutItem.Icon>
230+
<MenuFlyoutItem.KeyboardAccelerators>
231+
<KeyboardAccelerator Key="Delete"/>
232+
</MenuFlyoutItem.KeyboardAccelerators>
233+
</MenuFlyoutItem>
234+
<MenuFlyoutItem Text="Rename" x:Name="RenameItem" >
235+
<MenuFlyoutItem.Icon>
236+
<FontIcon Glyph="&#xE8AC;"/>
237+
</MenuFlyoutItem.Icon>
238+
<MenuFlyoutItem.KeyboardAccelerators>
239+
<KeyboardAccelerator Key="F2"/>
240+
</MenuFlyoutItem.KeyboardAccelerators>
241+
</MenuFlyoutItem>
242+
<MenuFlyoutSeparator/>
243+
<MenuFlyoutItem Text="Cut" x:Name="CutItem" >
244+
<MenuFlyoutItem.Icon>
245+
<FontIcon Glyph="&#xE8C6;"/>
246+
</MenuFlyoutItem.Icon>
247+
<MenuFlyoutItem.KeyboardAccelerators>
248+
<KeyboardAccelerator Modifiers="Control" Key="X"/>
249+
</MenuFlyoutItem.KeyboardAccelerators>
250+
</MenuFlyoutItem>
251+
<MenuFlyoutItem Text="Copy" x:Name="CopyItem" >
252+
<MenuFlyoutItem.Icon>
253+
<FontIcon Glyph="&#xE8C8;"/>
254+
</MenuFlyoutItem.Icon>
255+
<MenuFlyoutItem.KeyboardAccelerators>
256+
<KeyboardAccelerator Modifiers="Control" Key="C"/>
257+
</MenuFlyoutItem.KeyboardAccelerators>
258+
</MenuFlyoutItem>
262259

263-
<MenuFlyoutSeparator/>
264-
<MenuFlyoutItem Text="Pin to sidebar" Name="SidebarPinItem">
265-
<MenuFlyoutItem.Icon>
266-
<SymbolIcon Symbol="Pin"/>
267-
</MenuFlyoutItem.Icon>
260+
<MenuFlyoutSeparator/>
261+
<MenuFlyoutItem Text="Pin to sidebar" x:Name="SidebarPinItem">
262+
<MenuFlyoutItem.Icon>
263+
<SymbolIcon Symbol="Pin"/>
264+
</MenuFlyoutItem.Icon>
268265

269-
</MenuFlyoutItem>
266+
</MenuFlyoutItem>
270267

271-
<MenuFlyoutItem Text="Properties" Name="PropertiesItem">
272-
<MenuFlyoutItem.Icon>
273-
<FontIcon Glyph="&#xE946;"/>
274-
</MenuFlyoutItem.Icon>
268+
<MenuFlyoutItem Text="Properties" x:Name="PropertiesItem">
269+
<MenuFlyoutItem.Icon>
270+
<FontIcon Glyph="&#xE946;"/>
271+
</MenuFlyoutItem.Icon>
275272

276-
</MenuFlyoutItem>
277-
</MenuFlyout.Items>
273+
</MenuFlyoutItem>
278274

279275
</MenuFlyout>
280276
</Setter.Value>
@@ -294,8 +290,8 @@
294290
<controls:DataGridTemplateColumn IsReadOnly="True">
295291
<controls:DataGridTemplateColumn.CellTemplate>
296292
<DataTemplate>
297-
<Grid Name="Icon" Margin="0, 0, 0, 0">
298-
<Rectangle Visibility="Collapsed" Name="CutIndicator" Opacity="0.1" Fill="LightGray"/>
293+
<Grid x:Name="Icon" Margin="0, 0, 0, 0">
294+
<Rectangle Visibility="Collapsed" x:Name="CutIndicator" Opacity="0.1" Fill="LightGray"/>
299295
<FontIcon Visibility="{Binding FolderImg}" Glyph="&#xE8D5;" FontFamily="Segoe MDL2 Assets" Foreground="#ffe793"/>
300296
<FontIcon Visibility="{Binding EmptyImgVis}" Glyph="&#xE7C3;" FontFamily="Segoe MDL2 Assets"/>
301297
<Image Visibility="{Binding FileIconVis}" Height="20" Width="20" Source="{Binding FileImg}" Stretch="UniformToFill" />
@@ -306,10 +302,10 @@
306302
<controls:DataGridTextColumn IsReadOnly="True" Header="Name" Width="275" Binding="{Binding FileName}" Tag="Name"/>
307303
<controls:DataGridTextColumn IsReadOnly="True" Header="Date modified" Width="Auto" Binding="{Binding FileDate}" Tag="Date"/>
308304
<controls:DataGridTextColumn IsReadOnly="True" Header="Type" Width="150" Binding="{Binding FileType}" Tag="Type"/>
309-
<controls:DataGridTextColumn IsReadOnly="True" Header="Size" Width="*" Binding="{Binding FileSize}" Tag="Size"/>
305+
<controls:DataGridTextColumn x:Name="sizeColumn" IsReadOnly="True" Header="Size" Width="Auto" MinWidth="100" Binding="{Binding FileSize}" Tag="Size"/>
310306
</controls:DataGrid.Columns>
311307
</controls:DataGrid>
312308

313-
309+
314310
</Grid>
315311
</Page>

‎Files UWP/ProHome.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
<Grid Padding="0,0,0,0">
453453
<VisualStateManager.VisualStateGroups>
454454
<VisualStateGroup>
455-
<!--VisualState to be triggered when window width is between 0 - 1080 effective pixels.-->
455+
<!--VisualState to be triggered when window width is between 0 - 800 effective pixels.-->
456456
<VisualState>
457457
<VisualState.StateTriggers>
458458
<AdaptiveTrigger MinWindowWidth="0" />

‎Files UWP/YourHome.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
<Grid Margin="2">
518518
<controls:DropShadowPanel Style="{StaticResource DropShadowPanelStyle1}" PointerReleased="DropShadowPanel_PointerReleased" PointerPressed="DropShadowPanel_PointerPressed" PointerEntered="DropShadowPanel_PointerEntered" PointerExited="DropShadowPanel_PointerExited" OffsetX="0" OffsetY="2.50" ShadowOpacity="0.05" Padding="0,0,-4,0" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,0,0,5" VerticalAlignment="Stretch">
519519
<Grid>
520-
<Button Windows10version1809:CornerRadius="4" Tag="{Binding Icon}" IsTapEnabled="True" Tapped="Button_Tapped" Background="{ThemeResource YourHomeCardBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
520+
<Button BorderThickness="1" Style="{ThemeResource ButtonRevealStyle}" Windows10version1809:CornerRadius="4" Tag="{Binding Icon}" IsTapEnabled="True" Tapped="Button_Tapped" Background="{ThemeResource YourHomeCardBackgroundColor}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
521521
<StackPanel Spacing="10" Orientation="Vertical">
522522
<TextBlock Canvas.ZIndex="5" Foreground="{ThemeResource SystemControlForegroundAccentBrush}" FontFamily="Segoe MDL2 Assets" FontSize="24" Text="{Binding Icon}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
523523
<TextBlock Margin="0,0,0,0" Text="{Binding Text}" Name="ItemLocationName" FontFamily="Segoe UI" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom" />

0 commit comments

Comments
 (0)