- Add substitutable label fields. e.g. label can be "$(font_family)".

- Add assorted action to resize unwrapped object.

Author: fdwr

DrawableObject.h

@@ -174,7 +174,7 @@ class DrawableObject : public ComObject
     ////////////////////
     // Helpers
     static DrawableObject* Create(DrawableObjectFunction functionId);
-    static void GenerateLabel(IAttributeSource& attributeSource, _Inout_ std::u16string& label);
+    static void GenerateLabel(IAttributeSource& attributeSource, _Out_ std::u16string& label);
     static HRESULT GetDWriteFontFace(IAttributeSource& attributeSource, DrawingCanvas& drawingCanvas, _COM_Outptr_ IDWriteFontFace** fontFace);
     static HRESULT SaveFontFile(IAttributeSource& attributeSource, DrawingCanvas& drawingCanvas, char16_t const* filePath);
     static HRESULT ExportFontGlyphData(IAttributeSource& attributeSource, DrawingCanvas& drawingCanvas, array_ref<char16_t const> filePath);
@@ -185,6 +185,7 @@ class DrawableObject : public ComObject
     static const Attribute::PredefinedValue functions[12];
     static const Attribute::PredefinedValue visibilities[2];
     static const Attribute::PredefinedValue enabledValues[2];
+    static const Attribute::PredefinedValue labelDefaults[2];
     static const Attribute::PredefinedValue textDefaults[68];
     static const Attribute::PredefinedValue readingDirections[8];
     static const Attribute::PredefinedValue glyphDefaults[3];

DrawableObject.ixx

@@ -41,7 +41,7 @@ const Attribute DrawableObject::attributeList[DrawableObjectAttributeTotal] =
 {
     {Attribute::TypeUInteger32,     Attribute::SemanticEnumExclusive,CategoryLight, DrawableObjectAttributeFunction, u"function", u"Function", u"IDWriteTextLayout", functions },
     {Attribute::TypeBool8,          Attribute::SemanticEnumExclusive,0            , DrawableObjectAttributeVisibility, u"visible", u"Visible", u"visible", visibilities },
-    {Attribute::TypeString16,       Attribute::SemanticNone,         0            , DrawableObjectAttributeLabel, u"label", u"Label", u"", {} },
+    {Attribute::TypeString16,       Attribute::SemanticNone,         0            , DrawableObjectAttributeLabel, u"label", u"Label", u"", labelDefaults },
     {Attribute::TypeString16,       Attribute::SemanticLongText,     CategoryLight, DrawableObjectAttributeText, u"text", u"Text", u"This is a text", textDefaults },
     {Attribute::TypeArrayUInteger16,Attribute::SemanticNone,         0            , DrawableObjectAttributeGlyphs, u"glyphs", u"Glyphs", u"0 1 2 3 4", glyphDefaults },
     {Attribute::TypeArrayFloat32,   Attribute::SemanticNone,         0            , DrawableObjectAttributeAdvances, u"advances", u"Advances", u"",{} },
@@ -129,6 +129,11 @@ const Attribute::PredefinedValue DrawableObject::enabledValues[] = {
     {1, u"on"},
 };
 
+const Attribute::PredefinedValue DrawableObject::labelDefaults[] = {
+    {0, u"", u"" },
+    {0, u"", u"Family = $(font_family), Font size = $(font_size)"},
+};
+
 const Attribute::PredefinedValue DrawableObject::textDefaults[] = {
     {0, u"Empty text", u""},
     {0, u"Feature tests",
@@ -975,13 +980,71 @@ DrawableObject* DrawableObject::Create(DrawableObjectFunction functionType)
 }
 
 
-void DrawableObject::GenerateLabel(IAttributeSource& attributeSource, _Inout_ std::u16string& label)
+void DrawableObject::GenerateLabel(IAttributeSource& attributeSource, _Out_ std::u16string& label)
 {
     // Update the current label, either using the explicit one or generating
     // one dynamically according to set attributes.
+
+    const char16_t escapeCharacter = '$';
+
     array_ref<char16_t const> defaultLabel = attributeSource.GetString(DrawableObjectAttributeLabel);
-    if (!defaultLabel.empty())
+
+    if (wcschr(ToWChar(defaultLabel.data()), escapeCharacter) != nullptr)
+    {
+        // Generate a label using the field names.
+        label.clear();
+
+        std::map<std::u16string, uint32_t> attributeNameMap;
+        for (auto const& attribute : DrawableObject::attributeList)
+        {
+            attributeNameMap[attribute.name] = attribute.id;
+        }
+        const auto attributeNameMapEnd = attributeNameMap.end();
+        std::u16string fieldName;
+
+        // Walk string looking for replaceable parts. e.g. "Family name = $(font_family), Weight = ($weight)"
+        for (auto current = defaultLabel.begin(); current != defaultLabel.end();)
+        {
+            char16_t const* next = std::find(current, defaultLabel.end(), escapeCharacter);
+            label.append(current, next);
+
+            if (next == defaultLabel.end())
+                break;
+
+            ++next; // Skip '$'.
+            if (next == defaultLabel.end())
+                break;
+
+            if (*next == escapeCharacter)
+            {
+                // '$$' maps to just '$'.
+                label.push_back(escapeCharacter);
+                ++next;
+            }
+            else if (*next == '(')
+            {
+                // $(namedField) substitutes the string with that attribute's value.
+                ++next; // Skip '('.
+                char16_t const* endOfEscape = std::find(next, defaultLabel.end(), ')');
+                if (endOfEscape == defaultLabel.end())
+                    break;
+
+                fieldName.assign(next, endOfEscape);
+                auto nameMapResult = attributeNameMap.find(fieldName);
+                if (nameMapResult != attributeNameMapEnd)
+                {
+                    array_ref<char16_t const> text = attributeSource.GetString(DrawableObjectAttribute(nameMapResult->second));
+                    label.append(text.begin(), text.end());
+                }
+                next = endOfEscape + 1; // Skip ')'.
+            }
+
+            current = next;
+        }
+    }
+    else if (!defaultLabel.empty())
     {
+        // Just assign the label directly.
         if (wcscmp(ToWChar(defaultLabel.data()), ToWChar(label.c_str())) != 0)
         {
             label.assign(defaultLabel.data(), defaultLabel.size());

DrawableObjectAndValues.ixx

@@ -441,7 +441,10 @@ void DrawableObjectAndValues::Load(
 
     for (TextTree::NodePointer objectNode = objectsNode.begin(), objectNodeEnd = objectsNode.end(); objectNode != objectNodeEnd; ++objectNode)
     {
-        // Add another object, or fill in the shared object if first entry.
+        // The very first object definition in the file is actually a shared object that factors
+        // out all common attributes between objects (to avoid repeating them every time in each
+        // object that uses them). So if reading the first object, just update the shared object,
+        // otherwise the first real drawable object is the second object in the file.
         if (!isFirstObject)
         {
             drawableObjects.push_back(sharedDrawableObject);

MainWindow.h

@@ -80,6 +80,7 @@ class MainWindow
     HRESULT SaveUnpackedWoffFontFile();
     HRESULT ExportFontGlyphData();
     HRESULT AutofitDrawableObjects(bool useMaximumWidth, bool useMaximumHeight);
+    HRESULT SetNoLineWrapOnDrawableObjects();
     HRESULT GetSelectedDrawableObject(_Out_ uint32_t& selectedDrawableObject); // S_FALSE and ~0 if none.
     HRESULT GetAllFontCharacters(bool copyToClipboardInstead, bool getOnlyColorFontCharacters);
     HRESULT GetLogFontFromDrawableObjects(_Out_ LOGFONT& logFont);

MainWindow.ixx

@@ -1248,7 +1248,7 @@ MainWindow::DialogProcResult CALLBACK MainWindow::OnDragAndDrop(HWND hwnd, UINT
     DragFinish(hDrop);
 
     if (hr == HRESULT_FROM_WIN32(ERROR_BAD_FORMAT))
-        ShowMessageAndAppendLog(u"Unknown file format '%s', 0x%08X", fileName.c_str(), hr);
+        ShowMessageAndAppendLog(u"Unknown file format '%s' (TextLayoutSamplerSettings, txt, ttf, otf, tte, ttc, otc), 0x%08X", fileName.c_str(), hr);
     else if (FAILED(hr))
         ShowMessageAndAppendLog(u"Failed to load file '%s', 0x%08X", fileName.c_str(), hr);
 
@@ -1268,6 +1268,11 @@ std::vector<uint32_t> MainWindow::GetSelectedDrawableObjectIndices()
         selectedIndices.resize(drawableObjects_.size());
         std::iota(selectedIndices.begin(), selectedIndices.end(), 0);
     }
+    else // Validate the indices, just in case the UI somehow became out of sync.
+    {
+        auto const drawableObjectsTotal = drawableObjects_.size();
+        selectedIndices.erase(std::remove_if(selectedIndices.begin(), selectedIndices.end(), [=](auto i) {return i >= drawableObjectsTotal; }), selectedIndices.end());
+    }
 
     return selectedIndices;
 }
@@ -1484,9 +1489,6 @@ HRESULT MainWindow::UpdateDrawableObjectsFromFontFamilyNameProperties(FontFamily
 
     for (auto drawableObjectIndex : selectedDrawableObjectIndices)
     {
-        if (drawableObjectIndex >= drawableObjectsTotal)
-            continue;
-
         auto& drawableObject = drawableObjects_[drawableObjectIndex];
         DrawableObjectFunction function = drawableObject.GetValue(DrawableObjectAttributeFunction, DrawableObjectFunctionNop);
         bool isGdiOrGdiPlusFunction = DrawableObject::IsGdiOrGdiPlusFunction(function);
@@ -2112,9 +2114,6 @@ HRESULT MainWindow::AutofitDrawableObjects(bool useMaximumWidth, bool useMaximum
     // The first pass gets the sizes of all the objects.
     for (auto drawableObjectIndex : drawableObjectIndices)
     {
-        if (drawableObjectIndex >= drawableObjectsTotal)
-            continue;
-
         auto& drawableObject = drawableObjects_[drawableObjectIndex];
 
         D2D_RECT_F layoutBounds, contentBounds;
@@ -2132,9 +2131,6 @@ HRESULT MainWindow::AutofitDrawableObjects(bool useMaximumWidth, bool useMaximum
     // The second pass updates them, considering whether to maximize them to the largest object found.
     for (auto drawableObjectIndex : drawableObjectIndices)
     {
-        if (drawableObjectIndex >= drawableObjectsTotal)
-            continue;
-
         auto& drawableObject = drawableObjects_[drawableObjectIndex];
         D2D_SIZE_F& size = sizes[drawableObjectIndex];
         if (size.width > 0 && size.height > 0)
@@ -2159,6 +2155,33 @@ HRESULT MainWindow::AutofitDrawableObjects(bool useMaximumWidth, bool useMaximum
 }
 
 
+HRESULT MainWindow::SetNoLineWrapOnDrawableObjects()
+{
+    // Reduce all selected drawable objects to 1x1, and set no wrapping.
+    std::vector<uint32_t> drawableObjectIndices = GetSelectedDrawableObjectIndices();
+    for (auto drawableObjectIndex : drawableObjectIndices)
+    {
+        auto& drawableObject = drawableObjects_[drawableObjectIndex];
+        drawableObject.Set(DrawableObjectAttributeLineWrappingMode, LineWrappingModeNone);
+        drawableObject.Set(DrawableObjectAttributeWidth,  1);
+        drawableObject.Set(DrawableObjectAttributeHeight, 1);
+        drawableObject.Update();
+    }
+
+    DeferUpdateUi(
+        NeededUiUpdateDrawableObjectsListView |
+        NeededUiUpdateAttributesListView |
+        NeededUiUpdateAttributeValuesListView |
+        NeededUiUpdateAttributeValuesEdit |
+        NeededUiUpdateAttributeValuesSlider |
+        NeededUiUpdateDrawableObjectsCanvas |
+        NeededUiUpdateTextEdit
+    );
+
+    return S_OK;
+}
+
+
 HRESULT MainWindow::StoreDrawableObjectsSettings()
 {
     std::u16string filePath;
@@ -2184,11 +2207,11 @@ HRESULT MainWindow::StoreDrawableObjectsSettings()
     }
     if (hr == HRESULT_FROM_WIN32(ERROR_BAD_FORMAT)) // Consolidate this repeated error message.
     {
-        ShowMessageAndAppendLog(u"Unknown file format '%s', 0x%08X", filePath.c_str(), hr);
+        ShowMessageAndAppendLog(u"Unknown sampler settings file format '%s', 0x%08X", filePath.c_str(), hr);
     }
     else if (FAILED(hr))
     {
-        ShowMessageAndAppendLog(u"Failed to save to file '%s', 0x%08X", filePath.c_str(), hr);
+        ShowMessageAndAppendLog(u"Failed to save to sampler settings file '%s', 0x%08X", filePath.c_str(), hr);
     }
 
     return hr;
@@ -2983,8 +3006,9 @@ void MainWindow::OnAssortedActions(HWND anchorControl)
         {IdcGetAllColorFontCharacters, u"Get all color font characters"},
         {IdcCopyAllFontCharacters, u"Copy all font characters to clipboard"},
         {0, u"-"},
-        { IdcAutofitDrawableObjects, u"Autofit drawable objects" },
+        {IdcAutofitDrawableObjects, u"Autofit drawable objects" },
         {IdcAutofitDrawableObjectsUniformly, u"Autofit drawable objects uniformly" },
+        {IdcSetNoLineWrapOnDrawableObjects, u"Reduce drawable objects size with no wrap"}
     };
 
     int menuId = TrackPopupMenu(make_array_ref(items, countof(items)), anchorControl, hwnd_);
@@ -2999,6 +3023,7 @@ void MainWindow::OnAssortedActions(HWND anchorControl)
     case IdcExportGlyphImageData: ExportFontGlyphData(); break;
     case IdcAutofitDrawableObjects: AutofitDrawableObjects(/*useMaximumWidth*/false, /*useMaximumHeight*/false); break;
     case IdcAutofitDrawableObjectsUniformly: AutofitDrawableObjects(/*useMaximumWidth*/true, /*useMaximumHeight*/true); break;
+    case IdcSetNoLineWrapOnDrawableObjects: SetNoLineWrapOnDrawableObjects(); break;
     }
 }