Changeset 271620 in webkit

Timestamp:

Jan 19, 2021 2:55:26 PM (18 months ago)

Author:

Patrick Angle

Message:

Web Inspector: Font Details sidebar - Fractional variation axis ranges/default values are rounded.
​https://bugs.webkit.org/show_bug.cgi?id=220474

Reviewed by BJ Burg.

Source/WebCore:

Use float instead of int for variation axis range and defaults, as these values can be fractional.

• platform/graphics/FontPlatformData.h:

(WebCore::FontPlatformData::FontVariationAxis::FontVariationAxis):
(WebCore::FontPlatformData::FontVariationAxis::defaultValue const):
(WebCore::FontPlatformData::FontVariationAxis::minimumValue const):
(WebCore::FontPlatformData::FontVariationAxis::maximumValue const):

Source/WebInspectorUI:

Fixes Font Details sidebar display of variation axis values, ranges, and defaults to show fractional precision
when such precision is present.

• Localizations/en.lproj/localizedStrings.js:
• UserInterface/Views/FontDetailsPanel.js:

(WI.FontDetailsPanel.prototype.refresh):
(WI.FontDetailsPanel.prototype._formatSimpleSingleValue):
(WI.FontDetailsPanel.prototype._formatVariationValue):
(WI.FontDetailsPanel.prototype._createVariationValueElement):
(WI.FontDetailsPanel.prototype._formatAxisValueAsString):

• Show fractional values with between 0 and 2 decimal places.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/FontPlatformData.h (modified) (2 diffs)
• WebInspectorUI/ChangeLog (modified) (1 diff)
• WebInspectorUI/Localizations/en.lproj/localizedStrings.js (modified) (3 diffs)
• WebInspectorUI/UserInterface/Views/FontDetailsPanel.js (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-19  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Font Details sidebar - Fractional variation axis ranges/default values are rounded.
+        https://bugs.webkit.org/show_bug.cgi?id=220474
+
+        Reviewed by BJ Burg.
+
+        Use float instead of int for variation axis range and defaults, as these values can be fractional.
+
+        * platform/graphics/FontPlatformData.h:
+        (WebCore::FontPlatformData::FontVariationAxis::FontVariationAxis):
+        (WebCore::FontPlatformData::FontVariationAxis::defaultValue const):
+        (WebCore::FontPlatformData::FontVariationAxis::minimumValue const):
+        (WebCore::FontPlatformData::FontVariationAxis::maximumValue const):
+
 2021-01-19  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/graphics/FontPlatformData.h

@@ -82 +82 @@
     
     struct FontVariationAxis {
-        FontVariationAxis(const String& name, const String& tag, int defaultValue, int minimumValue, int maximumValue)
+        FontVariationAxis(const String& name, const String& tag, float defaultValue, float minimumValue, float maximumValue)
             : m_name(name)
             , m_tag(tag)
@@ -93 +93 @@
         const String& name() const { return m_name; }
         const String& tag() const { return m_tag; }
-        int defaultValue() const { return m_defaultValue; }
-        int minimumValue() const { return m_minimumValue; }
-        int maximumValue() const { return m_maximumValue; }
+        float defaultValue() const { return m_defaultValue; }
+        float minimumValue() const { return m_minimumValue; }
+        float maximumValue() const { return m_maximumValue; }
 
     private:
         const String m_name;
         const String m_tag;
-        int m_defaultValue;
-        int m_minimumValue;
-        int m_maximumValue;
+        float m_defaultValue;
+        float m_minimumValue;
+        float m_maximumValue;
     };
 

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-01-19  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Font Details sidebar - Fractional variation axis ranges/default values are rounded.
+        https://bugs.webkit.org/show_bug.cgi?id=220474
+
+        Reviewed by BJ Burg.
+
+        Fixes Font Details sidebar display of variation axis values, ranges, and defaults to show fractional precision
+        when such precision is present.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        * UserInterface/Views/FontDetailsPanel.js:
+        (WI.FontDetailsPanel.prototype.refresh):
+        (WI.FontDetailsPanel.prototype._formatSimpleSingleValue):
+        (WI.FontDetailsPanel.prototype._formatVariationValue):
+        (WI.FontDetailsPanel.prototype._createVariationValueElement):
+        (WI.FontDetailsPanel.prototype._formatAxisValueAsString):
+        - Show fractional values with between 0 and 2 decimal places.
+
 2021-01-19  Patrick Angle  <pangle@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -3 +3 @@
 localizedStrings[" (Prototype)"] = " (Prototype)";
 /* A range and default value for a single variation axis of a font. */
-localizedStrings[" (Range: %d-%d, Default: %d) @ Font Details Sidebar"] = " (Range: %d-%d, Default: %d)";
+localizedStrings[" (Range: %s-%s, Default: %s) @ Font Details Sidebar"] = " (Range: %s-%s, Default: %s)";
 localizedStrings[" (line %s)"] = " (line %s)";
 localizedStrings["${expr} = expression"] = "${expr} = expression";
@@ -51 +51 @@
 localizedStrings["%d resource"] = "%d resource";
 localizedStrings["%d resources"] = "%d resources";
-localizedStrings["%d%%"] = "%d%%";
 localizedStrings["%dpx"] = "%dpx";
 localizedStrings["%dpx\u00B2"] = "%dpx\u00B2";
@@ -77 +76 @@
 localizedStrings["%s total"] = "%s total";
 localizedStrings["%s transferred"] = "%s transferred";
+/* A single value expressed as a percentage where the value has already been converted from a number to a string. */
+localizedStrings["%s%% @ Font Details Sidebar"] = "%s%%";
 localizedStrings["%s:"] = "%s:";
 localizedStrings["(%s)"] = "(%s)";

trunk/Source/WebInspectorUI/UserInterface/Views/FontDetailsPanel.js

@@ -58 +58 @@
         this._fontSizeRow.value = this._formatSizeValue(this._fontPropertiesMap.get("font-size"));
         this._fontStyleRow.value = this._formatStyleValue(this._fontPropertiesMap.get("font-style"));
-        this._fontWeightRow.value = this._formatSimpleSingleValue(this._fontPropertiesMap.get("font-weight"), "wght", "%d");
-        this._fontStretchRow.value = this._formatSimpleSingleValue(this._fontPropertiesMap.get("font-stretch"), "wdth", WI.UIString("%d%%"));
+        this._fontWeightRow.value = this._formatSimpleSingleValue(this._fontPropertiesMap.get("font-weight"), "wght", "%s");
+        this._fontStretchRow.value = this._formatSimpleSingleValue(this._fontPropertiesMap.get("font-stretch"), "wdth", WI.UIString("%s%%", "%s%% @ Font Details Sidebar", "A single value expressed as a percentage where the value has already been converted from a number to a string."));
 
         this._fontVariantLigaturesRow.value = this._formatLigatureValue(this._fontPropertiesMap.get("font-variant-ligatures"));
@@ -155 +155 @@
         let result;
         if (this._hasVariationValue(property, variationTag))
-            result = variationFormat.format(property.variations.get(variationTag).value);
+            result = variationFormat.format(this._formatAxisValueAsString(property.variations.get(variationTag).value));
         else
-            result = property.value;
+            result = this._formatAxisValueAsString(property.value);
 
         if (this._hasVariationValue(property, variationTag, {optional: true})) {
@@ -170 +170 @@
     {
         let value = variation.value || variation.value === 0 ? variation.value : variation.defaultValue;
-        return this._createVariationValueElement(value, variation.minimumValue, variation.maximumValue, variation.defaultValue);
+        return this._createVariationValueElement(this._formatAxisValueAsString(value), variation.minimumValue, variation.maximumValue, variation.defaultValue);
     }
 
@@ -180 +180 @@
         let secondaryElement = valueElement.appendChild(document.createElement("span"));
         secondaryElement.className = "secondary";
-        secondaryElement.textContent = WI.UIString(" (Range: %d-%d, Default: %d)", " (Range: %d-%d, Default: %d) @ Font Details Sidebar", "A range and default value for a single variation axis of a font.").format(minimumValue, maximumValue, defaultValue);
+        secondaryElement.textContent = WI.UIString(" (Range: %s-%s, Default: %s)", " (Range: %s-%s, Default: %s) @ Font Details Sidebar", "A range and default value for a single variation axis of a font.").format(this._formatAxisValueAsString(minimumValue), this._formatAxisValueAsString(maximumValue), this._formatAxisValueAsString(defaultValue));
         
         return valueElement;
+    }
+
+    _formatAxisValueAsString(value)
+    {
+        const options = {
+            minimumFractionDigits: 0,
+            maximumFractionDigits: 2,
+            useGrouping: false,
+        }
+        return value.toLocaleString(undefined, options);
     }