Skip to content

Commit 965e608

Browse files
winston-dewinston-de
authored
Update font style (#5734)
1 parent c48ed0f commit 965e608

15 files changed

+103
-58
lines changed

‎Files/Resources/PreviewPanePropertiesInformation.json

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,13 @@
163163
"IsReadOnly": false,
164164
"ID": null
165165
},
166+
{
167+
"NameResource": "PropertyPartOfSet",
168+
"SectionResource": "PropertySectionMusic",
169+
"Property": "System.Music.PartOfSet",
170+
"IsReadOnly": false,
171+
"ID": null
172+
},
166173
{
167174
"NameResource": "PropertyGenre",
168175
"SectionResource": "PropertySectionMusic",
@@ -375,6 +382,13 @@
375382
"IsReadOnly": true,
376383
"ID": null
377384
},
385+
{
386+
"NameResource": "PropertyDateTaken",
387+
"SectionResource": "PropertySectionPhoto",
388+
"Property": "System.Photo.DateTaken",
389+
"IsReadOnly": true,
390+
"ID": null
391+
},
378392
{
379393
"NameResource": "PropertyDateModified",
380394
"SectionResource": "PropertySectionCore",
@@ -437,10 +451,9 @@
437451
"ID": null
438452
},
439453
{
440-
"NameResource": "PropertyDateTaken",
441-
"SectionResource": "PropertySectionPhoto",
442-
"Property": "System.Photo.DateTaken",
454+
"NameResource": "DetailsViewHeaderFlyout_ShowFileTag/Text",
455+
"SectionResource": "PropertySectionCore",
443456
"IsReadOnly": true,
444-
"ID": null
457+
"ID": "filetag"
445458
}
446459
]

‎Files/Resources/PropertiesInformation.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,13 @@
239239
"IsReadOnly": false,
240240
"ID": null
241241
},
242+
{
243+
"NameResource": "PropertyPartOfSet",
244+
"SectionResource": "PropertySectionMusic",
245+
"Property": "System.Music.PartOfSet",
246+
"IsReadOnly": false,
247+
"ID": null
248+
},
242249
{
243250
"NameResource": "PropertyGenre",
244251
"SectionResource": "PropertySectionMusic",

‎Files/Strings/en-US/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2740,6 +2740,9 @@ We use App Center to keep track of app usage, find bugs, and fix crashes. All in
27402740
<data name="SettingsShowFavoritesSection.Title" xml:space="preserve">
27412741
<value>Show Favorites section on the sidebar</value>
27422742
</data>
2743+
<data name="PropertyPartOfSet" xml:space="preserve">
2744+
<value>Part of set</value>
2745+
</data>
27432746
<data name="InsertDiscDialog.CloseDialogButton" xml:space="preserve">
27442747
<value>Close</value>
27452748
</data>

‎Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
Drop="TabViewItem_Drop"
120120
Header="{x:Bind Header, Mode=OneWay}"
121121
IconSource="{x:Bind IconSource, Mode=OneWay}"
122+
Loaded="TabViewItem_Loaded"
122123
Style="{ThemeResource TabViewItemStyle}"
123124
ToolTipService.ToolTip="{x:Null}" />
124125
</DataTemplate>

‎Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.Toolkit.Uwp.UI;
55
using Microsoft.UI.Xaml.Controls;
66
using System;
7+
using System.Diagnostics;
78
using System.Linq;
89
using Windows.ApplicationModel.DataTransfer;
910
using Windows.Storage;
@@ -224,6 +225,16 @@ public Visibility TabStripVisibility
224225
public static readonly DependencyProperty TabStripVisibilityProperty =
225226
DependencyProperty.Register("TabStripVisibility", typeof(Visibility), typeof(HorizontalMultitaskingControl), new PropertyMetadata(Visibility.Visible));
226227

228+
private bool firstLoad = true;
227229

230+
private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
231+
{
232+
// fixes issue where tab would not show as selected when opened with path argument
233+
if(firstLoad)
234+
{
235+
firstLoad = false;
236+
(sender as TabViewItem).IsSelected = true;
237+
}
238+
}
228239
}
229240
}

‎Files/UserControls/PreviewPane.xaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@
175175
Grid.Row="0"
176176
Grid.Column="0"
177177
HorizontalAlignment="Stretch"
178-
FontSize="14"
179-
Style="{StaticResource HeaderTextBlockStyle}"
178+
Style="{StaticResource BodyTextBlockStyle}"
180179
Text="{x:Bind Name, Mode=OneWay}" />
181180

182181
<TextBlock
@@ -185,16 +184,12 @@
185184
Grid.Column="0"
186185
HorizontalAlignment="Stretch"
187186
IsTextSelectionEnabled="True"
187+
Style="{StaticResource CaptionTextBlockStyle}"
188188
Text="{x:Bind ValueText, Mode=TwoWay}"
189189
TextWrapping="Wrap" />
190190
</Grid>
191191
</DataTemplate>
192192
</ItemsControl.ItemTemplate>
193-
<!--<muxc:ItemsRepeater.cont>
194-
<Style TargetType="ListViewItem">
195-
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
196-
</Style>
197-
</muxc:ItemsRepeater.cont>-->
198193
</ItemsControl>
199194
</StackPanel>
200195
</ScrollViewer>

‎Files/ViewModels/ItemViewModel.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,9 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>
816816
var matchingStorageFolder = (StorageFolder)matchingStorageItem ?? await GetFolderFromPathAsync(item.ItemPath);
817817
if (matchingStorageFolder != null)
818818
{
819-
using var Thumbnail = await matchingStorageFolder.GetThumbnailAsync(ThumbnailMode.ListView, thumbnailSize, ThumbnailOptions.ReturnOnlyIfCached);
819+
var mode = thumbnailSize < 80 ? ThumbnailMode.ListView : ThumbnailMode.SingleItem;
820+
821+
using var Thumbnail = await matchingStorageFolder.GetThumbnailAsync(mode, thumbnailSize, ThumbnailOptions.UseCurrentScale);
820822
if (!(Thumbnail == null || Thumbnail.Size == 0 || Thumbnail.OriginalHeight == 0 || Thumbnail.OriginalWidth == 0))
821823
{
822824
await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>

‎Files/ViewModels/Previews/BasePreviewModel.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ private async Task<List<FileProperty>> GetSystemFileProperties()
7474

7575
list.Find(x => x.ID == "address").Value = await FileProperties.GetAddressFromCoordinatesAsync((double?)list.Find(x => x.Property == "System.GPS.LatitudeDecimal").Value,
7676
(double?)list.Find(x => x.Property == "System.GPS.LongitudeDecimal").Value);
77+
78+
// adds the value for the file tag
79+
if(App.AppSettings.AreFileTagsEnabled)
80+
{
81+
list.FirstOrDefault(x => x.ID == "filetag").Value = Item.FileTagUI?.TagName;
82+
} else
83+
{
84+
_ = list.Remove(list.FirstOrDefault(x => x.ID == "filetag"));
85+
}
86+
7787
return list.Where(i => i.ValueText != null).ToList();
7888
}
7989

‎Files/ViewModels/Previews/FolderPreviewViewModel.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,20 @@ private async Task LoadPreviewAndDetailsAsync()
5858
Value = Extensions.DateTimeExtensions.GetFriendlyDateFromFormat(info.ItemDate, returnformat, true)
5959
},
6060
new FileProperty()
61-
{
62-
NameResource = "PropertyItemName",
63-
Value = Folder.Name,
64-
},
65-
new FileProperty()
6661
{
6762
NameResource = "PropertyItemPathDisplay",
6863
Value = Folder.Path,
6964
}
7065
};
66+
67+
if(App.AppSettings.AreFileTagsEnabled)
68+
{
69+
Item.FileDetails.Add(new FileProperty()
70+
{
71+
NameResource = "DetailsViewHeaderFlyout_ShowFileTag/Text",
72+
Value = Item.FileTagUI?.TagName
73+
});
74+
}
7175
}
7276
}
7377
}

‎Files/Views/LayoutModes/ColumnViewBase.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
262262
private void RenameTextBox_LostFocus(object sender, RoutedEventArgs e)
263263
{
264264
// This check allows the user to use the text box context menu without ending the rename
265-
if (!(FocusManager.GetFocusedElement() is AppBarButton))
265+
if (!(FocusManager.GetFocusedElement() is AppBarButton or Popup))
266266
{
267267
TextBox textBox = e.OriginalSource as TextBox;
268268
CommitRename(textBox);

‎Files/Views/LayoutModes/ColumnViewBrowser.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
340340
private void RenameTextBox_LostFocus(object sender, RoutedEventArgs e)
341341
{
342342
// This check allows the user to use the text box context menu without ending the rename
343-
if (!(FocusManager.GetFocusedElement() is AppBarButton))
343+
if (!(FocusManager.GetFocusedElement() is AppBarButton or Popup))
344344
{
345345
TextBox textBox = e.OriginalSource as TextBox;
346346
CommitRename(textBox);

‎Files/Views/LayoutModes/DetailsLayoutBrowser.xaml

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,17 @@
150150
<Style TargetType="uc:DataGridHeader">
151151
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
152152
</Style>
153+
154+
<Style
155+
x:Key="ColumnContentTextBlock"
156+
BasedOn="{StaticResource CaptionTextBlockStyle}"
157+
TargetType="TextBlock">
158+
<Setter Property="TextWrapping" Value="NoWrap" />
159+
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
160+
<Setter Property="VerticalAlignment" Value="Center" />
161+
<Setter Property="HorizontalAlignment" Value="Stretch" />
162+
<Setter Property="Opacity" Value="0.6" />
163+
</Style>
153164
</ResourceDictionary>
154165
</local:BaseLayout.Resources>
155166

@@ -503,6 +514,7 @@
503514
<DataTemplate x:DataType="local2:ListedItem">
504515
<Grid
505516
HorizontalAlignment="Stretch"
517+
AutomationProperties.Name="{x:Bind ItemName, Mode=OneWay}"
506518
IsRightTapEnabled="True"
507519
Loaded="Grid_Loaded"
508520
RightTapped="StackPanel_RightTapped"
@@ -629,8 +641,7 @@
629641
VerticalAlignment="Center"
630642
Visibility="{Binding ColumnsViewModel.TagColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
631643
<TextBlock
632-
VerticalAlignment="Center"
633-
FontWeight="Light"
644+
Style="{StaticResource ColumnContentTextBlock}"
634645
Text="{x:Bind FileTagUI.TagName, Mode=OneWay}"
635646
TextTrimming="CharacterEllipsis"
636647
Visibility="{x:Bind FileTagUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}" />
@@ -644,11 +655,7 @@
644655
HorizontalAlignment="Stretch"
645656
VerticalAlignment="Center"
646657
x:Load="{x:Bind IsRecycleBinItem}">
647-
<TextBlock
648-
VerticalAlignment="Center"
649-
FontWeight="Light"
650-
Text="{x:Bind AsRecycleBinItem.ItemOriginalPath, Mode=OneWay}"
651-
TextTrimming="CharacterEllipsis" />
658+
<TextBlock Style="{StaticResource ColumnContentTextBlock}" Text="{x:Bind AsRecycleBinItem.ItemOriginalPath, Mode=OneWay}" />
652659
</Grid>
653660

654661
<Grid
@@ -659,11 +666,7 @@
659666
HorizontalAlignment="Stretch"
660667
VerticalAlignment="Center"
661668
x:Load="{x:Bind IsRecycleBinItem}">
662-
<TextBlock
663-
VerticalAlignment="Center"
664-
FontWeight="Light"
665-
Text="{x:Bind AsRecycleBinItem.ItemDateDeleted, Mode=OneWay}"
666-
TextTrimming="CharacterEllipsis" />
669+
<TextBlock Style="{StaticResource ColumnContentTextBlock}" Text="{x:Bind AsRecycleBinItem.ItemDateDeleted, Mode=OneWay}" />
667670
</Grid>
668671

669672
<Grid
@@ -691,11 +694,7 @@
691694
HorizontalAlignment="Stretch"
692695
VerticalAlignment="Center"
693696
Visibility="{Binding ColumnsViewModel.DateModifiedColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
694-
<TextBlock
695-
VerticalAlignment="Center"
696-
FontWeight="Light"
697-
Text="{x:Bind ItemDateModified, Mode=OneWay}"
698-
TextTrimming="CharacterEllipsis" />
697+
<TextBlock Style="{StaticResource ColumnContentTextBlock}" Text="{x:Bind ItemDateModified, Mode=OneWay}" />
699698
</Grid>
700699

701700
<Grid
@@ -706,11 +705,7 @@
706705
HorizontalAlignment="Stretch"
707706
VerticalAlignment="Center"
708707
Visibility="{Binding ColumnsViewModel.DateCreatedColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
709-
<TextBlock
710-
VerticalAlignment="Center"
711-
FontWeight="Light"
712-
Text="{x:Bind ItemDateCreated, Mode=OneWay}"
713-
TextTrimming="CharacterEllipsis" />
708+
<TextBlock Style="{StaticResource ColumnContentTextBlock}" Text="{x:Bind ItemDateCreated, Mode=OneWay}" />
714709
</Grid>
715710

716711
<Grid
@@ -721,11 +716,7 @@
721716
HorizontalAlignment="Stretch"
722717
VerticalAlignment="Center"
723718
Visibility="{Binding ColumnsViewModel.ItemTypeColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
724-
<TextBlock
725-
VerticalAlignment="Center"
726-
FontWeight="Light"
727-
Text="{x:Bind ItemType, Mode=OneWay}"
728-
TextTrimming="CharacterEllipsis" />
719+
<TextBlock Style="{StaticResource ColumnContentTextBlock}" Text="{x:Bind ItemType, Mode=OneWay}" />
729720
</Grid>
730721

731722
<Grid
@@ -736,11 +727,7 @@
736727
HorizontalAlignment="Stretch"
737728
VerticalAlignment="Center"
738729
Visibility="{Binding ColumnsViewModel.SizeColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
739-
<TextBlock
740-
VerticalAlignment="Center"
741-
FontWeight="Light"
742-
Text="{x:Bind FileSize, Mode=OneWay}"
743-
TextTrimming="CharacterEllipsis" />
730+
<TextBlock Style="{StaticResource ColumnContentTextBlock}" Text="{x:Bind FileSize, Mode=OneWay}" />
744731
</Grid>
745732
</Grid>
746733
</DataTemplate>
@@ -815,18 +802,27 @@
815802
VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
816803
ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
817804
<Grid>
805+
<Grid.RowDefinitions>
806+
<RowDefinition Height="*" />
807+
<RowDefinition Height="Auto" />
808+
</Grid.RowDefinitions>
818809
<Grid.ColumnDefinitions>
819810
<ColumnDefinition Width="Auto" />
820811
<ColumnDefinition Width="*" MinWidth="24" />
821812
</Grid.ColumnDefinitions>
822813
<ItemsPresenter
823814
Padding="{TemplateBinding Padding}"
824815
HorizontalAlignment="Stretch"
825-
Footer="{TemplateBinding Footer}"
826816
FooterTemplate="{TemplateBinding FooterTemplate}"
827817
FooterTransitions="{TemplateBinding FooterTransitions}"
828818
HeaderTemplate="{TemplateBinding HeaderTemplate}"
829819
HeaderTransitions="{TemplateBinding HeaderTransitions}" />
820+
821+
<ContentPresenter
822+
Grid.Row="1"
823+
Grid.ColumnSpan="2"
824+
Padding="8,0,8,8"
825+
Content="{TemplateBinding Footer}" />
830826
</Grid>
831827
</ScrollViewer>
832828
</Grid>

‎Files/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
401401
private void RenameTextBox_LostFocus(object sender, RoutedEventArgs e)
402402
{
403403
// This check allows the user to use the text box context menu without ending the rename
404-
if (!(FocusManager.GetFocusedElement() is AppBarButton))
404+
if (!(FocusManager.GetFocusedElement() is AppBarButton or Popup))
405405
{
406406
TextBox textBox = e.OriginalSource as TextBox;
407407
CommitRename(textBox);

0 commit comments

Comments
 (0)