Skip to content

Commit 03fe656

Browse files
gave92gave92
committed
Merge remote-tracking branch 'origin/main' into remove_cache
2 parents c2fbcd2 + f023745 commit 03fe656

File tree

98 files changed

+2534
-1477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2534
-1477
lines changed

‎Files.Launcher/Files.Launcher.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
<Version>13.0.1</Version>
151151
</PackageReference>
152152
<PackageReference Include="NLog">
153-
<Version>4.7.9</Version>
153+
<Version>4.7.10</Version>
154154
</PackageReference>
155155
<PackageReference Include="System.Runtime.WindowsRuntime">
156156
<Version>4.7.0</Version>

‎Files.Launcher/Win32API.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public static (string icon, string overlay, bool isCustom) GetFileIconAndOverlay
136136
return (iconStr, null, false);
137137
}
138138

139-
bool isCustom = !shfi.szDisplayName.StartsWith(Environment.GetFolderPath(Environment.SpecialFolder.Windows));
139+
bool isCustom = true;
140140
User32.DestroyIcon(shfi.hIcon);
141141
Shell32.SHGetImageList(Shell32.SHIL.SHIL_LARGE, typeof(ComCtl32.IImageList).GUID, out var tmp);
142142
using var imageList = ComCtl32.SafeHIMAGELIST.FromIImageList(tmp);

‎Files/App.xaml

+34-50
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,7 @@
3737
<SolidColorBrush x:Key="CloudDriveSyncStatusOnlineColor" Color="#0078D7" />
3838
<SolidColorBrush x:Key="CloudDriveSyncStatusOfflineColor" Color="#30BB03" />
3939
<SolidColorBrush x:Key="CloudDriveSyncStatusExcludedColor" Color="#AAAAAA" />
40-
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="White" />
41-
<SolidColorBrush x:Key="SystemControlPageBackgroundMediumAltMediumBrush" Color="#99000000" />
4240
<Color x:Key="SolidBackgroundAcrylic">#FFFFFF</Color>
43-
<Color x:Key="ControlStrokeColorDefault">#0F000000</Color>
44-
<Color x:Key="ControlStrokeColorSecondary">#29000000</Color>
45-
<SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="#B3FFFFFF" />
46-
<SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="#80F9F9F9" />
47-
<SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="#4DF9F9F9" />
48-
<SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="#4DF9F9F9" />
49-
<SolidColorBrush x:Key="ControlFillColorTransparentBrush" Color="#00FFFFFF" />
50-
<SolidColorBrush x:Key="ControlFillColorInputActiveBrush" Color="#FFFFFF" />
51-
<SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
52-
<SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
53-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="#0F000000" />
54-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="#29000000" />
55-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="#37000000" />
56-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="#0F000000" />
5741
<!-- Corner Radius -->
5842
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
5943
<CornerRadius x:Key="OverlayCornerRadius">8</CornerRadius>
@@ -64,28 +48,22 @@
6448
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
6549
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
6650
<SolidColorBrush x:Key="TabSeparatorBorderBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
51+
<!-- Navigation Toolbar -->
52+
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
53+
<!-- Horizontal Tab Control -->
54+
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
55+
<!-- PaneHolderPage -->
56+
<SolidColorBrush x:Key="PaneHolderPageBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
57+
<!-- Status Bar Control -->
58+
<SolidColorBrush x:Key="StatusBarBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
59+
<!-- File Browser Control -->
60+
<SolidColorBrush x:Key="FileBrowserBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
6761
</ResourceDictionary>
6862
<ResourceDictionary x:Key="Dark">
6963
<SolidColorBrush x:Key="CloudDriveSyncStatusOnlineColor" Color="#0078D7" />
7064
<SolidColorBrush x:Key="CloudDriveSyncStatusOfflineColor" Color="#30BB03" />
7165
<SolidColorBrush x:Key="CloudDriveSyncStatusExcludedColor" Color="#AAAAAA" />
72-
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#201F1E" />
73-
<SolidColorBrush x:Key="SystemControlPageBackgroundMediumAltMediumBrush" Color="#99000000" />
7466
<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
75-
<Color x:Key="ControlStrokeColorDefault">#33000000</Color>
76-
<Color x:Key="ControlStrokeColorSecondary">#73000000</Color>
77-
<SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="#0FFFFFFF" />
78-
<SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="#15FFFFFF" />
79-
<SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="#0BFFFFFF" />
80-
<SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="#0BFFFFFF" />
81-
<SolidColorBrush x:Key="ControlFillColorTransparentBrush" Color="#00FFFFFF" />
82-
<SolidColorBrush x:Key="ControlFillColorInputActiveBrush" Color="#15FFFFFF" />
83-
<SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
84-
<SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
85-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="#33000000" />
86-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="#73000000" />
87-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="#37000000" />
88-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="#33000000" />
8967
<!-- Corner Radius -->
9068
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
9169
<CornerRadius x:Key="OverlayCornerRadius">8</CornerRadius>
@@ -96,26 +74,22 @@
9674
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
9775
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
9876
<SolidColorBrush x:Key="TabSeparatorBorderBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
77+
<!-- Navigation Toolbar -->
78+
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
79+
<!-- Horizontal Tab Control -->
80+
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
81+
<!-- PaneHolderPage -->
82+
<SolidColorBrush x:Key="PaneHolderPageBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
83+
<!-- Status Bar Control -->
84+
<SolidColorBrush x:Key="StatusBarBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
85+
<!-- File Browser Control -->
86+
<SolidColorBrush x:Key="FileBrowserBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
9987
</ResourceDictionary>
10088
<ResourceDictionary x:Key="HighContrast">
10189
<SolidColorBrush x:Key="CloudDriveSyncStatusOnlineColor" Color="#0078D7" />
10290
<SolidColorBrush x:Key="CloudDriveSyncStatusOfflineColor" Color="#30BB03" />
10391
<SolidColorBrush x:Key="CloudDriveSyncStatusExcludedColor" Color="#AAAAAA" />
104-
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="{ThemeResource SystemColorWindowColor}" />
105-
<SolidColorBrush x:Key="SystemControlPageBackgroundMediumAltMediumBrush" Color="{ThemeResource SystemColorWindowColor}" />
106-
<SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
107-
<SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
108-
<SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
109-
<SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
110-
<SolidColorBrush x:Key="ControlFillColorTransparentBrush" Color="#00FFFFFF" />
111-
<SolidColorBrush x:Key="ControlFillColorInputActiveBrush" Color="{StaticResource SystemColorControlAccentColor}" />
112-
113-
<SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource SystemColorWindowTextColor}" />
114-
<SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource SystemColorWindowTextColor}" />
115-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="{StaticResource SystemColorWindowTextColor}" />
116-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="{StaticResource SystemColorWindowTextColor}" />
117-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="{StaticResource SystemColorWindowTextColor}" />
118-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="{StaticResource SystemColorWindowTextColor}" />
92+
<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
11993
<!-- Corner Radius -->
12094
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
12195
<CornerRadius x:Key="OverlayCornerRadius">8</CornerRadius>
@@ -126,6 +100,16 @@
126100
<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
127101
<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
128102
<SolidColorBrush x:Key="TabSeparatorBorderBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
103+
<!-- Navigation Toolbar -->
104+
<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
105+
<!-- Horizontal Tab Control -->
106+
<SolidColorBrush x:Key="HorizontalTabControlBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
107+
<!-- PaneHolderPage -->
108+
<SolidColorBrush x:Key="PaneHolderPageBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
109+
<!-- Status Bar Control -->
110+
<SolidColorBrush x:Key="StatusBarBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
111+
<!-- File Browser Control -->
112+
<SolidColorBrush x:Key="FileBrowserBackgroundBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
129113
</ResourceDictionary>
130114
</ResourceDictionary.ThemeDictionaries>
131115
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
@@ -138,10 +122,10 @@
138122
</LinearGradientBrush.GradientStops>
139123
</LinearGradientBrush>
140124

141-
<x:Double x:Key="SidebarIconSize">20</x:Double>
142-
<Thickness x:Key="NavigationViewContentPresenterMargin">0,0,0,0</Thickness>
125+
<x:Double x:Key="SidebarIconSize">20</x:Double>
126+
<Thickness x:Key="NavigationViewContentPresenterMargin">0,0,0,0</Thickness>
143127

144-
<!-- WinUI style is breaking us, overriding with a modified version solves crashes in release -->
128+
<!-- WinUI style is breaking us, overriding with a modified version solves crashes in release -->
145129
<Style x:Key="MUX_NavigationViewItemPresenterStyleWhenOnLeftPane" TargetType="primitives:NavigationViewItemPresenter">
146130
<Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
147131
<Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />

‎Files/Assets/FluentIcons/CloudDrive.png

18.6 KB
Loading

‎Files/Assets/FluentIcons/Home.png

32.2 KB
Loading

‎Files/BaseLayout.cs

+42-4
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ public abstract class BaseLayout : Page, IBaseLayout, INotifyPropertyChanged
7070
public CollectionViewSource CollectionViewSource
7171
{
7272
get => collectionViewSource;
73-
set {
74-
if(collectionViewSource != value)
73+
set
74+
{
75+
if (collectionViewSource != value)
7576
{
7677
collectionViewSource = value;
7778
NotifyPropertyChanged(nameof(CollectionViewSource));
@@ -218,6 +219,7 @@ public BaseLayout()
218219
{
219220
ItemManipulationModel = new ItemManipulationModel();
220221

222+
HookBaseEvents();
221223
HookEvents();
222224

223225
jumpTimer = new DispatcherTimer();
@@ -243,6 +245,16 @@ public BaseLayout()
243245

244246
protected abstract void UnhookEvents();
245247

248+
private void HookBaseEvents()
249+
{
250+
ItemManipulationModel.RefreshItemsOpacityInvoked += ItemManipulationModel_RefreshItemsOpacityInvoked;
251+
}
252+
253+
private void UnhookBaseEvents()
254+
{
255+
ItemManipulationModel.RefreshItemsOpacityInvoked -= ItemManipulationModel_RefreshItemsOpacityInvoked;
256+
}
257+
246258
public ItemManipulationModel ItemManipulationModel { get; private set; }
247259

248260
private void JumpTimer_Tick(object sender, object e)
@@ -253,7 +265,16 @@ private void JumpTimer_Tick(object sender, object e)
253265

254266
protected abstract void InitializeCommandsViewModel();
255267

256-
protected abstract IEnumerable GetAllItems();
268+
protected IEnumerable<ListedItem> GetAllItems()
269+
{
270+
if (CollectionViewSource.IsSourceGrouped)
271+
{
272+
// add all items from each group to the new list
273+
return (CollectionViewSource.Source as BulkConcurrentObservableCollection<GroupedCollection<ListedItem>>)?.SelectMany(g => g);
274+
}
275+
276+
return CollectionViewSource.Source as IEnumerable<ListedItem>;
277+
}
257278

258279
public virtual void ResetItemOpacity()
259280
{
@@ -417,6 +438,7 @@ private async void FolderSettings_GroupOptionPreferenceUpdated(object sender, Ev
417438
protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
418439
{
419440
base.OnNavigatingFrom(e);
441+
420442
// Remove item jumping handler
421443
Window.Current.CoreWindow.CharacterReceived -= Page_CharacterReceived;
422444
FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
@@ -632,7 +654,8 @@ protected async void Item_DragOver(object sender, DragEventArgs e)
632654
if (InstanceViewModel.IsPageTypeSearchResults || draggedItems.Any(draggedItem => draggedItem.Path == item.ItemPath))
633655
{
634656
e.AcceptedOperation = DataPackageOperation.None;
635-
} else if(item.IsExecutable)
657+
}
658+
else if (item.IsExecutable)
636659
{
637660
e.DragUIOverride.Caption = $"{"OpenItemsWithCaptionText".GetLocalized()} {item.ItemName}";
638661
e.AcceptedOperation = DataPackageOperation.Link;
@@ -769,5 +792,20 @@ protected void RootPanel_PointerPressed(object sender, PointerRoutedEventArgs e)
769792
VisualStateManager.GoToState(element, "Pressed", true);
770793
}
771794
}
795+
796+
private void ItemManipulationModel_RefreshItemsOpacityInvoked(object sender, EventArgs e)
797+
{
798+
foreach (ListedItem listedItem in GetAllItems())
799+
{
800+
if (listedItem.IsHiddenItem)
801+
{
802+
listedItem.Opacity = Constants.UI.DimItemOpacity;
803+
}
804+
else
805+
{
806+
listedItem.Opacity = 1;
807+
}
808+
}
809+
}
772810
}
773811
}

0 commit comments

Comments
 (0)