Skip to content

Commit 295bdad

Browse files
gave92gave92
authored
Fix for issues #7412, #7396 (#7423)
1 parent 1852a61 commit 295bdad

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎src/Files/Extensions/DateTimeExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static (string text, string range, string glyph, int index) GetFriendlyTi
9999

100100
if (t.AddMonths(-1).Year == t2.Year && t.AddMonths(-1).Month == t2.Month)
101101
{
102-
return ("ItemTimeText_LastMonth".GetLocalized(), t.Subtract(TimeSpan.FromDays(t.Day - 1 + calendar.GetDaysInMonth(t.Year, t.Month - 1))).ToUserDateString(), "\ue163", 5);
102+
return ("ItemTimeText_LastMonth".GetLocalized(), t.Subtract(TimeSpan.FromDays(t.Day - 1 + calendar.GetDaysInMonth(t.AddMonths(-1).Year, t.AddMonths(-1).Month))).ToUserDateString(), "\ue163", 5);
103103
}
104104

105105
if (t.Year == t2.Year)

‎src/Files/ViewModels/NavToolbarViewModel.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,123 +92,123 @@ public bool IsSortedDescending
9292
public bool IsSortedByName
9393
{
9494
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.Name;
95-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.Name; }
95+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.Name; OnPropertyChanged(); }
9696
}
9797

9898
public bool IsSortedByDateModified
9999
{
100100
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.DateModified;
101-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.DateModified; }
101+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.DateModified; OnPropertyChanged(); }
102102
}
103103

104104
public bool IsSortedByDateCreated
105105
{
106106
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.DateCreated;
107-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.DateCreated; }
107+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.DateCreated; OnPropertyChanged(); }
108108
}
109109

110110
public bool IsSortedBySize
111111
{
112112
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.Size;
113-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.Size; }
113+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.Size; OnPropertyChanged(); }
114114
}
115115

116116
public bool IsSortedByType
117117
{
118118
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.FileType;
119-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.FileType; }
119+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.FileType; OnPropertyChanged(); }
120120
}
121121

122122
public bool IsSortedBySyncStatus
123123
{
124124
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.SyncStatus;
125-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.SyncStatus; }
125+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.SyncStatus; OnPropertyChanged(); }
126126
}
127127

128128
public bool IsSortedByOriginalFolder
129129
{
130130
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.OriginalFolder;
131-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.OriginalFolder; }
131+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.OriginalFolder; OnPropertyChanged(); }
132132
}
133133

134134
public bool IsSortedByDateDeleted
135135
{
136136
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.DateDeleted;
137-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.DateDeleted; }
137+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.DateDeleted; OnPropertyChanged(); }
138138
}
139139

140140
public bool IsSortedByFileTag
141141
{
142142
get => InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.FileTag;
143-
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.FileTag; }
143+
set { if (value) InstanceViewModel.FolderSettings.DirectorySortOption = SortOption.FileTag; OnPropertyChanged(); }
144144
}
145145

146146
// Group by
147147

148148
public bool IsGroupedByNone
149149
{
150150
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.None;
151-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.None; }
151+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.None; OnPropertyChanged(); }
152152
}
153153

154154
public bool IsGroupedByName
155155
{
156156
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.Name;
157-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.Name; }
157+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.Name; OnPropertyChanged(); }
158158
}
159159

160160
public bool IsGroupedByDateModified
161161
{
162162
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.DateModified;
163-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.DateModified; }
163+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.DateModified; OnPropertyChanged(); }
164164
}
165165

166166
public bool IsGroupedByDateCreated
167167
{
168168
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.DateCreated;
169-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.DateCreated; }
169+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.DateCreated; OnPropertyChanged(); }
170170
}
171171

172172
public bool IsGroupedBySize
173173
{
174174
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.Size;
175-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.Size; }
175+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.Size; OnPropertyChanged(); }
176176
}
177177

178178
public bool IsGroupedByType
179179
{
180180
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.FileType;
181-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.FileType; }
181+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.FileType; OnPropertyChanged(); }
182182
}
183183

184184
public bool IsGroupedBySyncStatus
185185
{
186186
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.SyncStatus;
187-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.SyncStatus; }
187+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.SyncStatus; OnPropertyChanged(); }
188188
}
189189

190190
public bool IsGroupedByOriginalFolder
191191
{
192192
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.OriginalFolder;
193-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.OriginalFolder; }
193+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.OriginalFolder; OnPropertyChanged(); }
194194
}
195195

196196
public bool IsGroupedByDateDeleted
197197
{
198198
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.DateDeleted;
199-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.DateDeleted; }
199+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.DateDeleted; OnPropertyChanged(); }
200200
}
201201

202202
public bool IsGroupedByFileTag
203203
{
204204
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.FileTag;
205-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.FileTag; }
205+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.FileTag; OnPropertyChanged(); }
206206
}
207207

208208
public bool IsGroupedByFolderPath
209209
{
210210
get => InstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.FolderPath;
211-
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.FolderPath; }
211+
set { if (value) InstanceViewModel.FolderSettings.DirectoryGroupOption = GroupOption.FolderPath; OnPropertyChanged(); }
212212
}
213213

214214
private bool canCopyPathInPage;

0 commit comments

Comments
 (0)