Skip to content

Commit 1d0dec2

Browse files
Luke BlevinsLuke Blevins
authored andcommitted
Remove Hard-coded LocationItem Size Values
1 parent 58751e6 commit 1d0dec2

File tree

1 file changed

+43
-24
lines changed

1 file changed

+43
-24
lines changed

YourHome.xaml

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<Setter Property="IsHoldingEnabled" Value="True"/>
185185
<Setter Property="HorizontalContentAlignment" Value="Center"/>
186186
<Setter Property="VerticalContentAlignment" Value="Center"/>
187-
<Setter Property="Margin" Value="0,0,4,4"/>
187+
<Setter Property="Margin" Value="0,0,8,4"/>
188188
<Setter Property="MinWidth" Value="{ThemeResource GridViewItemMinWidth}"/>
189189
<Setter Property="MinHeight" Value="{ThemeResource GridViewItemMinHeight}"/>
190190
<Setter Property="AllowDrop" Value="False"/>
@@ -375,11 +375,28 @@
375375
</Setter.Value>
376376
</Setter>
377377
</Style>
378+
<Style x:Key="DropShadowPanelStyle1" TargetType="controls:DropShadowPanel">
379+
<Setter Property="IsTabStop" Value="False"/>
380+
<Setter Property="HorizontalAlignment" Value="Stretch"/>
381+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
382+
<Setter Property="VerticalAlignment" Value="Stretch"/>
383+
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
384+
<Setter Property="Template">
385+
<Setter.Value>
386+
<ControlTemplate TargetType="controls:DropShadowPanel">
387+
<Grid Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
388+
<Border x:Name="ShadowElement" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
389+
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
390+
</Grid>
391+
</ControlTemplate>
392+
</Setter.Value>
393+
</Setter>
394+
</Style>
378395

379396
</Page.Resources>
380397

381398
<Grid Padding="50,0,50,0" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
382-
399+
383400
<Grid.RowDefinitions>
384401
<RowDefinition Height="15*"/>
385402
<RowDefinition Height="Auto"/>
@@ -389,27 +406,29 @@
389406
<controls:AdaptiveGridView IsItemClickEnabled="True" Name="CardsList" ItemContainerStyle="{StaticResource AdaptiveGridViewItemContainerStyle2}" ItemsSource="{x:Bind list:ItemLoader.itemsAdded}" Padding="0,0,10,0" OneRowModeEnabled="True" ItemHeight="210" DesiredWidth="175" Grid.Row="1" Margin="50,0,50,0" Grid.ColumnSpan="2" ItemClick="CardPressed">
390407
<controls:AdaptiveGridView.ItemTemplate>
391408
<DataTemplate>
392-
<Grid Margin="0,0,0,0" Padding="0,0,0,0">
409+
<Grid Margin="0,0,0,0" Padding="0,0,0,0">
393410

394411
<Grid Margin="2">
395-
<StackPanel Orientation="Vertical">
412+
<Grid.RowDefinitions>
413+
<RowDefinition Height="85*"/>
414+
<RowDefinition Height="15*"/>
415+
</Grid.RowDefinitions>
396416

397417

398-
<controls:DropShadowPanel PointerEntered="DropShadowPanel_PointerEntered" PointerExited="DropShadowPanel_PointerExited" OffsetX="7.50" OffsetY="7.50" ShadowOpacity="0.15" BlurRadius="10" Height="175" Width="175" HorizontalAlignment="Left">
399-
<Grid>
400-
<Rectangle Width="175" Height="175" RadiusX="10" RadiusY="10">
401-
<Rectangle.Fill>
402-
<ImageBrush Stretch="UniformToFill" ImageSource="{Binding ImageSource}"/>
403-
</Rectangle.Fill>
404-
</Rectangle>
405-
<TextBlock Canvas.ZIndex="5" FontFamily="Segoe MDL2 Assets" FontSize="58" Text="{Binding Icon}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
406-
</Grid>
407-
</controls:DropShadowPanel>
418+
<controls:DropShadowPanel Style="{StaticResource DropShadowPanelStyle1}" PointerEntered="DropShadowPanel_PointerEntered" PointerExited="DropShadowPanel_PointerExited" OffsetX="7.50" OffsetY="7.50" ShadowOpacity="0.15" BlurRadius="10" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,0,0,0" VerticalAlignment="Stretch">
419+
<Grid >
420+
<Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RadiusX="10" RadiusY="10">
421+
<Rectangle.Fill>
422+
<ImageBrush Stretch="UniformToFill" ImageSource="{Binding ImageSource}"/>
423+
</Rectangle.Fill>
424+
</Rectangle>
425+
<TextBlock Canvas.ZIndex="5" FontFamily="Segoe MDL2 Assets" FontSize="58" Text="{Binding Icon}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
426+
</Grid>
427+
</controls:DropShadowPanel>
408428

409429

410430

411-
<TextBlock Margin="0,5,0,0" Text="{Binding Text}" Name="ItemLocationName" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" HorizontalAlignment="Left" />
412-
</StackPanel>
431+
<TextBlock Margin="0,5,0,0" Text="{Binding Text}" Name="ItemLocationName" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" />
413432
</Grid>
414433
</Grid>
415434
</DataTemplate>
@@ -420,14 +439,14 @@
420439

421440
<Grid VerticalAlignment="Stretch" Grid.Row="2" HorizontalAlignment="Stretch" Margin="50,25,75,0">
422441
<StackPanel>
423-
<TextBlock FontFamily="Segoe UI" FontWeight="Bold" FontSize="30" Text="Recent Items"/>
424-
<ScrollViewer HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto" VerticalScrollMode="Auto" >
425-
<ListView Name="RecentsView" MinHeight="400" HorizontalAlignment="Stretch" Padding="0,50,0,0" >
426-
<ListView.Header>
427-
<TextBlock Text="No recent files" HorizontalAlignment="Center" FontSize="24"/>
428-
</ListView.Header>
429-
</ListView>
430-
</ScrollViewer>
442+
<TextBlock FontFamily="Segoe UI" FontWeight="Bold" FontSize="30" Text="Recent Items"/>
443+
<ScrollViewer HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto" VerticalScrollMode="Auto" >
444+
<ListView Name="RecentsView" MinHeight="400" HorizontalAlignment="Stretch" Padding="0,50,0,0" >
445+
<ListView.Header>
446+
<TextBlock Text="No recent files" HorizontalAlignment="Center" FontSize="24"/>
447+
</ListView.Header>
448+
</ListView>
449+
</ScrollViewer>
431450
</StackPanel>
432451
</Grid>
433452

0 commit comments

Comments
 (0)