Skip to content

Commit 6cefe25

Browse files
lukeblevinslukeblevins
committed
Tweaks to Properties Dialog Design
1 parent 80ac4fb commit 6cefe25

File tree

2 files changed

+42
-62
lines changed

2 files changed

+42
-62
lines changed

‎Files UWP/Properties.xaml

Lines changed: 41 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:Windows10version1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
1010
x:Class="Files.Properties"
1111
mc:Ignorable="d"
12-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
12+
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Width="400" Height="500">
1313
<Page.Resources>
1414
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource SystemChromeLowColor}"/>
1515
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SystemChromeLowColor}"/>
@@ -290,61 +290,46 @@
290290
</Page.Resources>
291291

292292
<Grid>
293-
<Custom:TabView SelectedIndex="0" Template="{StaticResource TabViewTemplate1}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" CanCloseTabs="False" TabWidthBehavior="Actual">
294-
<Custom:TabViewItem BorderThickness="0" Template="{StaticResource TabViewItemFluentTemplate}" Header="Info">
295-
<Custom:TabViewItem.Icon>
296-
<FontIcon Glyph="&#xE946;"/>
297-
</Custom:TabViewItem.Icon>
298-
299-
<Grid>
300-
<StackPanel Spacing="10" Orientation="Vertical">
301-
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
302-
<Image Width="45" Height="45" Name="itemIcon"/>
303-
<TextBox Height="28" Name="itemFileName" Width="300" PlaceholderText="Item Name"/>
304-
</StackPanel>
305-
<MenuFlyoutSeparator/>
306-
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
307-
<TextBlock Text="Item type:"/>
308-
<TextBlock Name="itemType" />
309-
</StackPanel>
310-
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
311-
<TextBlock Text="Path:"/>
312-
<TextBlock Name="itemPath" />
313-
</StackPanel>
314-
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
315-
<TextBlock Text="Item size:"/>
316-
<TextBlock Name="itemSize" />
317-
</StackPanel>
318-
<MenuFlyoutSeparator/>
319-
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
320-
<TextBlock Text="Created:"/>
321-
<TextBlock Name="itemCreatedTimestamp" />
322-
</StackPanel>
323-
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
324-
<TextBlock Text="Modified:"/>
325-
<TextBlock Name="itemModifiedTimestamp" />
326-
</StackPanel>
327-
</StackPanel>
328-
</Grid>
329-
330-
</Custom:TabViewItem>
331-
<Custom:TabViewItem BorderThickness="0" Template="{StaticResource TabViewItemFluentTemplate}" Visibility="Collapsed" Header="Extra Details">
332-
<Custom:TabViewItem.Icon>
333-
<FontIcon Glyph="&#xEA37;"/>
334-
</Custom:TabViewItem.Icon>
335-
</Custom:TabViewItem>
336-
<Custom:TabViewItem BorderThickness="0" Template="{StaticResource TabViewItemFluentTemplate}" Visibility="Collapsed" Header="Security">
337-
<Custom:TabViewItem.Icon>
338-
<FontIcon Glyph="&#xE8A6;"/>
339-
</Custom:TabViewItem.Icon>
340-
</Custom:TabViewItem>
341-
</Custom:TabView>
342-
343-
<StackPanel HorizontalAlignment="Center" Spacing="5" Padding="10" Orientation="Horizontal" VerticalAlignment="Bottom">
344-
<Button Foreground="White" Background="#0078d4" Windows10version1809:CornerRadius="2" Width="120" Content="OK" HorizontalAlignment="Stretch" />
345-
<Button Windows10version1809:CornerRadius="2" Width="120" Content="Apply" HorizontalAlignment="Stretch" />
346-
<Button x:Name="CancelButton" Windows10version1809:CornerRadius="2" Width="120" Content="Cancel" HorizontalAlignment="Stretch" />
347-
293+
<Grid.RowDefinitions>
294+
<RowDefinition Height="*"/>
295+
<RowDefinition Height="50"/>
296+
</Grid.RowDefinitions>
297+
<StackPanel Spacing="10" Orientation="Vertical" Grid.RowSpan="2">
298+
<Grid Margin="0,0,0,-10">
299+
<Grid.ColumnDefinitions>
300+
<ColumnDefinition Width="Auto"/>
301+
<ColumnDefinition Width="*"/>
302+
</Grid.ColumnDefinitions>
303+
<Image Margin="15,15" Grid.Column="0" Width="45" Height="45" Name="itemIcon" />
304+
<TextBox CornerRadius="2" BorderThickness="1" Padding="10,4" Name="itemFileName" PlaceholderText="Item Name" VerticalAlignment="Center" Grid.Column="1" Margin="0,0,15,0" />
305+
</Grid>
306+
<MenuFlyoutSeparator/>
307+
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
308+
<TextBlock Text="Item type:"/>
309+
<TextBlock Name="itemType" />
310+
</StackPanel>
311+
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
312+
<TextBlock Text="Path:"/>
313+
<TextBlock Name="itemPath" />
314+
</StackPanel>
315+
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
316+
<TextBlock Text="Item size:"/>
317+
<TextBlock Name="itemSize" />
318+
</StackPanel>
319+
<MenuFlyoutSeparator/>
320+
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
321+
<TextBlock Text="Created:"/>
322+
<TextBlock Name="itemCreatedTimestamp" />
323+
</StackPanel>
324+
<StackPanel Padding="10" Spacing="24" Orientation="Horizontal">
325+
<TextBlock Text="Modified:"/>
326+
<TextBlock Name="itemModifiedTimestamp" />
327+
</StackPanel>
328+
</StackPanel>
329+
<StackPanel Spacing="5" Padding="10" Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Center">
330+
<Button Content="OK" Foreground="White" Background="#FF0078D7" CornerRadius="2" Width="123" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
331+
<Button Content="Apply" CornerRadius="2" Width="123" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
332+
<Button Content="Cancel" CornerRadius="2" Width="123" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
348333
</StackPanel>
349334
</Grid>
350335
</Page>

‎Files UWP/Properties.xaml.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@
1515
using Windows.UI.Xaml.Media;
1616
using Windows.UI.Xaml.Navigation;
1717

18-
// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
19-
2018
namespace Files
2119
{
22-
/// <summary>
23-
/// An empty page that can be used on its own or navigated to within a Frame.
24-
/// </summary>
20+
2521
public sealed partial class Properties : Page
2622
{
2723
public Properties()
2824
{
2925
this.InitializeComponent();
30-
CancelButton.Click += ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().PropertiesWindow_CancelButton_Click;
3126
}
3227

3328
private void OK_Button_Click(object sender, RoutedEventArgs e)

0 commit comments

Comments
 (0)