Merge branch 'master' into android-bundled-face-models

2026-08-27 20:22:42 +02:00
parent 371038614f 7b4263ceb9
commit 28c046130c
64 changed files with 8205 additions and 1907 deletions
@@ -117,6 +117,25 @@ export component SettingsPage inherits Rectangle {
    in property <string> layout-class;
    in property <string> app-version;

+    /// TRACES: FR-DSP-8
+    /// The display showing the canvas, and the colour it is being given.
+    ///
+    /// These are the same kind of thing as the two above — a fact about the
+    /// session, not a setting — with one difference that earns them their own
+    /// row rather than a line in a log. FR-DSP-8's fallback is *defined* to be
+    /// sRGB where the display server will not say otherwise, and a photographer
+    /// being shown sRGB because their compositor has no colour-management
+    /// protocol has no other way to find that out. `display-colour` says which
+    /// of the acquisition paths this session is on, in words.
+    in property <string> display-name;
+    in property <string> display-colour;
+    /// The *other* monitors, where there are any. Empty on a single-display
+    /// desktop, which is why the row below is conditional: FR-DSP-8 is about
+    /// the second display, and the failure it names is invisible from the
+    /// first, so this page has to be readable about a monitor the reader is
+    /// not currently looking at.
+    in property <string> display-others;
+
    callback original-budget-changed(string);
    callback original-unlimited-toggled(bool);
    callback thumbnail-budget-changed(string);
@@ -709,10 +728,46 @@ export component SettingsPage inherits Rectangle {
                            Value { text: root.layout-class; horizontal-stretch: 1; }
                        }

+                        // TRACES: FR-DSP-8
+                        // Which display, and what colour it is being sent.
+                        HorizontalLayout {
+                            spacing: Theme.gap;
+                            Label { text: "Display"; }
+                            Value {
+                                text: root.display-name;
+                                horizontal-stretch: 1;
+                                overflow: elide;
+                            }
+                        }
+
+                        HorizontalLayout {
+                            spacing: Theme.gap;
+                            Label { text: "Display colour"; }
+                            Value {
+                                text: root.display-colour;
+                                horizontal-stretch: 1;
+                                // Wraps rather than elides: this is the one
+                                // value on the page that is a sentence, and
+                                // eliding it would cut off the half that says
+                                // *why* — which is the half FR-DSP-8 asks for.
+                                wrap: word-wrap;
+                            }
+                        }
+
+                        if root.display-others != "": HorizontalLayout {
+                            spacing: Theme.gap;
+                            Label { text: "Other displays"; }
+                            Value {
+                                text: root.display-others;
+                                horizontal-stretch: 1;
+                                wrap: word-wrap;
+                            }
+                        }
+
                        Caption {
-                            text: "Graphics and frame rate describe this session, "
-                                + "not a setting — they are here so a bug report "
-                                + "can quote them.";
+                            text: "Graphics, frame rate and display colour "
+                                + "describe this session, not a setting — they "
+                                + "are here so a bug report can quote them.";
                            wrap: word-wrap;
                        }
                    }