Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f41b630e7e |
No files matched your search
@@ -35,8 +35,20 @@ numeric core and does not move; the heading is the full version — corrected 20
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Added
|
||||
|
||||
- **Filters on Games and Compare** (owner request 2026-11-06, decision D85). Games: store, engine, state, installed and
|
||||
played, beside the search and sort, with *Clear filters*; the title counts what is shown of all. Compare: game, tier
|
||||
and frame generation over every session (it listed the newest 200), with a count; a ticked session stays listed.
|
||||
|
||||
### Changed
|
||||
|
||||
- **The Compare page's layout** (the owner's screenshot): the selection bar beside the list instead of a window's width
|
||||
away, with *Clear selection*; columns sized to what they hold — *Tier* and *FPS* touched, and wide gaps split the rest —;
|
||||
the date sorts by when; the settings-changed column says so in words or shows a dash (it was blank); the result
|
||||
table's session labels sit over their columns.
|
||||
- **The selected page keeps its name in the left pane** (D86): WPF UI's pane animates the selected item's label away
|
||||
(Compare's, in the screenshot — every page's while selected); FrameLedger uses a copy of its template without that.
|
||||
- **Games opens at once from any page** (owner request 2026-11-06: switching to Games stalled 0.5–1.5 s). The window
|
||||
keeps the library page it built and shows it again on every later visit, reading the library again behind it; the
|
||||
library is read off the UI thread; the cards appear before the executables are checked — a USB drive that sleeps
|
||||
|
||||
+21
-1
@@ -1,6 +1,9 @@
|
||||
# 08 — UI
|
||||
|
||||
WPF + **WPF UI (Wpf.Ui, Fluent)**. Shell = `ui:FluentWindow` with custom `ui:TitleBar`, a thin classic **Menu bar** (file-level operations), and a left **`ui:NavigationView`** (`PaneDisplayMode="LeftFluent"`) as primary navigation. Light/Dark/System themes via `ApplicationThemeManager` + `SystemThemeWatcher`; Mica backdrop on Windows 11 with automatic solid fallback on Windows 10. All XAML follows `16_WPFUI_SYNTAX.md` — that doc is mandatory reading before writing views.
|
||||
WPF + **WPF UI (Wpf.Ui, Fluent)**. Shell = `ui:FluentWindow` with custom `ui:TitleBar`, a thin classic **Menu bar** (file-level operations), and a left **`ui:NavigationView`** (`PaneDisplayMode="LeftFluent"`) as primary navigation *(since beta.34, D86, its items use
|
||||
our copy of WPF UI 4.3.0's LeftFluent item template — `FlLeftFluentNavigationViewItemTemplate` in `Styles/FrameLedger.xaml` —
|
||||
whose only change is that the selected page keeps its label; WPF UI's animates it away, and the owner's screenshot of
|
||||
Compare showed the icon alone)*. Light/Dark/System themes via `ApplicationThemeManager` + `SystemThemeWatcher`; Mica backdrop on Windows 11 with automatic solid fallback on Windows 10. All XAML follows `16_WPFUI_SYNTAX.md` — that doc is mandatory reading before writing views.
|
||||
|
||||
## Shell
|
||||
|
||||
@@ -285,6 +288,13 @@ All screens are `Page`s registered with the navigation page provider and navigat
|
||||
|
||||
### Games (grid → detail)
|
||||
- `GridView`-style panel of cover cards (`ui:CardAction`): name, platform badge, engine badge, total playtime, last played, mini trend sparkline (avg Native FPS last 10 sessions). Sort/filter/`ui:AutoSuggestBox` search.
|
||||
> **The filters, beta.34 (owner request 2026-11-06, D85)** — specified here since P3 and never built: a row under the
|
||||
> search and sort with **Store**, **Engine** (the stores and engines the library holds, each list naming its
|
||||
> "everything" first; *Added by hand* for an entry with no store, *Engine not identified* for one with none),
|
||||
> **State** (the card's one state, as its pill says it), **Installed** and **Played**, and *Clear filters*. While a filter
|
||||
> or the search narrows the list the title counts what is shown of all (*Games · 12 of 65*). Kept while the App runs —
|
||||
> the page is the window's (`WindowPageCache`) — and not saved. Tests:
|
||||
> `GamesViewModelTests.TheFiltersNarrowTheLibraryAndTheHeaderCountsWhatIsShown`.
|
||||
> **The library, beta.11 (owner requests 2026-10-03).** *The empty band on the right:* the cards were 300 px in a plain
|
||||
> `WrapPanel`, so at ~1350 px three fitted and a card's width was left unused; the grid is now
|
||||
> `Controls.UniformWrapPanel` — as many columns as fit at 300 px or wider, every card an equal share of the width, each row
|
||||
@@ -780,6 +790,16 @@ Stat cards (Avg uses `FpsReadout`, Median, 1% Low, 0.1% Low, Min/Max, σ, stutte
|
||||
|
||||
### Compare
|
||||
Session picker (2–5, cross-game allowed) → overlaid percentile curves + stat table with best-value highlighting; FG columns always show Native and Displayed separately. Export PNG.
|
||||
> **beta.34 (owner request 2026-11-06, with a screenshot; D85).** The list holds **every session** — it was the newest
|
||||
> 200, read on the UI thread with one game lookup each; now one read of the names, on the thread pool — and filters by
|
||||
> **Game**, **Tier** and **Frame generation** (with / without; a session that measured none is neither), with a count
|
||||
> (*6 of 131 sessions*); a ticked session stays listed whatever the filters say. The selection bar — *Pick 2 to 5
|
||||
> sessions*, the count, *Clear selection*, *Compare* — sits above the list on the left: it was a window's width away. The
|
||||
> columns are sized to what they hold with one filler column after them (three star columns spread a wide window into
|
||||
> gaps, and the Tier column was exactly its header's width, so *Tier* and *FPS* touched); the date sorts by when; the
|
||||
> settings-changed cell says *Changed mid-session* beside its icon, or a dash (it was blank). The result table's session
|
||||
> labels sit over their columns: the header row has the metric column's 140 px first, as every row does. Tests:
|
||||
> `CompareViewModelTests.TheFiltersNarrowTheListAndATickedSessionStaysOnIt`, the page in `PagesLoadTests`' surfaces.
|
||||
|
||||
**Mixed-tier guard (FR-6.2):** selecting sessions from different capture tiers shows a blocking `ContentDialog` explaining that they measured different things; proceeding stamps the chart with a tier legend and greys out metrics unavailable in the lower tier. Sessions with `settings_changed_midsession` carry a warning icon and are excluded from trend lines by default.
|
||||
|
||||
|
||||
@@ -468,6 +468,8 @@ Where each owner decision is recorded — the file and its section, and a label
|
||||
| D82 | [`HANDOFF.md`](HANDOFF.md) §START HERE | alpha.2 right after beta.33; on RC3 unless the train reaches it after .NET 11 ships (then SDK 11.0.100, packages 11.0.0) |
|
||||
| D83 | [`05_DETECTION.md`](05_DETECTION.md) §DLSS generation | the NVIDIA App's Dynamic frame generation, reported applied by the driver in a session that counted DLSS Frame Generation, is DLSS 4.5 (amends D64) |
|
||||
| D84 | [`05_DETECTION.md`](05_DETECTION.md) §DLSS generation | DLSS 5 heads the DLSS line where its neural rendering was measured running (`kFeatureDLSS_NR`, `dlss_nr_pct`); loaded only reads "runtime loaded" (amends D64) |
|
||||
| D85 | [`08_UI.md`](08_UI.md) §Games, §Compare | filters: Games — store, engine, state, installed, played; Compare — game, tier, frame generation (no period); Compare lists every session |
|
||||
| D86 | [`08_UI.md`](08_UI.md) (the shell) | the left pane's selected item keeps its label: our copy of WPF UI 4.3.0's LeftFluent item template |
|
||||
|
||||
---
|
||||
|
||||
|
||||
+5
-1
@@ -59,6 +59,9 @@ stopped, hooking turned off — each with one button that only says you have rea
|
||||
## Games
|
||||
|
||||
- **Search games**; sort by **Name**, **Last played** or **Playtime**; **Show as a list** or **Show as a grid**.
|
||||
- **Filters** (since 0.1.0-beta.34): by **store**, **engine**, **state** (Hooking on, Hooking off, Anti-cheat, Exception,
|
||||
Not recorded), **installed** and **played**; the title then says how many of your games are shown. **Clear filters**
|
||||
shows them all again.
|
||||
- **Refresh** reads your library again: it offers games newly installed through a store, and marks a game whose `.exe`
|
||||
is gone as *Not installed*. The agent removes such a game by itself after ten minutes when it has no sessions and its
|
||||
drive is connected — never one where anti-cheat was found (**Settings ▸ Data ▸ Remove uninstalled games** turns this
|
||||
@@ -108,7 +111,8 @@ It opens from a session row, from the Dashboard, and from the notice when a sess
|
||||
|
||||
Tick **2 to 5 sessions**, from any of your games, and press **Compare**: one frame-rate curve per measured session, and
|
||||
a table with the best value of each row in bold. Comparing a measured session with an unmeasured one asks first,
|
||||
because they measured different things.
|
||||
because they measured different things. The list holds every session; narrow it by **game**, **tier** (measured or
|
||||
not) and **frame generation** — a session you ticked stays in the list. **Clear selection** unticks them all.
|
||||
|
||||
## Logs
|
||||
|
||||
|
||||
@@ -163,10 +163,12 @@
|
||||
</ItemsControl>
|
||||
</StackPanel>
|
||||
|
||||
<!-- beta.34 (D86): our copy of WPF UI's LeftFluent item template, so the selected page keeps its label (Styles/FrameLedger.xaml). -->
|
||||
<ui:NavigationView x:Name="RootNavigation"
|
||||
Grid.Row="3"
|
||||
IsBackButtonVisible="Collapsed"
|
||||
IsPaneToggleVisible="False"
|
||||
ItemTemplate="{StaticResource FlLeftFluentNavigationViewItemTemplate}"
|
||||
PaneDisplayMode="LeftFluent">
|
||||
<ui:NavigationView.MenuItems>
|
||||
<ui:NavigationViewItem Content="{x:Static res:Strings.Nav_Dashboard}"
|
||||
|
||||
@@ -18,18 +18,44 @@
|
||||
<ui:TextBlock Margin="0,16,0,0" Style="{StaticResource SecondaryText}" TextWrapping="Wrap" Text="{x:Static vm:CompareViewModel.EmptyText}"
|
||||
Visibility="{Binding ViewModel.IsEmpty, Converter={StaticResource BoolToVis}}" />
|
||||
|
||||
<Grid Margin="0,16,0,0" Visibility="{Binding ViewModel.IsEmpty, Converter={StaticResource InverseBoolToVis}}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<ui:TextBlock Grid.Column="0" FontTypography="Subtitle" Text="{x:Static vm:CompareViewModel.PickHeader}" />
|
||||
<ui:TextBlock Grid.Column="1" Margin="0,0,16,0" VerticalAlignment="Center" Style="{StaticResource SecondaryText}" Text="{Binding ViewModel.SelectedText}" />
|
||||
<ui:Button Grid.Column="2" Appearance="Primary" Command="{Binding ViewModel.CompareCommand}" IsEnabled="{Binding ViewModel.CanCompare}"
|
||||
Content="{x:Static vm:CompareViewModel.RunText}" Icon="{ui:SymbolIcon ArrowSwap24}" />
|
||||
</Grid>
|
||||
<!-- beta.34 (owner request 2026-11-06, D85): the filters - game, tier, frame generation - over every session, and how
|
||||
many the list holds; a ticked session stays listed whatever they say. -->
|
||||
<WrapPanel Margin="0,16,0,0" Orientation="Horizontal"
|
||||
Visibility="{Binding ViewModel.IsEmpty, Converter={StaticResource InverseBoolToVis}}">
|
||||
<ComboBox MinWidth="220" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Compare_Filter_Game}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.Games}"
|
||||
SelectedValue="{Binding ViewModel.GameFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ComboBox MinWidth="180" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Compare_Filter_Tier}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.Tiers}"
|
||||
SelectedValue="{Binding ViewModel.TierFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ComboBox MinWidth="240" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Compare_Filter_Fg}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.FrameGenerationChoices}"
|
||||
SelectedValue="{Binding ViewModel.FrameGenerationFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ui:Button Margin="0,0,16,8" VerticalAlignment="Center" Appearance="Secondary"
|
||||
Command="{Binding ViewModel.ClearFiltersCommand}"
|
||||
Content="{x:Static vm:CompareViewModel.ClearFiltersText}" Icon="{ui:SymbolIcon FilterDismiss24}" />
|
||||
<ui:TextBlock Margin="0,0,0,8" VerticalAlignment="Center" Style="{StaticResource SecondaryText}" Text="{Binding ViewModel.CountText}" />
|
||||
</WrapPanel>
|
||||
|
||||
<!-- beta.34: the selection bar beside what it acts on - it sat at the window's far right, a full width away from the list. -->
|
||||
<StackPanel Margin="0,8,0,0" Orientation="Horizontal"
|
||||
Visibility="{Binding ViewModel.IsEmpty, Converter={StaticResource InverseBoolToVis}}">
|
||||
<ui:TextBlock Margin="0,0,16,0" VerticalAlignment="Center" FontTypography="Subtitle" Text="{x:Static vm:CompareViewModel.PickHeader}" />
|
||||
<ui:TextBlock Margin="0,0,16,0" VerticalAlignment="Center" Style="{StaticResource SecondaryText}" Text="{Binding ViewModel.SelectedText}" />
|
||||
<ui:Button Margin="0,0,8,0" Appearance="Secondary" Command="{Binding ViewModel.ClearSelectionCommand}"
|
||||
Content="{x:Static vm:CompareViewModel.ClearSelectionText}" />
|
||||
<ui:Button Appearance="Primary" Command="{Binding ViewModel.CompareCommand}" IsEnabled="{Binding ViewModel.CanCompare}"
|
||||
Content="{x:Static vm:CompareViewModel.RunText}" Icon="{ui:SymbolIcon ArrowSwap24}" />
|
||||
</StackPanel>
|
||||
|
||||
<!--
|
||||
beta.34: columns sized to what they hold, and one filler column after them - three star columns spread a wide
|
||||
window into gaps, and the Tier column was exactly its header's width, so "Tier" and "FPS" touched. The date sorts
|
||||
by when, not by its text; the settings-changed cell says so in words, or shows a dash.
|
||||
-->
|
||||
<DataGrid Margin="0,8,0,0" MaxHeight="320" AutoGenerateColumns="False" CanUserAddRows="False" HeadersVisibility="Column"
|
||||
ItemsSource="{Binding ViewModel.Candidates}" SelectionMode="Single"
|
||||
Visibility="{Binding ViewModel.IsEmpty, Converter={StaticResource InverseBoolToVis}}">
|
||||
@@ -44,18 +70,23 @@
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Game}" Binding="{Binding GameName}" IsReadOnly="True" Width="2*" />
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Date}" Binding="{Binding DateText}" IsReadOnly="True" Width="*" />
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Tier}" Binding="{Binding TierText}" IsReadOnly="True" Width="Auto" />
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Fps}" Binding="{Binding ReadoutLine}" IsReadOnly="True" Width="2*" />
|
||||
<DataGridTemplateColumn Header="{x:Static res:Strings.Compare_Col_MidSession}" IsReadOnly="True">
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Game}" Binding="{Binding GameName}" IsReadOnly="True" Width="Auto" MinWidth="220" />
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Date}" Binding="{Binding DateText}" SortMemberPath="StartedAt" IsReadOnly="True" Width="Auto" MinWidth="150" />
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Tier}" Binding="{Binding TierText}" IsReadOnly="True" Width="Auto" MinWidth="64" />
|
||||
<DataGridTextColumn Header="{x:Static res:Strings.Compare_Col_Fps}" Binding="{Binding ReadoutLine}" IsReadOnly="True" Width="Auto" MinWidth="220" />
|
||||
<DataGridTemplateColumn Header="{x:Static res:Strings.Compare_Col_MidSession}" IsReadOnly="True" Width="Auto" MinWidth="150" SortMemberPath="SettingsChangedMidSession">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate DataType="{x:Type vm:CompareCandidateViewModel}">
|
||||
<ui:SymbolIcon Symbol="Warning24" Foreground="{DynamicResource SystemFillColorCautionBrush}"
|
||||
Visibility="{Binding SettingsChangedMidSession, Converter={StaticResource BoolToVis}}" />
|
||||
<StackPanel Margin="4,0" Orientation="Horizontal" VerticalAlignment="Center">
|
||||
<ui:SymbolIcon Margin="0,0,6,0" Symbol="Warning24" Foreground="{DynamicResource SystemFillColorCautionBrush}"
|
||||
Visibility="{Binding SettingsChangedMidSession, Converter={StaticResource BoolToVis}}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding SettingsChangedText}" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!-- the filler: the width the columns above do not need, so they stay together on a wide window -->
|
||||
<DataGridTemplateColumn Width="*" CanUserSort="False" CanUserResize="False" IsReadOnly="True" />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
@@ -75,19 +106,25 @@
|
||||
<charts:CompareChart x:Name="Chart" Margin="0,6,0,0" Height="340" />
|
||||
|
||||
<ui:TextBlock Margin="0,16,0,0" FontTypography="Subtitle" Text="{x:Static vm:CompareViewModel.TableHeader}" />
|
||||
<!-- the header row: one label per compared session -->
|
||||
<ItemsControl Margin="0,6,0,0" ItemsSource="{Binding ViewModel.Compared}">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<UniformGrid Rows="1" />
|
||||
</ItemsPanelTemplate>
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="{x:Type vm:CompareCandidateViewModel}">
|
||||
<ui:TextBlock Margin="4,0" Style="{StaticResource SecondaryText}" FontTypography="Caption" TextWrapping="Wrap" Text="{Binding Label}" />
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
<!-- the header row: the metric column's own header, then one label per compared session - laid out as every row
|
||||
below is (a 140-px metric cell, then the sessions sharing the rest), so each label sits over its column;
|
||||
beta.34: it spread over the whole width, the 140 px included, and drifted left of its values. -->
|
||||
<DockPanel Margin="0,6,0,0">
|
||||
<ui:TextBlock DockPanel.Dock="Left" Width="140" Style="{StaticResource SecondaryText}" FontTypography="Caption"
|
||||
Text="{x:Static vm:CompareViewModel.MetricHeader}" />
|
||||
<ItemsControl ItemsSource="{Binding ViewModel.Compared}">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<UniformGrid Rows="1" />
|
||||
</ItemsPanelTemplate>
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="{x:Type vm:CompareCandidateViewModel}">
|
||||
<ui:TextBlock Margin="4,0" Style="{StaticResource SecondaryText}" FontTypography="Caption" TextWrapping="Wrap" Text="{Binding Label}" />
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</DockPanel>
|
||||
<ItemsControl ItemsSource="{Binding ViewModel.Rows}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate DataType="{x:Type vm:CompareRowViewModel}">
|
||||
|
||||
@@ -62,6 +62,36 @@
|
||||
Icon="{ui:SymbolIcon Add24}" />
|
||||
</Grid>
|
||||
|
||||
<!-- beta.34 (owner request 2026-11-06, D85): the filters - store, engine, state, installed, played - beside the search
|
||||
and sort above; each list names its "everything" first, and the stores and engines are the library's own. -->
|
||||
<WrapPanel Margin="0,12,0,0" Orientation="Horizontal"
|
||||
Visibility="{Binding ViewModel.IsEmpty, Converter={StaticResource InverseBoolToVis}}">
|
||||
<ComboBox MinWidth="150" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Games_Filter_Store}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.Stores}"
|
||||
SelectedValue="{Binding ViewModel.StoreFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ComboBox MinWidth="170" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Games_Filter_Engine}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.Engines}"
|
||||
SelectedValue="{Binding ViewModel.EngineFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ComboBox MinWidth="150" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Games_Filter_State}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.States}"
|
||||
SelectedValue="{Binding ViewModel.StateFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ComboBox MinWidth="150" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Games_Filter_Installed}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.InstalledChoices}"
|
||||
SelectedValue="{Binding ViewModel.InstalledFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ComboBox MinWidth="150" Margin="0,0,8,8" VerticalAlignment="Center"
|
||||
AutomationProperties.Name="{x:Static res:Strings.A11y_Games_Filter_Played}"
|
||||
DisplayMemberPath="Label" ItemsSource="{Binding ViewModel.PlayedChoices}"
|
||||
SelectedValue="{Binding ViewModel.PlayedFilter, Mode=TwoWay}" SelectedValuePath="Value" />
|
||||
<ui:Button Margin="0,0,0,8" VerticalAlignment="Center" Appearance="Secondary"
|
||||
Command="{Binding ViewModel.ClearFiltersCommand}"
|
||||
Content="{x:Static vm:GamesViewModel.ClearFiltersText}"
|
||||
Icon="{ui:SymbolIcon FilterDismiss24}" />
|
||||
</WrapPanel>
|
||||
|
||||
<ui:TextBlock Margin="0,16,0,0" Style="{StaticResource SecondaryText}" TextWrapping="Wrap"
|
||||
Text="{x:Static vm:GamesViewModel.EmptyText}"
|
||||
Visibility="{Binding ViewModel.IsEmpty, Converter={StaticResource BoolToVis}}" />
|
||||
|
||||
@@ -108,14 +108,9 @@ public sealed class GameLibrary
|
||||
return [];
|
||||
}
|
||||
|
||||
var names = new Dictionary<long, string>();
|
||||
foreach (long gameId in rows.Select(static r => r.GameId).Distinct())
|
||||
{
|
||||
GameRow? game = await _games.FindByIdAsync(gameId, ct).ConfigureAwait(false);
|
||||
names[gameId] = game?.Name ?? Strings.Common_NotAvailable;
|
||||
}
|
||||
|
||||
return [.. rows.Select(r => new RecentSession(r, names[r.GameId]))];
|
||||
// One read of the library's names (beta.34): Compare now lists every session, and a read per game was a query each.
|
||||
Dictionary<long, string> names = (await _games.ListAsync(ct).ConfigureAwait(false)).ToDictionary(static g => g.Id, static g => g.Name);
|
||||
return [.. rows.Select(r => new RecentSession(r, names.GetValueOrDefault(r.GameId) ?? Strings.Common_NotAvailable))];
|
||||
}
|
||||
|
||||
public async Task<LibraryTotals> TotalsAsync(CancellationToken ct = default)
|
||||
|
||||
Generated
+90
@@ -29,6 +29,14 @@ public static class Strings
|
||||
/// <summary>Every key, for an audit that walks them.</summary>
|
||||
public static IReadOnlyList<string> Keys { get; } =
|
||||
[
|
||||
nameof(A11y_Compare_Filter_Fg),
|
||||
nameof(A11y_Compare_Filter_Game),
|
||||
nameof(A11y_Compare_Filter_Tier),
|
||||
nameof(A11y_Games_Filter_Engine),
|
||||
nameof(A11y_Games_Filter_Installed),
|
||||
nameof(A11y_Games_Filter_Played),
|
||||
nameof(A11y_Games_Filter_State),
|
||||
nameof(A11y_Games_Filter_Store),
|
||||
nameof(A11y_Games_Sort),
|
||||
nameof(A11y_Logs_Level),
|
||||
nameof(A11y_Logs_Source),
|
||||
@@ -161,14 +169,24 @@ public static class Strings
|
||||
nameof(Common_NotAvailable),
|
||||
nameof(Common_Ok),
|
||||
nameof(Common_Yes),
|
||||
nameof(Compare_ClearSelection),
|
||||
nameof(Compare_Col_Date),
|
||||
nameof(Compare_Col_Fps),
|
||||
nameof(Compare_Col_Game),
|
||||
nameof(Compare_Col_MidSession),
|
||||
nameof(Compare_Col_Tier),
|
||||
nameof(Compare_Count_Filtered_Format),
|
||||
nameof(Compare_Count_Format),
|
||||
nameof(Compare_Curves_Header),
|
||||
nameof(Compare_Empty),
|
||||
nameof(Compare_Export_Png),
|
||||
nameof(Compare_Filter_Fg_All),
|
||||
nameof(Compare_Filter_Fg_With),
|
||||
nameof(Compare_Filter_Fg_Without),
|
||||
nameof(Compare_Filter_Game_All),
|
||||
nameof(Compare_Filter_Tier_All),
|
||||
nameof(Compare_Filter_Tier_Measured),
|
||||
nameof(Compare_Filter_Tier_NotMeasured),
|
||||
nameof(Compare_Header),
|
||||
nameof(Compare_Legend_Format),
|
||||
nameof(Compare_Metric_AvgCpuLoad),
|
||||
@@ -199,6 +217,7 @@ public static class Strings
|
||||
nameof(Compare_Metric_TimeBelowRefresh),
|
||||
nameof(Compare_Metric_Vsync),
|
||||
nameof(Compare_Metric_Window),
|
||||
nameof(Compare_MidSession_Changed),
|
||||
nameof(Compare_Mixed_Body),
|
||||
nameof(Compare_Mixed_Legend),
|
||||
nameof(Compare_Mixed_Proceed),
|
||||
@@ -431,6 +450,7 @@ public static class Strings
|
||||
nameof(FgMix_State_Format),
|
||||
nameof(FgMix_Unclassified),
|
||||
nameof(FgMix_Unclassified_Note),
|
||||
nameof(Filter_Clear),
|
||||
nameof(FirstRun_Accept),
|
||||
nameof(FirstRun_Agent_Body),
|
||||
nameof(FirstRun_Agent_Header),
|
||||
@@ -583,8 +603,18 @@ public static class Strings
|
||||
nameof(Games_Card_Playtime_Format),
|
||||
nameof(Games_Card_Sessions_Format),
|
||||
nameof(Games_Empty),
|
||||
nameof(Games_Filter_Engine_All),
|
||||
nameof(Games_Filter_Engine_Unknown),
|
||||
nameof(Games_Filter_Installed_All),
|
||||
nameof(Games_Filter_Installed_Yes),
|
||||
nameof(Games_Filter_Played_All),
|
||||
nameof(Games_Filter_Played_Yes),
|
||||
nameof(Games_Filter_State_All),
|
||||
nameof(Games_Filter_Store_All),
|
||||
nameof(Games_Filter_Store_Manual),
|
||||
nameof(Games_Header),
|
||||
nameof(Games_Header_Count_Format),
|
||||
nameof(Games_Header_Filtered_Format),
|
||||
nameof(Games_List_Engine),
|
||||
nameof(Games_List_LastPlayed),
|
||||
nameof(Games_List_Name),
|
||||
@@ -1197,6 +1227,22 @@ public static class Strings
|
||||
nameof(Viewer_ChangesThisPc_Off),
|
||||
];
|
||||
|
||||
public static string A11y_Compare_Filter_Fg => ResourceManager.GetString(nameof(A11y_Compare_Filter_Fg), Culture) ?? nameof(A11y_Compare_Filter_Fg);
|
||||
|
||||
public static string A11y_Compare_Filter_Game => ResourceManager.GetString(nameof(A11y_Compare_Filter_Game), Culture) ?? nameof(A11y_Compare_Filter_Game);
|
||||
|
||||
public static string A11y_Compare_Filter_Tier => ResourceManager.GetString(nameof(A11y_Compare_Filter_Tier), Culture) ?? nameof(A11y_Compare_Filter_Tier);
|
||||
|
||||
public static string A11y_Games_Filter_Engine => ResourceManager.GetString(nameof(A11y_Games_Filter_Engine), Culture) ?? nameof(A11y_Games_Filter_Engine);
|
||||
|
||||
public static string A11y_Games_Filter_Installed => ResourceManager.GetString(nameof(A11y_Games_Filter_Installed), Culture) ?? nameof(A11y_Games_Filter_Installed);
|
||||
|
||||
public static string A11y_Games_Filter_Played => ResourceManager.GetString(nameof(A11y_Games_Filter_Played), Culture) ?? nameof(A11y_Games_Filter_Played);
|
||||
|
||||
public static string A11y_Games_Filter_State => ResourceManager.GetString(nameof(A11y_Games_Filter_State), Culture) ?? nameof(A11y_Games_Filter_State);
|
||||
|
||||
public static string A11y_Games_Filter_Store => ResourceManager.GetString(nameof(A11y_Games_Filter_Store), Culture) ?? nameof(A11y_Games_Filter_Store);
|
||||
|
||||
public static string A11y_Games_Sort => ResourceManager.GetString(nameof(A11y_Games_Sort), Culture) ?? nameof(A11y_Games_Sort);
|
||||
|
||||
public static string A11y_Logs_Level => ResourceManager.GetString(nameof(A11y_Logs_Level), Culture) ?? nameof(A11y_Logs_Level);
|
||||
@@ -1461,6 +1507,8 @@ public static class Strings
|
||||
|
||||
public static string Common_Yes => ResourceManager.GetString(nameof(Common_Yes), Culture) ?? nameof(Common_Yes);
|
||||
|
||||
public static string Compare_ClearSelection => ResourceManager.GetString(nameof(Compare_ClearSelection), Culture) ?? nameof(Compare_ClearSelection);
|
||||
|
||||
public static string Compare_Col_Date => ResourceManager.GetString(nameof(Compare_Col_Date), Culture) ?? nameof(Compare_Col_Date);
|
||||
|
||||
public static string Compare_Col_Fps => ResourceManager.GetString(nameof(Compare_Col_Fps), Culture) ?? nameof(Compare_Col_Fps);
|
||||
@@ -1471,12 +1519,30 @@ public static class Strings
|
||||
|
||||
public static string Compare_Col_Tier => ResourceManager.GetString(nameof(Compare_Col_Tier), Culture) ?? nameof(Compare_Col_Tier);
|
||||
|
||||
public static string Compare_Count_Filtered_Format => ResourceManager.GetString(nameof(Compare_Count_Filtered_Format), Culture) ?? nameof(Compare_Count_Filtered_Format);
|
||||
|
||||
public static string Compare_Count_Format => ResourceManager.GetString(nameof(Compare_Count_Format), Culture) ?? nameof(Compare_Count_Format);
|
||||
|
||||
public static string Compare_Curves_Header => ResourceManager.GetString(nameof(Compare_Curves_Header), Culture) ?? nameof(Compare_Curves_Header);
|
||||
|
||||
public static string Compare_Empty => ResourceManager.GetString(nameof(Compare_Empty), Culture) ?? nameof(Compare_Empty);
|
||||
|
||||
public static string Compare_Export_Png => ResourceManager.GetString(nameof(Compare_Export_Png), Culture) ?? nameof(Compare_Export_Png);
|
||||
|
||||
public static string Compare_Filter_Fg_All => ResourceManager.GetString(nameof(Compare_Filter_Fg_All), Culture) ?? nameof(Compare_Filter_Fg_All);
|
||||
|
||||
public static string Compare_Filter_Fg_With => ResourceManager.GetString(nameof(Compare_Filter_Fg_With), Culture) ?? nameof(Compare_Filter_Fg_With);
|
||||
|
||||
public static string Compare_Filter_Fg_Without => ResourceManager.GetString(nameof(Compare_Filter_Fg_Without), Culture) ?? nameof(Compare_Filter_Fg_Without);
|
||||
|
||||
public static string Compare_Filter_Game_All => ResourceManager.GetString(nameof(Compare_Filter_Game_All), Culture) ?? nameof(Compare_Filter_Game_All);
|
||||
|
||||
public static string Compare_Filter_Tier_All => ResourceManager.GetString(nameof(Compare_Filter_Tier_All), Culture) ?? nameof(Compare_Filter_Tier_All);
|
||||
|
||||
public static string Compare_Filter_Tier_Measured => ResourceManager.GetString(nameof(Compare_Filter_Tier_Measured), Culture) ?? nameof(Compare_Filter_Tier_Measured);
|
||||
|
||||
public static string Compare_Filter_Tier_NotMeasured => ResourceManager.GetString(nameof(Compare_Filter_Tier_NotMeasured), Culture) ?? nameof(Compare_Filter_Tier_NotMeasured);
|
||||
|
||||
public static string Compare_Header => ResourceManager.GetString(nameof(Compare_Header), Culture) ?? nameof(Compare_Header);
|
||||
|
||||
public static string Compare_Legend_Format => ResourceManager.GetString(nameof(Compare_Legend_Format), Culture) ?? nameof(Compare_Legend_Format);
|
||||
@@ -1537,6 +1603,8 @@ public static class Strings
|
||||
|
||||
public static string Compare_Metric_Window => ResourceManager.GetString(nameof(Compare_Metric_Window), Culture) ?? nameof(Compare_Metric_Window);
|
||||
|
||||
public static string Compare_MidSession_Changed => ResourceManager.GetString(nameof(Compare_MidSession_Changed), Culture) ?? nameof(Compare_MidSession_Changed);
|
||||
|
||||
public static string Compare_Mixed_Body => ResourceManager.GetString(nameof(Compare_Mixed_Body), Culture) ?? nameof(Compare_Mixed_Body);
|
||||
|
||||
public static string Compare_Mixed_Legend => ResourceManager.GetString(nameof(Compare_Mixed_Legend), Culture) ?? nameof(Compare_Mixed_Legend);
|
||||
@@ -2001,6 +2069,8 @@ public static class Strings
|
||||
|
||||
public static string FgMix_Unclassified_Note => ResourceManager.GetString(nameof(FgMix_Unclassified_Note), Culture) ?? nameof(FgMix_Unclassified_Note);
|
||||
|
||||
public static string Filter_Clear => ResourceManager.GetString(nameof(Filter_Clear), Culture) ?? nameof(Filter_Clear);
|
||||
|
||||
public static string FirstRun_Accept => ResourceManager.GetString(nameof(FirstRun_Accept), Culture) ?? nameof(FirstRun_Accept);
|
||||
|
||||
public static string FirstRun_Agent_Body => ResourceManager.GetString(nameof(FirstRun_Agent_Body), Culture) ?? nameof(FirstRun_Agent_Body);
|
||||
@@ -2305,10 +2375,30 @@ public static class Strings
|
||||
|
||||
public static string Games_Empty => ResourceManager.GetString(nameof(Games_Empty), Culture) ?? nameof(Games_Empty);
|
||||
|
||||
public static string Games_Filter_Engine_All => ResourceManager.GetString(nameof(Games_Filter_Engine_All), Culture) ?? nameof(Games_Filter_Engine_All);
|
||||
|
||||
public static string Games_Filter_Engine_Unknown => ResourceManager.GetString(nameof(Games_Filter_Engine_Unknown), Culture) ?? nameof(Games_Filter_Engine_Unknown);
|
||||
|
||||
public static string Games_Filter_Installed_All => ResourceManager.GetString(nameof(Games_Filter_Installed_All), Culture) ?? nameof(Games_Filter_Installed_All);
|
||||
|
||||
public static string Games_Filter_Installed_Yes => ResourceManager.GetString(nameof(Games_Filter_Installed_Yes), Culture) ?? nameof(Games_Filter_Installed_Yes);
|
||||
|
||||
public static string Games_Filter_Played_All => ResourceManager.GetString(nameof(Games_Filter_Played_All), Culture) ?? nameof(Games_Filter_Played_All);
|
||||
|
||||
public static string Games_Filter_Played_Yes => ResourceManager.GetString(nameof(Games_Filter_Played_Yes), Culture) ?? nameof(Games_Filter_Played_Yes);
|
||||
|
||||
public static string Games_Filter_State_All => ResourceManager.GetString(nameof(Games_Filter_State_All), Culture) ?? nameof(Games_Filter_State_All);
|
||||
|
||||
public static string Games_Filter_Store_All => ResourceManager.GetString(nameof(Games_Filter_Store_All), Culture) ?? nameof(Games_Filter_Store_All);
|
||||
|
||||
public static string Games_Filter_Store_Manual => ResourceManager.GetString(nameof(Games_Filter_Store_Manual), Culture) ?? nameof(Games_Filter_Store_Manual);
|
||||
|
||||
public static string Games_Header => ResourceManager.GetString(nameof(Games_Header), Culture) ?? nameof(Games_Header);
|
||||
|
||||
public static string Games_Header_Count_Format => ResourceManager.GetString(nameof(Games_Header_Count_Format), Culture) ?? nameof(Games_Header_Count_Format);
|
||||
|
||||
public static string Games_Header_Filtered_Format => ResourceManager.GetString(nameof(Games_Header_Filtered_Format), Culture) ?? nameof(Games_Header_Filtered_Format);
|
||||
|
||||
public static string Games_List_Engine => ResourceManager.GetString(nameof(Games_List_Engine), Culture) ?? nameof(Games_List_Engine);
|
||||
|
||||
public static string Games_List_LastPlayed => ResourceManager.GetString(nameof(Games_List_LastPlayed), Culture) ?? nameof(Games_List_LastPlayed);
|
||||
|
||||
@@ -1121,6 +1121,50 @@
|
||||
<value>並べ替え</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Store_All" xml:space="preserve">
|
||||
<value>すべてのストア</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Store_Manual" xml:space="preserve">
|
||||
<value>手動で追加</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Engine_All" xml:space="preserve">
|
||||
<value>すべてのエンジン</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Engine_Unknown" xml:space="preserve">
|
||||
<value>エンジン不明</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_State_All" xml:space="preserve">
|
||||
<value>すべての状態</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Installed_All" xml:space="preserve">
|
||||
<value>インストール済みかを問わない</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Installed_Yes" xml:space="preserve">
|
||||
<value>インストール済み</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Played_All" xml:space="preserve">
|
||||
<value>プレイ済みかを問わない</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Filter_Played_Yes" xml:space="preserve">
|
||||
<value>セッションあり</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Header_Filtered_Format" xml:space="preserve">
|
||||
<value>ゲーム · {0} / {1}</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Filter_Clear" xml:space="preserve">
|
||||
<value>フィルターを解除</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Games_Sort_LastPlayed" xml:space="preserve">
|
||||
<value>最後にプレイ</value>
|
||||
<comment>review</comment>
|
||||
@@ -1609,6 +1653,50 @@
|
||||
<value>{0} 件選択</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Filter_Game_All" xml:space="preserve">
|
||||
<value>すべてのゲーム</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_All" xml:space="preserve">
|
||||
<value>すべての Tier</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_Measured" xml:space="preserve">
|
||||
<value>計測あり (Tier 1)</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_NotMeasured" xml:space="preserve">
|
||||
<value>計測なし (Tier 2)</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_All" xml:space="preserve">
|
||||
<value>フレーム生成の有無を問わない</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_With" xml:space="preserve">
|
||||
<value>フレーム生成あり</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_Without" xml:space="preserve">
|
||||
<value>フレーム生成なし</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Count_Format" xml:space="preserve">
|
||||
<value>{0} 件のセッション</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Count_Filtered_Format" xml:space="preserve">
|
||||
<value>{1} 件中 {0} 件のセッション</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_ClearSelection" xml:space="preserve">
|
||||
<value>選択を解除</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_MidSession_Changed" xml:space="preserve">
|
||||
<value>セッション中に変更</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="Compare_Table_Header" xml:space="preserve">
|
||||
<value>統計</value>
|
||||
<comment>review</comment>
|
||||
@@ -2588,6 +2676,38 @@
|
||||
<value>ゲームの並べ替え</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Store" xml:space="preserve">
|
||||
<value>ストアでゲームを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Engine" xml:space="preserve">
|
||||
<value>エンジンでゲームを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_State" xml:space="preserve">
|
||||
<value>状態でゲームを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Installed" xml:space="preserve">
|
||||
<value>インストール状態でゲームを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Played" xml:space="preserve">
|
||||
<value>セッションでゲームを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Game" xml:space="preserve">
|
||||
<value>ゲームでセッションを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Tier" xml:space="preserve">
|
||||
<value>Tier でセッションを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Fg" xml:space="preserve">
|
||||
<value>フレーム生成でセッションを絞り込む</value>
|
||||
<comment>review</comment>
|
||||
</data>
|
||||
<data name="A11y_Logs_Source" xml:space="preserve">
|
||||
<value>ログのソース</value>
|
||||
<comment>review</comment>
|
||||
|
||||
@@ -846,6 +846,39 @@
|
||||
<data name="Games_Sort_Label" xml:space="preserve">
|
||||
<value>Sort by</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Store_All" xml:space="preserve">
|
||||
<value>All stores</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Store_Manual" xml:space="preserve">
|
||||
<value>Added by hand</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Engine_All" xml:space="preserve">
|
||||
<value>All engines</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Engine_Unknown" xml:space="preserve">
|
||||
<value>Engine not identified</value>
|
||||
</data>
|
||||
<data name="Games_Filter_State_All" xml:space="preserve">
|
||||
<value>Any state</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Installed_All" xml:space="preserve">
|
||||
<value>Installed or not</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Installed_Yes" xml:space="preserve">
|
||||
<value>Installed</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Played_All" xml:space="preserve">
|
||||
<value>Played or not</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Played_Yes" xml:space="preserve">
|
||||
<value>With sessions</value>
|
||||
</data>
|
||||
<data name="Games_Header_Filtered_Format" xml:space="preserve">
|
||||
<value>Games · {0} of {1}</value>
|
||||
</data>
|
||||
<data name="Filter_Clear" xml:space="preserve">
|
||||
<value>Clear filters</value>
|
||||
</data>
|
||||
<data name="Games_Sort_LastPlayed" xml:space="preserve">
|
||||
<value>Last played</value>
|
||||
</data>
|
||||
@@ -1212,6 +1245,39 @@
|
||||
<data name="Compare_Selected_Format" xml:space="preserve">
|
||||
<value>{0} selected</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Game_All" xml:space="preserve">
|
||||
<value>All games</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_All" xml:space="preserve">
|
||||
<value>Any tier</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_Measured" xml:space="preserve">
|
||||
<value>Measured (Tier 1)</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_NotMeasured" xml:space="preserve">
|
||||
<value>Not measured (Tier 2)</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_All" xml:space="preserve">
|
||||
<value>With or without frame generation</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_With" xml:space="preserve">
|
||||
<value>With frame generation</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_Without" xml:space="preserve">
|
||||
<value>Without frame generation</value>
|
||||
</data>
|
||||
<data name="Compare_Count_Format" xml:space="preserve">
|
||||
<value>{0} sessions</value>
|
||||
</data>
|
||||
<data name="Compare_Count_Filtered_Format" xml:space="preserve">
|
||||
<value>{0} of {1} sessions</value>
|
||||
</data>
|
||||
<data name="Compare_ClearSelection" xml:space="preserve">
|
||||
<value>Clear selection</value>
|
||||
</data>
|
||||
<data name="Compare_MidSession_Changed" xml:space="preserve">
|
||||
<value>Changed mid-session</value>
|
||||
</data>
|
||||
<data name="Compare_Table_Header" xml:space="preserve">
|
||||
<value>Statistics</value>
|
||||
</data>
|
||||
@@ -1947,6 +2013,30 @@
|
||||
<data name="A11y_Games_Sort" xml:space="preserve">
|
||||
<value>Sort games</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Store" xml:space="preserve">
|
||||
<value>Filter games by store</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Engine" xml:space="preserve">
|
||||
<value>Filter games by engine</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_State" xml:space="preserve">
|
||||
<value>Filter games by state</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Installed" xml:space="preserve">
|
||||
<value>Filter games by installed</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Played" xml:space="preserve">
|
||||
<value>Filter games by sessions</value>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Game" xml:space="preserve">
|
||||
<value>Filter sessions by game</value>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Tier" xml:space="preserve">
|
||||
<value>Filter sessions by tier</value>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Fg" xml:space="preserve">
|
||||
<value>Filter sessions by frame generation</value>
|
||||
</data>
|
||||
<data name="A11y_Logs_Source" xml:space="preserve">
|
||||
<value>Log source</value>
|
||||
</data>
|
||||
|
||||
@@ -841,6 +841,39 @@
|
||||
<data name="Games_Sort_Label" xml:space="preserve">
|
||||
<value>Sắp xếp theo</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Store_All" xml:space="preserve">
|
||||
<value>Mọi cửa hàng</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Store_Manual" xml:space="preserve">
|
||||
<value>Thêm thủ công</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Engine_All" xml:space="preserve">
|
||||
<value>Mọi engine</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Engine_Unknown" xml:space="preserve">
|
||||
<value>Chưa nhận diện engine</value>
|
||||
</data>
|
||||
<data name="Games_Filter_State_All" xml:space="preserve">
|
||||
<value>Mọi trạng thái</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Installed_All" xml:space="preserve">
|
||||
<value>Đã cài hoặc chưa</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Installed_Yes" xml:space="preserve">
|
||||
<value>Đã cài</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Played_All" xml:space="preserve">
|
||||
<value>Đã chơi hoặc chưa</value>
|
||||
</data>
|
||||
<data name="Games_Filter_Played_Yes" xml:space="preserve">
|
||||
<value>Có phiên</value>
|
||||
</data>
|
||||
<data name="Games_Header_Filtered_Format" xml:space="preserve">
|
||||
<value>Game · {0} / {1}</value>
|
||||
</data>
|
||||
<data name="Filter_Clear" xml:space="preserve">
|
||||
<value>Bỏ lọc</value>
|
||||
</data>
|
||||
<data name="Games_Sort_LastPlayed" xml:space="preserve">
|
||||
<value>Chơi gần nhất</value>
|
||||
</data>
|
||||
@@ -1207,6 +1240,39 @@
|
||||
<data name="Compare_Selected_Format" xml:space="preserve">
|
||||
<value>Đã chọn {0}</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Game_All" xml:space="preserve">
|
||||
<value>Mọi game</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_All" xml:space="preserve">
|
||||
<value>Mọi tier</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_Measured" xml:space="preserve">
|
||||
<value>Có đo (Tier 1)</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Tier_NotMeasured" xml:space="preserve">
|
||||
<value>Không đo (Tier 2)</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_All" xml:space="preserve">
|
||||
<value>Có hoặc không tạo khung hình</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_With" xml:space="preserve">
|
||||
<value>Có tạo khung hình</value>
|
||||
</data>
|
||||
<data name="Compare_Filter_Fg_Without" xml:space="preserve">
|
||||
<value>Không tạo khung hình</value>
|
||||
</data>
|
||||
<data name="Compare_Count_Format" xml:space="preserve">
|
||||
<value>{0} phiên</value>
|
||||
</data>
|
||||
<data name="Compare_Count_Filtered_Format" xml:space="preserve">
|
||||
<value>{0} / {1} phiên</value>
|
||||
</data>
|
||||
<data name="Compare_ClearSelection" xml:space="preserve">
|
||||
<value>Bỏ chọn</value>
|
||||
</data>
|
||||
<data name="Compare_MidSession_Changed" xml:space="preserve">
|
||||
<value>Đổi giữa phiên</value>
|
||||
</data>
|
||||
<data name="Compare_Table_Header" xml:space="preserve">
|
||||
<value>Thống kê</value>
|
||||
</data>
|
||||
@@ -1942,6 +2008,30 @@
|
||||
<data name="A11y_Games_Sort" xml:space="preserve">
|
||||
<value>Sắp xếp game</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Store" xml:space="preserve">
|
||||
<value>Lọc game theo cửa hàng</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Engine" xml:space="preserve">
|
||||
<value>Lọc game theo engine</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_State" xml:space="preserve">
|
||||
<value>Lọc game theo trạng thái</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Installed" xml:space="preserve">
|
||||
<value>Lọc game theo tình trạng cài đặt</value>
|
||||
</data>
|
||||
<data name="A11y_Games_Filter_Played" xml:space="preserve">
|
||||
<value>Lọc game theo phiên</value>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Game" xml:space="preserve">
|
||||
<value>Lọc phiên theo game</value>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Tier" xml:space="preserve">
|
||||
<value>Lọc phiên theo tier</value>
|
||||
</data>
|
||||
<data name="A11y_Compare_Filter_Fg" xml:space="preserve">
|
||||
<value>Lọc phiên theo tạo khung hình</value>
|
||||
</data>
|
||||
<data name="A11y_Logs_Source" xml:space="preserve">
|
||||
<value>Nguồn log</value>
|
||||
</data>
|
||||
|
||||
@@ -11,6 +11,11 @@
|
||||
Our styles, merged LAST (16_WPFUI_SYNTAX §App bootstrap). Colours only through theme brushes with
|
||||
DynamicResource; the chart palette (16 §Theming) arrives with the charts (P3 PR-6) as its own dictionary.
|
||||
-->
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<!-- beta.34: the pane item's sizes (FlLeftFluentNavigationViewItemTemplate, below), as WPF UI's own template reads them. -->
|
||||
<ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/NavigationView/NavigationViewConstants.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<BooleanToVisibilityConverter x:Key="BoolToVis" />
|
||||
<converters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVis" />
|
||||
<converters:NullToCollapsedConverter x:Key="NullToCollapsed" />
|
||||
@@ -329,4 +334,113 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!--
|
||||
The navigation pane's item, beta.34 (owner request 2026-11-06, D86): WPF UI 4.3.0's LeftFluentNavigationViewItemTemplate
|
||||
(lepoco/wpfui, MIT - src/Wpf.Ui/Controls/NavigationView/NavigationLeftFluent.xaml at tag 4.3.0), copied with ONE
|
||||
change: its IsActive trigger animated the label's ContentGrid to height 0 and opacity 0, so the selected page lost its
|
||||
name - the owner's screenshot of Compare, and every other page the same while it was selected. The selected item keeps
|
||||
the accent bar, the selected background, the accent icon and the border animation. Set as RootNavigation.ItemTemplate
|
||||
(MainWindow.xaml): a local value outranks the default style's PaneDisplayMode=LeftFluent trigger.
|
||||
-->
|
||||
<ControlTemplate x:Key="FlLeftFluentNavigationViewItemTemplate" TargetType="{x:Type ui:NavigationViewItem}">
|
||||
<Border x:Name="MainBorder"
|
||||
MinWidth="{StaticResource PaneFluentButtonWidth}"
|
||||
Height="{StaticResource PaneFluentButtonHeight}"
|
||||
Padding="4"
|
||||
HorizontalAlignment="Stretch"
|
||||
Background="Transparent"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="1"
|
||||
CornerRadius="4">
|
||||
<Grid>
|
||||
<Rectangle x:Name="ActiveRectangle"
|
||||
Width="3"
|
||||
Height="24"
|
||||
Margin="-4,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Fill="{DynamicResource NavigationViewSelectionIndicatorForeground}"
|
||||
Opacity="0.0"
|
||||
RadiusX="2"
|
||||
RadiusY="2" />
|
||||
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<ContentPresenter x:Name="IconContentPresenter"
|
||||
Grid.Row="0"
|
||||
Margin="0"
|
||||
Content="{TemplateBinding Icon}"
|
||||
TextElement.FontSize="{StaticResource NavigationViewFluentIconSize}"
|
||||
TextElement.Foreground="{DynamicResource NavigationViewItemForegroundLeftFluent}" />
|
||||
<Grid x:Name="ContentGrid"
|
||||
Grid.Row="1"
|
||||
Height="{StaticResource NavigationViewFluentIconSize}"
|
||||
Margin="0,2,0,0">
|
||||
<ContentPresenter x:Name="ElementContentPresenter"
|
||||
HorizontalAlignment="Center"
|
||||
Content="{TemplateBinding Content}"
|
||||
ContentTemplate="{TemplateBinding ContentTemplate}"
|
||||
RecognizesAccessKey="True"
|
||||
TextElement.FontSize="{TemplateBinding FontSize}"
|
||||
TextElement.Foreground="{DynamicResource NavigationViewItemForegroundLeftFluent}" />
|
||||
</Grid>
|
||||
<ContentPresenter x:Name="PART_InfoBadge"
|
||||
Grid.Row="0"
|
||||
Margin="0"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
Content="{TemplateBinding InfoBadge}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsActive" Value="True">
|
||||
<Setter TargetName="ActiveRectangle" Property="Opacity" Value="1.0" />
|
||||
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelectedLeftFluent}" />
|
||||
<Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewSelectionIndicatorForeground}" />
|
||||
<Setter TargetName="ElementContentPresenter" Property="Margin" Value="0" />
|
||||
<Trigger.EnterActions>
|
||||
<BeginStoryboard>
|
||||
<Storyboard>
|
||||
<DoubleAnimation Storyboard.TargetName="MainBorder"
|
||||
Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Opacity)"
|
||||
From="0" To="1" Duration="0:0:.16" />
|
||||
</Storyboard>
|
||||
</BeginStoryboard>
|
||||
</Trigger.EnterActions>
|
||||
<Trigger.ExitActions>
|
||||
<BeginStoryboard>
|
||||
<Storyboard>
|
||||
<DoubleAnimation Storyboard.TargetName="MainBorder"
|
||||
Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Opacity)"
|
||||
From="1" To="0" Duration="0:0:.16" />
|
||||
</Storyboard>
|
||||
</BeginStoryboard>
|
||||
</Trigger.ExitActions>
|
||||
</Trigger>
|
||||
<Trigger Property="Icon" Value="{x:Null}">
|
||||
<Setter TargetName="IconContentPresenter" Property="Visibility" Value="Collapsed" />
|
||||
</Trigger>
|
||||
<Trigger Property="InfoBadge" Value="{x:Null}">
|
||||
<Setter TargetName="PART_InfoBadge" Property="Margin" Value="0" />
|
||||
<Setter TargetName="PART_InfoBadge" Property="Visibility" Value="Collapsed" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="MainBorder" Property="Background" Value="{DynamicResource NavigationViewItemBackgroundSelectedLeftFluent}" />
|
||||
</Trigger>
|
||||
<MultiTrigger>
|
||||
<MultiTrigger.Conditions>
|
||||
<Condition Property="IsMouseOver" Value="True" />
|
||||
<Condition Property="IsActive" Value="False" />
|
||||
</MultiTrigger.Conditions>
|
||||
<MultiTrigger.Setters>
|
||||
<Setter TargetName="IconContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOverLeftFluent}" />
|
||||
<Setter TargetName="ContentGrid" Property="TextElement.Foreground" Value="{DynamicResource NavigationViewItemForegroundPointerOverLeftFluent}" />
|
||||
</MultiTrigger.Setters>
|
||||
</MultiTrigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</ResourceDictionary>
|
||||
@@ -18,18 +18,38 @@ public sealed partial class CompareCandidateViewModel : ObservableObject
|
||||
ArgumentNullException.ThrowIfNull(recent);
|
||||
Row = recent.Row;
|
||||
Id = recent.Row.Id;
|
||||
GameId = recent.Row.GameId;
|
||||
StartedAt = recent.Row.StartedAt;
|
||||
GameName = recent.GameName;
|
||||
DateText = Formats.Date(recent.Row.StartedAt);
|
||||
IsHooked = recent.Row.Tier == CaptureTier.Hooked;
|
||||
TierText = IsHooked ? Strings.Tier_Hooked : Strings.Tier_NotHooked;
|
||||
ReadoutLine = FpsPresentation.FromRow(recent.Row).Line;
|
||||
SettingsChangedMidSession = recent.Row.SettingsChangedMidSession;
|
||||
SettingsChangedText = SettingsChangedMidSession ? Strings.Compare_MidSession_Changed : "—";
|
||||
HasFrameGeneration = recent.Row.FgMode switch
|
||||
{
|
||||
"none" => false,
|
||||
"na" or null => null,
|
||||
_ => true,
|
||||
};
|
||||
}
|
||||
|
||||
public Application.Persistence.SessionRow Row { get; }
|
||||
|
||||
public long Id { get; }
|
||||
|
||||
public long GameId { get; }
|
||||
|
||||
/// <summary>The date column sorts by this, not by its text (beta.34).</summary>
|
||||
public DateTimeOffset StartedAt { get; }
|
||||
|
||||
/// <summary>beta.34 (D85): frame generation in the session — true, false (measured none), or null (not measured: Tier 2).</summary>
|
||||
public bool? HasFrameGeneration { get; }
|
||||
|
||||
/// <summary>The Settings-changed cell's words beside its icon, or a dash — the column was blank for every unchanged session.</summary>
|
||||
public string SettingsChangedText { get; }
|
||||
|
||||
public string GameName { get; }
|
||||
|
||||
public string DateText { get; }
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Copyright (C) 2026 poli0981 - additional terms under GPLv3 section 7: see NOTICE
|
||||
|
||||
namespace FrameLedger.App.ViewModels;
|
||||
|
||||
/// <summary>Compare's tier filter (beta.34, D85): every session, the measured (Tier 1), or those recorded without measurement.</summary>
|
||||
public enum CompareTierFilter
|
||||
{
|
||||
All = 0,
|
||||
Measured,
|
||||
NotMeasured,
|
||||
}
|
||||
@@ -51,6 +51,21 @@ public sealed partial class CompareViewModel : ObservableObject
|
||||
[ObservableProperty]
|
||||
private string? _tierLegend;
|
||||
|
||||
/// <summary>beta.34 (D85): one game's sessions, or 0 for every game's.</summary>
|
||||
[ObservableProperty]
|
||||
private long _gameFilter;
|
||||
|
||||
[ObservableProperty]
|
||||
private CompareTierFilter _tierFilter;
|
||||
|
||||
[ObservableProperty]
|
||||
private YesNoFilter _frameGenerationFilter;
|
||||
|
||||
[ObservableProperty]
|
||||
private string _countText = string.Empty;
|
||||
|
||||
private List<CompareCandidateViewModel> _pool = [];
|
||||
|
||||
public CompareViewModel(GameLibrary library, SessionSeriesLoader loader, IMixedTierPrompt mixed, IFileSaver saver, IMessageStrip strip)
|
||||
{
|
||||
_library = library ?? throw new ArgumentNullException(nameof(library));
|
||||
@@ -77,6 +92,27 @@ public sealed partial class CompareViewModel : ObservableObject
|
||||
|
||||
public static string MetricHeader => Strings.Compare_Table_Metric;
|
||||
|
||||
public static string ClearFiltersText => Strings.Filter_Clear;
|
||||
|
||||
public static string ClearSelectionText => Strings.Compare_ClearSelection;
|
||||
|
||||
/// <summary>beta.34 (D85): the games the sessions are of, "All games" first.</summary>
|
||||
public ObservableCollection<Choice<long>> Games { get; } = [];
|
||||
|
||||
public IReadOnlyList<Choice<CompareTierFilter>> Tiers { get; } =
|
||||
[
|
||||
new(CompareTierFilter.All, Strings.Compare_Filter_Tier_All),
|
||||
new(CompareTierFilter.Measured, Strings.Compare_Filter_Tier_Measured),
|
||||
new(CompareTierFilter.NotMeasured, Strings.Compare_Filter_Tier_NotMeasured),
|
||||
];
|
||||
|
||||
public IReadOnlyList<Choice<YesNoFilter>> FrameGenerationChoices { get; } =
|
||||
[
|
||||
new(YesNoFilter.All, Strings.Compare_Filter_Fg_All),
|
||||
new(YesNoFilter.Yes, Strings.Compare_Filter_Fg_With),
|
||||
new(YesNoFilter.No, Strings.Compare_Filter_Fg_Without),
|
||||
];
|
||||
|
||||
public ObservableCollection<CompareCandidateViewModel> Candidates { get; } = [];
|
||||
|
||||
public ObservableCollection<CompareCandidateViewModel> Compared { get; } = [];
|
||||
@@ -93,26 +129,97 @@ public sealed partial class CompareViewModel : ObservableObject
|
||||
/// <summary>Raised when <see cref="Curves"/> and <see cref="Rows"/> were rebuilt, so the page redraws.</summary>
|
||||
public event EventHandler? Compared2;
|
||||
|
||||
/// <summary>
|
||||
/// Every session, newest first (beta.34: it was the newest 200), read on the thread pool — Microsoft.Data.Sqlite completes
|
||||
/// its asynchronous calls synchronously, and the page waited for it — and then filtered (D85).
|
||||
/// </summary>
|
||||
public async Task LoadAsync(CancellationToken ct = default)
|
||||
{
|
||||
IReadOnlyList<RecentSession> recent = await _library.RecentAsync(200, ct).ConfigureAwait(true);
|
||||
foreach (CompareCandidateViewModel old in Candidates)
|
||||
GameLibrary library = _library;
|
||||
IReadOnlyList<RecentSession> recent = await Task.Run(() => library.RecentAsync(int.MaxValue, ct), ct).ConfigureAwait(true);
|
||||
foreach (CompareCandidateViewModel old in _pool)
|
||||
{
|
||||
old.PropertyChanged -= OnCandidateChanged;
|
||||
}
|
||||
|
||||
Candidates.Clear();
|
||||
var pool = new List<CompareCandidateViewModel>(recent.Count);
|
||||
foreach (RecentSession r in recent)
|
||||
{
|
||||
var candidate = new CompareCandidateViewModel(r);
|
||||
candidate.PropertyChanged += OnCandidateChanged;
|
||||
Candidates.Add(candidate);
|
||||
pool.Add(candidate);
|
||||
}
|
||||
|
||||
IsEmpty = Candidates.Count == 0;
|
||||
_pool = pool;
|
||||
Choice<long>[] games =
|
||||
[
|
||||
new(0, Strings.Compare_Filter_Game_All),
|
||||
.. pool.GroupBy(static c => c.GameId).Select(static g => new Choice<long>(g.Key, g.First().GameName))
|
||||
.OrderBy(static c => c.Label, StringComparer.CurrentCultureIgnoreCase),
|
||||
];
|
||||
Games.Clear();
|
||||
foreach (Choice<long> game in games)
|
||||
{
|
||||
Games.Add(game);
|
||||
}
|
||||
|
||||
if (!Games.Any(g => g.Value == GameFilter))
|
||||
{
|
||||
GameFilter = 0;
|
||||
}
|
||||
|
||||
IsEmpty = _pool.Count == 0;
|
||||
ApplyFilters();
|
||||
Recount();
|
||||
}
|
||||
|
||||
partial void OnGameFilterChanged(long value) => ApplyFilters();
|
||||
|
||||
partial void OnTierFilterChanged(CompareTierFilter value) => ApplyFilters();
|
||||
|
||||
partial void OnFrameGenerationFilterChanged(YesNoFilter value) => ApplyFilters();
|
||||
|
||||
[RelayCommand]
|
||||
private void ClearFilters()
|
||||
{
|
||||
GameFilter = 0;
|
||||
TierFilter = CompareTierFilter.All;
|
||||
FrameGenerationFilter = YesNoFilter.All;
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
private void ClearSelection()
|
||||
{
|
||||
foreach (CompareCandidateViewModel c in _pool.Where(static c => c.IsSelected))
|
||||
{
|
||||
c.IsSelected = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The list the filters leave (beta.34, D85), newest first — and every ticked session whatever they say: a pick is never
|
||||
/// hidden from the one who made it, so what Compare runs on is always on screen.
|
||||
/// </summary>
|
||||
private void ApplyFilters()
|
||||
{
|
||||
CompareCandidateViewModel[] shown = [.. _pool.Where(c => c.IsSelected || Passes(c))];
|
||||
Candidates.Clear();
|
||||
foreach (CompareCandidateViewModel c in shown)
|
||||
{
|
||||
Candidates.Add(c);
|
||||
}
|
||||
|
||||
bool filtered = GameFilter != 0 || TierFilter != CompareTierFilter.All || FrameGenerationFilter != YesNoFilter.All;
|
||||
CountText = filtered
|
||||
? string.Format(CultureInfo.CurrentCulture, Strings.Compare_Count_Filtered_Format, shown.Length, _pool.Count)
|
||||
: string.Format(CultureInfo.CurrentCulture, Strings.Compare_Count_Format, _pool.Count);
|
||||
}
|
||||
|
||||
private bool Passes(CompareCandidateViewModel c) =>
|
||||
(GameFilter == 0 || c.GameId == GameFilter)
|
||||
&& TierFilter switch { CompareTierFilter.Measured => c.IsHooked, CompareTierFilter.NotMeasured => !c.IsHooked, _ => true }
|
||||
&& FrameGenerationFilter switch { YesNoFilter.Yes => c.HasFrameGeneration is true, YesNoFilter.No => c.HasFrameGeneration is false, _ => true };
|
||||
|
||||
[RelayCommand]
|
||||
private Task CompareAsync() => Run(CompareCoreAsync);
|
||||
|
||||
@@ -141,7 +248,7 @@ public sealed partial class CompareViewModel : ObservableObject
|
||||
|
||||
private async Task CompareCoreAsync()
|
||||
{
|
||||
CompareCandidateViewModel[] picked = [.. Candidates.Where(static c => c.IsSelected)];
|
||||
CompareCandidateViewModel[] picked = [.. _pool.Where(static c => c.IsSelected)];
|
||||
if (picked.Length < MinSessions || picked.Length > MaxSessions)
|
||||
{
|
||||
return;
|
||||
@@ -284,7 +391,7 @@ public sealed partial class CompareViewModel : ObservableObject
|
||||
|
||||
private void Recount()
|
||||
{
|
||||
SelectedCount = Candidates.Count(static c => c.IsSelected);
|
||||
SelectedCount = _pool.Count(static c => c.IsSelected);
|
||||
CanCompare = SelectedCount is >= MinSessions and <= MaxSessions;
|
||||
OnPropertyChanged(nameof(SelectedText));
|
||||
}
|
||||
|
||||
@@ -37,6 +37,8 @@ public sealed partial class GameCardViewModel : ObservableObject
|
||||
_notInstalledToolTip = installed ? null : Formats.ExecutableMissingText(card.Row.Fingerprint.ExePath);
|
||||
Id = card.Row.Id;
|
||||
Name = card.Row.Name;
|
||||
PlatformToken = card.Row.Platform;
|
||||
EngineToken = card.Row.Engine;
|
||||
PlatformText = Formats.Platform(card.Row.Platform);
|
||||
EngineText = Formats.Engine(card.Row.Engine, card.Row.EngineVersionSource);
|
||||
Recorded = card.Row.RecordSessions;
|
||||
@@ -71,6 +73,18 @@ public sealed partial class GameCardViewModel : ObservableObject
|
||||
|
||||
public string PlatformText { get; }
|
||||
|
||||
/// <summary>The store's token (<c>steam</c>, <c>gog</c>, <c>epic</c>, <c>itch</c>, <c>xbox</c>; <c>none</c> for a game added by hand) — the store filter's key.</summary>
|
||||
public string PlatformToken { get; }
|
||||
|
||||
/// <summary>The detected engine's id, or null — the engine filter's key.</summary>
|
||||
public string? EngineToken { get; }
|
||||
|
||||
/// <summary>The card's one state, as its pill says it (beta.34, D85).</summary>
|
||||
public GamesStateFilter State => !Recorded ? GamesStateFilter.NotRecorded
|
||||
: Excepted ? GamesStateFilter.Exception
|
||||
: AntiCheat ? GamesStateFilter.AntiCheat
|
||||
: HookOn ? GamesStateFilter.HookingOn : GamesStateFilter.HookingOff;
|
||||
|
||||
public bool HasPlatform => PlatformText.Length > 0;
|
||||
|
||||
public string EngineText { get; }
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Copyright (C) 2026 poli0981 - additional terms under GPLv3 section 7: see NOTICE
|
||||
|
||||
namespace FrameLedger.App.ViewModels;
|
||||
|
||||
/// <summary>The library's state filter (beta.34, D85): the card's one state, as its pill says it.</summary>
|
||||
public enum GamesStateFilter
|
||||
{
|
||||
All = 0,
|
||||
HookingOn,
|
||||
HookingOff,
|
||||
AntiCheat,
|
||||
Exception,
|
||||
NotRecorded,
|
||||
}
|
||||
@@ -28,6 +28,12 @@ public sealed partial class GamesViewModel : ObservableObject
|
||||
private const string _listValue = "list";
|
||||
private const string _gridValue = "grid";
|
||||
|
||||
/// <summary>The store and engine filters' "everything" (beta.34, D85); no store or engine token is empty.</summary>
|
||||
public const string AnyToken = "";
|
||||
|
||||
/// <summary>The engine filter's "not identified".</summary>
|
||||
public const string UnknownEngineToken = "?";
|
||||
|
||||
/// <summary>How many removed games one notice names; the rest are counted (<c>Games_Removed_More_Format</c>).</summary>
|
||||
private const int _removedNamed = 5;
|
||||
|
||||
@@ -71,6 +77,27 @@ public sealed partial class GamesViewModel : ObservableObject
|
||||
[ObservableProperty]
|
||||
private bool _listView;
|
||||
|
||||
/// <summary>beta.34 (D85): the store filter — a store token, or <see cref="AnyToken"/>.</summary>
|
||||
[ObservableProperty]
|
||||
private string _storeFilter = AnyToken;
|
||||
|
||||
/// <summary>beta.34 (D85): the engine filter — an engine id, <see cref="UnknownEngineToken"/>, or <see cref="AnyToken"/>.</summary>
|
||||
[ObservableProperty]
|
||||
private string _engineFilter = AnyToken;
|
||||
|
||||
[ObservableProperty]
|
||||
private GamesStateFilter _stateFilter;
|
||||
|
||||
[ObservableProperty]
|
||||
private YesNoFilter _installedFilter;
|
||||
|
||||
[ObservableProperty]
|
||||
private YesNoFilter _playedFilter;
|
||||
|
||||
/// <summary>A filter or the search narrows the list; the header then counts what is shown of all.</summary>
|
||||
[ObservableProperty]
|
||||
private bool _isFiltered;
|
||||
|
||||
/// <summary>What Play will do, in the mode Settings ▸ Games has now (beta.21, D59).</summary>
|
||||
[ObservableProperty]
|
||||
private string _playToolTip = Strings.Play_ToolTip_Store;
|
||||
@@ -132,6 +159,39 @@ public sealed partial class GamesViewModel : ObservableObject
|
||||
|
||||
public ObservableCollection<GameCardViewModel> Games { get; } = [];
|
||||
|
||||
/// <summary>beta.34 (D85): the stores the library holds, "All stores" first — rebuilt when the library changes them.</summary>
|
||||
public ObservableCollection<Choice<string>> Stores { get; } = [];
|
||||
|
||||
/// <summary>beta.34 (D85): the engines the library holds, "All engines" first, "Engine not identified" last when any is.</summary>
|
||||
public ObservableCollection<Choice<string>> Engines { get; } = [];
|
||||
|
||||
/// <summary>The states, labelled in the language the page opened in, as the pills say them.</summary>
|
||||
public IReadOnlyList<Choice<GamesStateFilter>> States { get; } =
|
||||
[
|
||||
new(GamesStateFilter.All, Strings.Games_Filter_State_All),
|
||||
new(GamesStateFilter.HookingOn, Strings.Games_Card_HookOn),
|
||||
new(GamesStateFilter.HookingOff, Strings.Games_Card_HookOff),
|
||||
new(GamesStateFilter.AntiCheat, Strings.Games_Card_AntiCheat),
|
||||
new(GamesStateFilter.Exception, Strings.Games_Card_Exception),
|
||||
new(GamesStateFilter.NotRecorded, Strings.Games_Card_NotRecorded),
|
||||
];
|
||||
|
||||
public IReadOnlyList<Choice<YesNoFilter>> InstalledChoices { get; } =
|
||||
[
|
||||
new(YesNoFilter.All, Strings.Games_Filter_Installed_All),
|
||||
new(YesNoFilter.Yes, Strings.Games_Filter_Installed_Yes),
|
||||
new(YesNoFilter.No, Strings.Games_Card_NotInstalled),
|
||||
];
|
||||
|
||||
public IReadOnlyList<Choice<YesNoFilter>> PlayedChoices { get; } =
|
||||
[
|
||||
new(YesNoFilter.All, Strings.Games_Filter_Played_All),
|
||||
new(YesNoFilter.Yes, Strings.Games_Filter_Played_Yes),
|
||||
new(YesNoFilter.No, Strings.Games_Card_NeverPlayed),
|
||||
];
|
||||
|
||||
public static string ClearFiltersText => Strings.Filter_Clear;
|
||||
|
||||
/// <summary>The load in flight, for a test to await.</summary>
|
||||
public Task Pending { get; private set; }
|
||||
|
||||
@@ -162,7 +222,7 @@ public sealed partial class GamesViewModel : ObservableObject
|
||||
// is on disk: a file-system question per entry that a sleeping drive answers in a second or more (39 of the owner's
|
||||
// 41 Steam games are on a USB drive), and no card was shown until every one had answered (spike-notes §27).
|
||||
_all = Merge(_all, cards);
|
||||
HeaderText = string.Format(CultureInfo.CurrentCulture, Strings.Games_Header_Count_Format, _all.Count);
|
||||
RefreshChoices();
|
||||
Apply();
|
||||
|
||||
Func<string, bool> exists = _exists;
|
||||
@@ -348,6 +408,82 @@ public sealed partial class GamesViewModel : ObservableObject
|
||||
|
||||
partial void OnSortChanged(GamesSort value) => Apply();
|
||||
|
||||
partial void OnStoreFilterChanged(string value) => Apply();
|
||||
|
||||
partial void OnEngineFilterChanged(string value) => Apply();
|
||||
|
||||
partial void OnStateFilterChanged(GamesStateFilter value) => Apply();
|
||||
|
||||
partial void OnInstalledFilterChanged(YesNoFilter value) => Apply();
|
||||
|
||||
partial void OnPlayedFilterChanged(YesNoFilter value) => Apply();
|
||||
|
||||
/// <summary>beta.34 (D85): every filter back to everything; the search stays (it has its own box).</summary>
|
||||
[RelayCommand]
|
||||
private void ClearFilters()
|
||||
{
|
||||
StoreFilter = AnyToken;
|
||||
EngineFilter = AnyToken;
|
||||
StateFilter = GamesStateFilter.All;
|
||||
InstalledFilter = YesNoFilter.All;
|
||||
PlayedFilter = YesNoFilter.All;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The store and engine choices from what the library holds — rebuilt only when that set changes, so an open list does not
|
||||
/// lose its selection on every read. A filter whose store or engine left the library goes back to everything.
|
||||
/// </summary>
|
||||
private void RefreshChoices()
|
||||
{
|
||||
Choice<string>[] stores =
|
||||
[
|
||||
new(AnyToken, Strings.Games_Filter_Store_All),
|
||||
.. _all.Select(static c => c.PlatformToken).Distinct(StringComparer.Ordinal)
|
||||
.Select(static t => new Choice<string>(t, Formats.Platform(t) is { Length: > 0 } name ? name : Strings.Games_Filter_Store_Manual))
|
||||
.OrderBy(static c => c.Label, StringComparer.CurrentCultureIgnoreCase),
|
||||
];
|
||||
Choice<string>[] engines =
|
||||
[
|
||||
new(AnyToken, Strings.Games_Filter_Engine_All),
|
||||
.. _all.Select(static c => c.EngineToken).OfType<string>().Distinct(StringComparer.Ordinal)
|
||||
.Select(static t => new Choice<string>(t, Formats.Engine(t) is { Length: > 0 } name ? name : t))
|
||||
.OrderBy(static c => c.Label, StringComparer.CurrentCultureIgnoreCase),
|
||||
.. _all.Any(static c => c.EngineToken is null) ? new[] { new Choice<string>(UnknownEngineToken, Strings.Games_Filter_Engine_Unknown) } : Array.Empty<Choice<string>>(),
|
||||
];
|
||||
Replace(Stores, stores);
|
||||
Replace(Engines, engines);
|
||||
if (!Stores.Any(c => string.Equals(c.Value, StoreFilter, StringComparison.Ordinal)))
|
||||
{
|
||||
StoreFilter = AnyToken;
|
||||
}
|
||||
|
||||
if (!Engines.Any(c => string.Equals(c.Value, EngineFilter, StringComparison.Ordinal)))
|
||||
{
|
||||
EngineFilter = AnyToken;
|
||||
}
|
||||
}
|
||||
|
||||
private static void Replace(ObservableCollection<Choice<string>> target, Choice<string>[] wanted)
|
||||
{
|
||||
if (target.SequenceEqual(wanted))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
target.Clear();
|
||||
foreach (Choice<string> choice in wanted)
|
||||
{
|
||||
target.Add(choice);
|
||||
}
|
||||
}
|
||||
|
||||
private bool Passes(GameCardViewModel c) =>
|
||||
(StoreFilter.Length == 0 || string.Equals(c.PlatformToken, StoreFilter, StringComparison.Ordinal))
|
||||
&& (EngineFilter.Length == 0 || string.Equals(c.EngineToken ?? UnknownEngineToken, EngineFilter, StringComparison.Ordinal))
|
||||
&& (StateFilter == GamesStateFilter.All || c.State == StateFilter)
|
||||
&& InstalledFilter switch { YesNoFilter.Yes => !c.NotInstalled, YesNoFilter.No => c.NotInstalled, _ => true }
|
||||
&& PlayedFilter switch { YesNoFilter.Yes => c.SessionCount > 0, YesNoFilter.No => c.SessionCount == 0, _ => true };
|
||||
|
||||
partial void OnListViewChanged(bool value)
|
||||
{
|
||||
if (_viewRead && _settings is not null)
|
||||
@@ -421,7 +557,7 @@ public sealed partial class GamesViewModel : ObservableObject
|
||||
|
||||
private void Apply()
|
||||
{
|
||||
IEnumerable<GameCardViewModel> shown = _all;
|
||||
IEnumerable<GameCardViewModel> shown = _all.Where(Passes);
|
||||
string q = Search.Trim();
|
||||
if (q.Length > 0)
|
||||
{
|
||||
@@ -438,6 +574,11 @@ public sealed partial class GamesViewModel : ObservableObject
|
||||
Sync(Games, [.. shown]);
|
||||
IsEmpty = _all.Count == 0;
|
||||
NoMatch = _all.Count > 0 && Games.Count == 0;
|
||||
IsFiltered = q.Length > 0 || StoreFilter.Length > 0 || EngineFilter.Length > 0 || StateFilter != GamesStateFilter.All
|
||||
|| InstalledFilter != YesNoFilter.All || PlayedFilter != YesNoFilter.All;
|
||||
HeaderText = IsFiltered
|
||||
? string.Format(CultureInfo.CurrentCulture, Strings.Games_Header_Filtered_Format, Games.Count, _all.Count)
|
||||
: string.Format(CultureInfo.CurrentCulture, Strings.Games_Header_Count_Format, _all.Count);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Copyright (C) 2026 poli0981 - additional terms under GPLv3 section 7: see NOTICE
|
||||
|
||||
namespace FrameLedger.App.ViewModels;
|
||||
|
||||
/// <summary>A two-way filter's three choices (beta.34, D85): everything, only the ones that are, only the ones that are not.</summary>
|
||||
public enum YesNoFilter
|
||||
{
|
||||
All = 0,
|
||||
Yes,
|
||||
No,
|
||||
}
|
||||
@@ -214,4 +214,50 @@ public sealed class CompareViewModelTests
|
||||
CultureInfo.CurrentCulture = previousCulture;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// beta.34 (owner request 2026-11-06, D85): Compare lists every session — it was the newest 200 — and filters them by game,
|
||||
/// tier and frame generation; a ticked session stays listed whatever the filters say, and the count says how many of how
|
||||
/// many are shown.
|
||||
/// </summary>
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1863:Use 'CompositeFormat'", Justification = "the format strings are resources that follow the UI culture")]
|
||||
[Fact]
|
||||
public async Task TheFiltersNarrowTheListAndATickedSessionStaysOnIt()
|
||||
{
|
||||
await using ScratchLedger s = await ScratchLedger.OpenAsync();
|
||||
GameRow a = await s.GameAsync("Alpha");
|
||||
GameRow b = await s.GameAsync("Beta");
|
||||
DateTimeOffset now = DateTimeOffset.UtcNow;
|
||||
_ = await s.SessionAsync(a.Id, now.AddHours(-5), fgMode: "dlssg", native: 60, displayed: 180, factor: 3);
|
||||
_ = await s.SessionAsync(a.Id, now.AddHours(-4), fgMode: "none");
|
||||
_ = await s.SessionAsync(b.Id, now.AddHours(-3), fgMode: "none");
|
||||
_ = await s.SessionAsync(b.Id, now.AddHours(-2), hooked: false);
|
||||
CompareViewModel vm = await BuildAsync(s, new ScriptedMixed(answer: true));
|
||||
|
||||
vm.Candidates.Should().HaveCount(4);
|
||||
vm.CountText.Should().Be(string.Format(CultureInfo.CurrentCulture, Strings.Compare_Count_Format, 4));
|
||||
vm.Games.Select(static g => g.Label).Should().Equal([Strings.Compare_Filter_Game_All, "Alpha", "Beta"]);
|
||||
|
||||
vm.GameFilter = a.Id;
|
||||
vm.Candidates.Should().HaveCount(2).And.OnlyContain(c => c.GameId == a.Id);
|
||||
vm.CountText.Should().Be(string.Format(CultureInfo.CurrentCulture, Strings.Compare_Count_Filtered_Format, 2, 4));
|
||||
|
||||
vm.FrameGenerationFilter = YesNoFilter.Yes;
|
||||
vm.Candidates.Should().ContainSingle().Which.HasFrameGeneration.Should().BeTrue();
|
||||
vm.Candidates[0].IsSelected = true;
|
||||
|
||||
vm.GameFilter = b.Id;
|
||||
vm.FrameGenerationFilter = YesNoFilter.All;
|
||||
vm.TierFilter = CompareTierFilter.NotMeasured;
|
||||
vm.Candidates.Should().HaveCount(2, "Beta's unmeasured session, and the ticked one, which a filter never hides");
|
||||
vm.Candidates.Count(static c => c.IsSelected).Should().Be(1);
|
||||
vm.SelectedCount.Should().Be(1);
|
||||
|
||||
vm.ClearSelectionCommand.Execute(null);
|
||||
vm.SelectedCount.Should().Be(0);
|
||||
vm.ClearFiltersCommand.Execute(null);
|
||||
vm.Candidates.Should().HaveCount(4);
|
||||
vm.Candidates.Single(static c => c.HasFrameGeneration is null).TierText.Should().Be(Strings.Tier_NotHooked);
|
||||
vm.Candidates.Should().OnlyContain(static c => c.SettingsChangedText.Length > 0, "a dash where nothing changed — the column was blank");
|
||||
}
|
||||
}
|
||||
@@ -464,4 +464,50 @@ public sealed class GamesViewModelTests
|
||||
Strings.Culture = previous;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// beta.34 (owner request 2026-11-06, D85): the library filters by store, engine, state, installed and played; the stores
|
||||
/// and engines are the ones the library holds; the header counts what is shown of all; Clear filters undoes them.
|
||||
/// </summary>
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1863:Use 'CompositeFormat'", Justification = "the format strings are resources that follow the UI culture")]
|
||||
[Fact]
|
||||
public async Task TheFiltersNarrowTheLibraryAndTheHeaderCountsWhatIsShown()
|
||||
{
|
||||
await using ScratchLedger s = await ScratchLedger.OpenAsync();
|
||||
GameRow alpha = await s.GameAsync("Alpha");
|
||||
_ = await s.GameAsync("Bravo");
|
||||
_ = await s.GameAsync("Charlie");
|
||||
_ = await s.SessionAsync(alpha.Id, DateTimeOffset.UtcNow);
|
||||
var selection = new GameSelection();
|
||||
var nav = new NoNavigation();
|
||||
var vm = new GamesViewModel(s.Library, selection, nav, new AddGameFlow(s.Library, new NoPicker(), selection, nav, new NoStrip()),
|
||||
executableExists: p => !p.Contains("Charlie", StringComparison.OrdinalIgnoreCase));
|
||||
Task load = vm.Pending;
|
||||
await load;
|
||||
|
||||
vm.Stores.Should().NotBeEmpty();
|
||||
vm.Stores[0].Value.Should().Be(GamesViewModel.AnyToken);
|
||||
vm.Engines[0].Value.Should().Be(GamesViewModel.AnyToken);
|
||||
vm.IsFiltered.Should().BeFalse();
|
||||
vm.HeaderText.Should().EndWith("3");
|
||||
|
||||
vm.PlayedFilter = YesNoFilter.Yes;
|
||||
vm.Games.Select(static g => g.Name).Should().Equal(["Alpha"]);
|
||||
vm.IsFiltered.Should().BeTrue();
|
||||
vm.HeaderText.Should().Be(string.Format(CultureInfo.CurrentCulture, Strings.Games_Header_Filtered_Format, 1, 3));
|
||||
|
||||
vm.PlayedFilter = YesNoFilter.No;
|
||||
vm.InstalledFilter = YesNoFilter.No;
|
||||
vm.Games.Select(static g => g.Name).Should().Equal(["Charlie"], "never played, and its executable is not on disk");
|
||||
|
||||
vm.InstalledFilter = YesNoFilter.All;
|
||||
vm.StateFilter = GamesStateFilter.HookingOn;
|
||||
vm.Games.Should().BeEmpty("hooking is off for every scratch entry");
|
||||
vm.NoMatch.Should().BeTrue();
|
||||
|
||||
vm.ClearFiltersCommand.Execute(null);
|
||||
vm.Games.Should().HaveCount(3);
|
||||
vm.IsFiltered.Should().BeFalse();
|
||||
vm.HeaderText.Should().EndWith("3");
|
||||
}
|
||||
}
|
||||
@@ -713,4 +713,27 @@ public sealed partial class PagesLoadTests
|
||||
seen.Windows.Should().Be(2);
|
||||
seen.AfterClose.Should().Equal([first], "a closed window is forgotten, and the next open builds a new one");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// beta.34 (owner request 2026-11-06, D86): the selected page keeps its name in the pane. WPF UI's LeftFluent template
|
||||
/// animates the label to height 0 when an item becomes active; ours is the same template without that.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public async Task TheSelectedPaneItemKeepsItsLabel()
|
||||
{
|
||||
(double Height, double Opacity, double LabelHeight) seen = await OnStaAsync(() =>
|
||||
{
|
||||
var template = (System.Windows.Controls.ControlTemplate)System.Windows.Application.Current.FindResource("FlLeftFluentNavigationViewItemTemplate");
|
||||
var item = new Wpf.Ui.Controls.NavigationViewItem { Content = "Compare", Template = template };
|
||||
item.SetValue(Wpf.Ui.Controls.NavigationViewItem.IsActiveProperty, true);
|
||||
Render(item);
|
||||
var grid = (FrameworkElement)template.FindName("ContentGrid", item);
|
||||
var label = (FrameworkElement)template.FindName("ElementContentPresenter", item);
|
||||
return (grid.ActualHeight, grid.Opacity, label.ActualHeight);
|
||||
});
|
||||
|
||||
seen.Height.Should().BeGreaterThan(0, "the label's row keeps its height while the item is selected");
|
||||
seen.Opacity.Should().Be(1);
|
||||
seen.LabelHeight.Should().BeGreaterThan(0);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user